From ff1283579067cf3b338dfe884c5451eca63ebfc4 Mon Sep 17 00:00:00 2001 From: Cansu Kavili Date: Fri, 3 Apr 2020 16:09:28 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=8F=83=F0=9F=8F=BF=E2=80=8D=E2=99=80?= =?UTF-8?q?=EF=B8=8FHoverfly=20updated=20following=20new=20proposed=20stru?= =?UTF-8?q?cture=F0=9F=8F=83=F0=9F=8F=BF=E2=80=8D=E2=99=80=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ubiquitous-journey/values-tooling.yaml | 26 +++ values-tooling.yaml | 225 ------------------------- 2 files changed, 26 insertions(+), 225 deletions(-) delete mode 100644 values-tooling.yaml diff --git a/ubiquitous-journey/values-tooling.yaml b/ubiquitous-journey/values-tooling.yaml index 4ece449..819915d 100644 --- a/ubiquitous-journey/values-tooling.yaml +++ b/ubiquitous-journey/values-tooling.yaml @@ -118,6 +118,21 @@ zalenium_values: &zalenium_values podAnnotations: app: zalenium +############## +# 🛎 Hoverfly Custom Values +# Values reference https://github.com/helm/charts/tree/master/incubator/hoverfly +############# +hoverfly_values: &hoverfly_values + openshift: + route: + admin: + enabled: true + hostname: "" + proxy: + enabled: true + hostname: "" + + ############## # 🐙 Argo Ignore Differences ############# @@ -198,3 +213,14 @@ applications: values: *zalenium_values ignore_differences: *ignore_differences + - name: hoverfly + enabled: true + source: https://github.com/helm/charts.git + source_path: incubator/hoverfly + sync_policy_automated: true + destination: *ci_cd_ns + source_ref: master + values: + *hoverfly_values + ignore_differences: *ignore_differences + diff --git a/values-tooling.yaml b/values-tooling.yaml deleted file mode 100644 index 3635cb5..0000000 --- a/values-tooling.yaml +++ /dev/null @@ -1,225 +0,0 @@ -# Over rides for default values in Helm Charts -destination: &ci_cd_ns labs-ci-cd - -############## -# 🛎 Jenkins Custom Values -############# -jenkins_values: &jenkins_values - persistence: false - source_secret: - name: gitlab-auth - username: idm-sa - password: thisisdefinitelynotmypassword - -############## -# 🛎 Sonarqube Custom Values -############# - -############## -# 🛎 Pact Broker Custom Values -############# -pact_broker_values: &pact_broker_values - secrets: - name: pact-broker-secrets - keys: - pactBrokerDatabaseUsername: pact_broker_database_username - pactBrokerDatabasePassword: pact_broker_database_password - pactBrokerAdmin: pact_broker_admin - pactBrokerAdminPassword: pact_broker_admin_password - pactBrokerBasicAuthUsername: pact_broker_user - pactBrokerBasicAuthPassword: pact_broker_user_password - values: - pactBrokerDatabaseUsername: pact_broker_user - pactBrokerDatabasePassword: thisisdefinitelynotmypassword - pactBrokerAdmin: admin - pactBrokerAdminPassword: thisisdefinitelynotmypassword - pactBrokerBasicAuthUsername: dev - pactBrokerBasicAuthPassword: thisisdefinitelynotmypassword - -############## -# 🛎 Sonatype Nexus Custom Values -############# -nexus_values: &nexus_values - nexus: - imageTag: 3.19.1 - service: - type: ClusterIP - podAnnotations: {} - securityContextEnabled: false - - route: - enabled: true - name: nexus - portName: nexus-service - path: null - - nexusProxy: - enabled: false - - persistence: - storageSize: 5Gi - - serviceAccount: - name: nexus - annotations: {} - - deployment: - annotations: {} - initContainers: - - name: k8s-plugin-puller - image: curlimages/curl:latest - imagePullPolicy: Always - command: ['sh','-c'] - args: ['curl -o /k8s-plugin/nexus-openshift-plugin.jar https://github.com/sonatype-nexus-community/nexus-kubernetes-openshift-releases/download/v0.2.8/nexus-openshift-plugin-0.2.8.jar'] - volumeMounts: - - name: k8s-plugin - mountPath: /k8s-plugin - additionalVolumes: - - name: k8s-plugin - emptyDir: {} - additionalVolumeMounts: - - mountPath: /opt/sonatype/nexus/deploy/nexus-openshift-plugin.jar - name: k8s-plugin - subPath: nexus-openshift-plugin.jar - - secret: - enabled: false - mountPath: - readOnly: - data: - - service: - enabled: true - name: nexus-service - labels: {} - annotations: {} - portName: nexus-service - port: 8081 - targetPort: 8081 - ports: [] - -############## -# 🛎 Zalenium Custom Values -############# -## TODO: Update source URL as upstream when ArgoCD version is greater 1.5.0 or above -zalenium_values: &zalenium_values - hub: - serviceType: ClusterIP - openshift: - deploymentConfig: - enabled: true - route: - enabled: true - persistence: - enabled: false - serviceAccount: - create: false - desiredContainers: 0 - podAnnotations: - app: zalenium - -############## -# 🛎 Hoverfly Custom Values -# Values reference https://github.com/helm/charts/tree/master/incubator/hoverfly -############# -hoverfly_values: &hoverfly_values - openshift: - route: - admin: - enabled: true - hostname: "" - proxy: - enabled: true - hostname: "" - - -############## -# 🐙 Argo Ignore Differences -############# -ignore_differences: &ignore_differences - ignoreDifferences: - - group: apps.openshift.io - kind: DeploymentConfig - jsonPointers: - - /spec/template/spec/containers/0/image - - /spec/triggers/0/imageChangeParams/lastTriggeredImage - - group: build.openshift.io - kind: BuildConfig - jsonPointers: - - /spec/triggers - - group: route.openshift.io - kind: Route - jsonPointers: - - /status/ingress - - -############## -# 🛎 Argo App of Apps declaration -############# - -# enabled true on an app is to tell helm to create an argo app cr for this item -applications: - - name: nexus - enabled: true - source: https://github.com/Oteemo/charts.git - source_path: charts/sonatype-nexus - source_ref: "sonatype-nexus-1.26.2" - sync_policy_automated: true - destination: *ci_cd_ns - values: - *nexus_values - ignore_differences: *ignore_differences - - name: jenkins - enabled: true - source: https://github.com/rht-labs/helm-charts.git - source_path: charts/jenkins - source_ref: "jenkins-0.0.8" - sync_policy_automated: true - destination: *ci_cd_ns - values: - *jenkins_values - ignore_differences: *ignore_differences - - name: pact-broker - enabled: true - source: https://github.com/rht-labs/helm-charts.git - source_path: charts/pact-broker - source_ref: "pact-broker-0.0.1" - sync_policy_automated: true - destination: *ci_cd_ns - values: - *pact_broker_values - - name: sonarqube - enabled: true - source: https://github.com/rht-labs/helm-charts.git - source_path: charts/sonarqube - source_ref: "sonarqube-0.0.4" - sync_policy_automated: true - destination: *ci_cd_ns - - name: crw - enabled: true - destination: crw - source: https://github.com/eformat/argocd - source_path: crw/base - source_ref: master - sync_policy_automated: true - no_helm: true - - name: zalenium - enabled: true - source: https://github.com/ckavili/zalenium.git - source_path: charts/zalenium - source_ref: "master" - sync_policy_automated: true - destination: *ci_cd_ns - values: - *zalenium_values - ignore_differences: *ignore_differences - - name: hoverfly - enabled: true - source: https://github.com/helm/charts.git - source_path: incubator/hoverfly - sync_policy_automated: true - destination: *ci_cd_ns - source_ref: master - values: - *hoverfly_values - ignore_differences: *ignore_differences \ No newline at end of file