From ea749f5f90bde11ad368ed5bca0338c0f252a90e Mon Sep 17 00:00:00 2001 From: "test-gitops-hydrator[bot]" <170377304+test-gitops-hydrator[bot]@users.noreply.github.com> Date: Wed, 22 May 2024 17:34:26 -0700 Subject: [PATCH 1/2] [Argo CD Bot] hydrate 61d5c337ea259389cc3ebfa0e449317a3517be42 --- dev-east/README.md | 2 ++ dev-east/hydrator.metadata | 5 ++++- dev-east/manifest.yaml | 6 +++--- dev-west/README.md | 2 ++ dev-west/hydrator.metadata | 5 ++++- dev-west/manifest.yaml | 6 +++--- 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dev-east/README.md b/dev-east/README.md index a0242c3..61ceecf 100644 --- a/dev-east/README.md +++ b/dev-east/README.md @@ -8,4 +8,6 @@ To hydrate the manifests in this repository, run the following commands: git clone https://github.com/agaudreault/gitops-tests # cd into the cloned directory git checkout 61d5c337ea259389cc3ebfa0e449317a3517be42 +helm dependency build +helm template . --name-template dev-east --include-crds ``` \ No newline at end of file diff --git a/dev-east/hydrator.metadata b/dev-east/hydrator.metadata index b42f55d..b22023b 100755 --- a/dev-east/hydrator.metadata +++ b/dev-east/hydrator.metadata @@ -1,5 +1,8 @@ { - "commands": null, + "commands": [ + "helm dependency build", + "helm template . --name-template dev-east --include-crds" + ], "repoURL": "https://github.com/agaudreault/gitops-tests", "drySha": "61d5c337ea259389cc3ebfa0e449317a3517be42" } \ No newline at end of file diff --git a/dev-east/manifest.yaml b/dev-east/manifest.yaml index d06197c..bb74581 100755 --- a/dev-east/manifest.yaml +++ b/dev-east/manifest.yaml @@ -16,8 +16,8 @@ metadata: apiVersion: v1 data: - mariadb-password: RlJ1QmtkWlhreg== - mariadb-root-password: YnVpM0NhRGljRg== + mariadb-password: VE11Q3F2MmFyUQ== + mariadb-root-password: ZEVRVWxvY2xncw== kind: Secret metadata: annotations: @@ -35,7 +35,7 @@ type: Opaque apiVersion: v1 data: - wordpress-password: UzJZbWE3eTAxTw== + wordpress-password: MDFscFFkeUU3Zw== kind: Secret metadata: annotations: diff --git a/dev-west/README.md b/dev-west/README.md index a0242c3..133a828 100644 --- a/dev-west/README.md +++ b/dev-west/README.md @@ -8,4 +8,6 @@ To hydrate the manifests in this repository, run the following commands: git clone https://github.com/agaudreault/gitops-tests # cd into the cloned directory git checkout 61d5c337ea259389cc3ebfa0e449317a3517be42 +helm dependency build +helm template . --name-template dev-west --include-crds ``` \ No newline at end of file diff --git a/dev-west/hydrator.metadata b/dev-west/hydrator.metadata index b42f55d..50ebaa6 100755 --- a/dev-west/hydrator.metadata +++ b/dev-west/hydrator.metadata @@ -1,5 +1,8 @@ { - "commands": null, + "commands": [ + "helm dependency build", + "helm template . --name-template dev-west --include-crds" + ], "repoURL": "https://github.com/agaudreault/gitops-tests", "drySha": "61d5c337ea259389cc3ebfa0e449317a3517be42" } \ No newline at end of file diff --git a/dev-west/manifest.yaml b/dev-west/manifest.yaml index 31f3756..3f1ab23 100755 --- a/dev-west/manifest.yaml +++ b/dev-west/manifest.yaml @@ -16,8 +16,8 @@ metadata: apiVersion: v1 data: - mariadb-password: VTgzNVA3NTB2cQ== - mariadb-root-password: dGJaTGFBT2lBUQ== + mariadb-password: MVd4d29jQzVxRg== + mariadb-root-password: TTZWRkthQWViTA== kind: Secret metadata: annotations: @@ -35,7 +35,7 @@ type: Opaque apiVersion: v1 data: - wordpress-password: akk2SlZTSUJiRA== + wordpress-password: R0FnVUVLQ2hKNg== kind: Secret metadata: annotations: From c56c98ba42fedb8b7f9cdf30c3a05bfda751d83f Mon Sep 17 00:00:00 2001 From: "test-gitops-hydrator[bot]" <170377304+test-gitops-hydrator[bot]@users.noreply.github.com> Date: Thu, 23 May 2024 10:09:30 -0700 Subject: [PATCH 2/2] [Argo CD Bot] hydrate ca2ff0b38fae3dd02444d3615651129f1e394aba --- dev-east/README.md | 4 +- dev-east/hydrator.metadata | 4 +- dev-east/manifest.yaml | 103 +++++++++++++++++++------------------ dev-west/README.md | 4 +- dev-west/hydrator.metadata | 4 +- dev-west/manifest.yaml | 103 +++++++++++++++++++------------------ hydrator.metadata | 2 +- 7 files changed, 113 insertions(+), 111 deletions(-) diff --git a/dev-east/README.md b/dev-east/README.md index 61ceecf..6e2da01 100644 --- a/dev-east/README.md +++ b/dev-east/README.md @@ -7,7 +7,7 @@ To hydrate the manifests in this repository, run the following commands: git clone https://github.com/agaudreault/gitops-tests # cd into the cloned directory -git checkout 61d5c337ea259389cc3ebfa0e449317a3517be42 +git checkout ca2ff0b38fae3dd02444d3615651129f1e394aba helm dependency build -helm template . --name-template dev-east --include-crds +helm template . --name-template simple-app-east --namespace dev --values /tmp/_argocd-repo/dbb92269-9c18-47ad-b229-ae14b41dd16e/services/simple-application/values.yaml --values /tmp/_argocd-repo/dbb92269-9c18-47ad-b229-ae14b41dd16e/services/simple-application/dev/values.yaml --include-crds ``` \ No newline at end of file diff --git a/dev-east/hydrator.metadata b/dev-east/hydrator.metadata index b22023b..7c23e34 100755 --- a/dev-east/hydrator.metadata +++ b/dev-east/hydrator.metadata @@ -1,8 +1,8 @@ { "commands": [ "helm dependency build", - "helm template . --name-template dev-east --include-crds" + "helm template . --name-template simple-app-east --namespace dev --values /tmp/_argocd-repo/dbb92269-9c18-47ad-b229-ae14b41dd16e/services/simple-application/values.yaml --values /tmp/_argocd-repo/dbb92269-9c18-47ad-b229-ae14b41dd16e/services/simple-application/dev/values.yaml --include-crds" ], "repoURL": "https://github.com/agaudreault/gitops-tests", - "drySha": "61d5c337ea259389cc3ebfa0e449317a3517be42" + "drySha": "ca2ff0b38fae3dd02444d3615651129f1e394aba" } \ No newline at end of file diff --git a/dev-east/manifest.yaml b/dev-east/manifest.yaml index bb74581..a7fd24c 100755 --- a/dev-east/manifest.yaml +++ b/dev-east/manifest.yaml @@ -3,50 +3,50 @@ automountServiceAccountToken: false kind: ServiceAccount metadata: annotations: - argocd.argoproj.io/tracking-id: dev-east:/ServiceAccount:default/dev-east-mariadb + argocd.argoproj.io/tracking-id: dev-east:/ServiceAccount:dev/simple-app-east-mariadb labels: app.kubernetes.io/instance: dev-east app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: mariadb helm.sh/chart: mariadb-13.0.1 - name: dev-east-mariadb - namespace: default + name: simple-app-east-mariadb + namespace: dev --- apiVersion: v1 data: - mariadb-password: VE11Q3F2MmFyUQ== - mariadb-root-password: ZEVRVWxvY2xncw== + mariadb-password: N3RzbzAxOFl4Ng== + mariadb-root-password: amxvMzIxQ2pHRg== kind: Secret metadata: annotations: - argocd.argoproj.io/tracking-id: dev-east:/Secret:default/dev-east-mariadb + argocd.argoproj.io/tracking-id: dev-east:/Secret:dev/simple-app-east-mariadb labels: app.kubernetes.io/instance: dev-east app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: mariadb helm.sh/chart: mariadb-13.0.1 - name: dev-east-mariadb - namespace: default + name: simple-app-east-mariadb + namespace: dev type: Opaque --- apiVersion: v1 data: - wordpress-password: MDFscFFkeUU3Zw== + wordpress-password: eFRVQzAyS05JOA== kind: Secret metadata: annotations: - argocd.argoproj.io/tracking-id: dev-east:/Secret:default/dev-east-app + argocd.argoproj.io/tracking-id: dev-east:/Secret:dev/simple-app-east labels: app.kubernetes.io/instance: dev-east app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: app helm.sh/chart: app-17.0.5 - name: dev-east-app - namespace: default + name: simple-app-east + namespace: dev type: Opaque --- @@ -85,15 +85,15 @@ data: kind: ConfigMap metadata: annotations: - argocd.argoproj.io/tracking-id: dev-east:/ConfigMap:default/dev-east-mariadb + argocd.argoproj.io/tracking-id: dev-east:/ConfigMap:dev/simple-app-east-mariadb labels: app.kubernetes.io/component: primary app.kubernetes.io/instance: dev-east app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: mariadb helm.sh/chart: mariadb-13.0.1 - name: dev-east-mariadb - namespace: default + name: simple-app-east-mariadb + namespace: dev --- @@ -101,14 +101,14 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: annotations: - argocd.argoproj.io/tracking-id: dev-east:/PersistentVolumeClaim:default/dev-east-app + argocd.argoproj.io/tracking-id: dev-east:/PersistentVolumeClaim:dev/simple-app-east labels: app.kubernetes.io/instance: dev-east app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: app helm.sh/chart: app-17.0.5 - name: dev-east-app - namespace: default + name: simple-app-east + namespace: dev spec: accessModes: - ReadWriteOnce @@ -122,15 +122,15 @@ apiVersion: v1 kind: Service metadata: annotations: - argocd.argoproj.io/tracking-id: dev-east:/Service:default/dev-east-mariadb + argocd.argoproj.io/tracking-id: dev-east:/Service:dev/simple-app-east-mariadb labels: app.kubernetes.io/component: primary app.kubernetes.io/instance: dev-east app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: mariadb helm.sh/chart: mariadb-13.0.1 - name: dev-east-mariadb - namespace: default + name: simple-app-east-mariadb + namespace: dev spec: ports: - name: mysql @@ -140,7 +140,7 @@ spec: targetPort: mysql selector: app.kubernetes.io/component: primary - app.kubernetes.io/instance: dev-east + app.kubernetes.io/instance: simple-app-east app.kubernetes.io/name: mariadb sessionAffinity: None type: ClusterIP @@ -151,30 +151,31 @@ apiVersion: v1 kind: Service metadata: annotations: - argocd.argoproj.io/tracking-id: dev-east:/Service:default/dev-east-app + argocd.argoproj.io/tracking-id: dev-east:/Service:dev/simple-app-east labels: app.kubernetes.io/instance: dev-east app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: app helm.sh/chart: app-17.0.5 - name: dev-east-app - namespace: default + name: simple-app-east + namespace: dev spec: - externalTrafficPolicy: Cluster ports: - name: http + nodePort: null port: 80 protocol: TCP targetPort: http - name: https + nodePort: null port: 443 protocol: TCP targetPort: https selector: - app.kubernetes.io/instance: dev-east + app.kubernetes.io/instance: simple-app-east app.kubernetes.io/name: app sessionAffinity: None - type: LoadBalancer + type: ClusterIP --- @@ -182,26 +183,26 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - argocd.argoproj.io/tracking-id: dev-east:apps/Deployment:default/dev-east-app + argocd.argoproj.io/tracking-id: dev-east:apps/Deployment:dev/simple-app-east labels: app.kubernetes.io/instance: dev-east app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: app helm.sh/chart: app-17.0.5 - name: dev-east-app - namespace: default + name: simple-app-east + namespace: dev spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/instance: dev-east + app.kubernetes.io/instance: simple-app-east app.kubernetes.io/name: app strategy: type: RollingUpdate template: metadata: labels: - app.kubernetes.io/instance: dev-east + app.kubernetes.io/instance: simple-app-east app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: app helm.sh/chart: app-17.0.5 @@ -214,7 +215,7 @@ spec: - podAffinityTerm: labelSelector: matchLabels: - app.kubernetes.io/instance: dev-east + app.kubernetes.io/instance: simple-app-east app.kubernetes.io/name: app topologyKey: kubernetes.io/hostname weight: 1 @@ -225,7 +226,7 @@ spec: - name: ALLOW_EMPTY_PASSWORD value: "yes" - name: MARIADB_HOST - value: dev-east-mariadb + value: simple-app-east-mariadb - name: MARIADB_PORT_NUMBER value: "3306" - name: WORDPRESS_DATABASE_NAME @@ -236,14 +237,14 @@ spec: valueFrom: secretKeyRef: key: mariadb-password - name: dev-east-mariadb + name: simple-app-east-mariadb - name: WORDPRESS_USERNAME value: user - name: WORDPRESS_PASSWORD valueFrom: secretKeyRef: key: wordpress-password - name: dev-east-app + name: simple-app-east - name: WORDPRESS_EMAIL value: user@example.com - name: WORDPRESS_FIRST_NAME @@ -330,7 +331,7 @@ spec: volumes: - name: wordpress-data persistentVolumeClaim: - claimName: dev-east-app + claimName: simple-app-east --- @@ -338,31 +339,31 @@ apiVersion: apps/v1 kind: StatefulSet metadata: annotations: - argocd.argoproj.io/tracking-id: dev-east:apps/StatefulSet:default/dev-east-mariadb + argocd.argoproj.io/tracking-id: dev-east:apps/StatefulSet:dev/simple-app-east-mariadb labels: app.kubernetes.io/component: primary app.kubernetes.io/instance: dev-east app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: mariadb helm.sh/chart: mariadb-13.0.1 - name: dev-east-mariadb - namespace: default + name: simple-app-east-mariadb + namespace: dev spec: replicas: 1 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: primary - app.kubernetes.io/instance: dev-east + app.kubernetes.io/instance: simple-app-east app.kubernetes.io/name: mariadb - serviceName: dev-east-mariadb + serviceName: simple-app-east-mariadb template: metadata: annotations: - checksum/configuration: 1910a988b16fac101fd2c89b4e4622652a10de077eb4ad9ec73914dc9ec4633a + checksum/configuration: 5617b3d1f2255c45285143a1b1a1d60b3717bca4405c6ff922fe4c0553ff291c labels: app.kubernetes.io/component: primary - app.kubernetes.io/instance: dev-east + app.kubernetes.io/instance: simple-app-east app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: mariadb helm.sh/chart: mariadb-13.0.1 @@ -376,7 +377,7 @@ spec: labelSelector: matchLabels: app.kubernetes.io/component: primary - app.kubernetes.io/instance: dev-east + app.kubernetes.io/instance: simple-app-east app.kubernetes.io/name: mariadb topologyKey: kubernetes.io/hostname weight: 1 @@ -388,14 +389,14 @@ spec: valueFrom: secretKeyRef: key: mariadb-root-password - name: dev-east-mariadb + name: simple-app-east-mariadb - name: MARIADB_USER value: bn_wordpress - name: MARIADB_PASSWORD valueFrom: secretKeyRef: key: mariadb-password - name: dev-east-mariadb + name: simple-app-east-mariadb - name: MARIADB_DATABASE value: bitnami_wordpress image: docker.io/bitnami/mariadb:11.0.2-debian-11-r2 @@ -452,10 +453,10 @@ spec: subPath: my.cnf securityContext: fsGroup: 1001 - serviceAccountName: dev-east-mariadb + serviceAccountName: simple-app-east-mariadb volumes: - configMap: - name: dev-east-mariadb + name: simple-app-east-mariadb name: config updateStrategy: type: RollingUpdate @@ -463,7 +464,7 @@ spec: - metadata: labels: app.kubernetes.io/component: primary - app.kubernetes.io/instance: dev-east + app.kubernetes.io/instance: simple-app-east app.kubernetes.io/name: mariadb name: data spec: diff --git a/dev-west/README.md b/dev-west/README.md index 133a828..a02bd49 100644 --- a/dev-west/README.md +++ b/dev-west/README.md @@ -7,7 +7,7 @@ To hydrate the manifests in this repository, run the following commands: git clone https://github.com/agaudreault/gitops-tests # cd into the cloned directory -git checkout 61d5c337ea259389cc3ebfa0e449317a3517be42 +git checkout ca2ff0b38fae3dd02444d3615651129f1e394aba helm dependency build -helm template . --name-template dev-west --include-crds +helm template . --name-template simple-app-west --namespace dev --values /tmp/_argocd-repo/dbb92269-9c18-47ad-b229-ae14b41dd16e/services/simple-application/values.yaml --values /tmp/_argocd-repo/dbb92269-9c18-47ad-b229-ae14b41dd16e/services/simple-application/dev/values.yaml --include-crds ``` \ No newline at end of file diff --git a/dev-west/hydrator.metadata b/dev-west/hydrator.metadata index 50ebaa6..d72d925 100755 --- a/dev-west/hydrator.metadata +++ b/dev-west/hydrator.metadata @@ -1,8 +1,8 @@ { "commands": [ "helm dependency build", - "helm template . --name-template dev-west --include-crds" + "helm template . --name-template simple-app-west --namespace dev --values /tmp/_argocd-repo/dbb92269-9c18-47ad-b229-ae14b41dd16e/services/simple-application/values.yaml --values /tmp/_argocd-repo/dbb92269-9c18-47ad-b229-ae14b41dd16e/services/simple-application/dev/values.yaml --include-crds" ], "repoURL": "https://github.com/agaudreault/gitops-tests", - "drySha": "61d5c337ea259389cc3ebfa0e449317a3517be42" + "drySha": "ca2ff0b38fae3dd02444d3615651129f1e394aba" } \ No newline at end of file diff --git a/dev-west/manifest.yaml b/dev-west/manifest.yaml index 3f1ab23..63b6188 100755 --- a/dev-west/manifest.yaml +++ b/dev-west/manifest.yaml @@ -3,50 +3,50 @@ automountServiceAccountToken: false kind: ServiceAccount metadata: annotations: - argocd.argoproj.io/tracking-id: dev-west:/ServiceAccount:default/dev-west-mariadb + argocd.argoproj.io/tracking-id: dev-west:/ServiceAccount:dev/simple-app-west-mariadb labels: app.kubernetes.io/instance: dev-west app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: mariadb helm.sh/chart: mariadb-13.0.1 - name: dev-west-mariadb - namespace: default + name: simple-app-west-mariadb + namespace: dev --- apiVersion: v1 data: - mariadb-password: MVd4d29jQzVxRg== - mariadb-root-password: TTZWRkthQWViTA== + mariadb-password: TTVzRFdEb2xkVw== + mariadb-root-password: dHlYMXQ3MTlUdg== kind: Secret metadata: annotations: - argocd.argoproj.io/tracking-id: dev-west:/Secret:default/dev-west-mariadb + argocd.argoproj.io/tracking-id: dev-west:/Secret:dev/simple-app-west-mariadb labels: app.kubernetes.io/instance: dev-west app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: mariadb helm.sh/chart: mariadb-13.0.1 - name: dev-west-mariadb - namespace: default + name: simple-app-west-mariadb + namespace: dev type: Opaque --- apiVersion: v1 data: - wordpress-password: R0FnVUVLQ2hKNg== + wordpress-password: cEVNdDdXWXFkNQ== kind: Secret metadata: annotations: - argocd.argoproj.io/tracking-id: dev-west:/Secret:default/dev-west-app + argocd.argoproj.io/tracking-id: dev-west:/Secret:dev/simple-app-west labels: app.kubernetes.io/instance: dev-west app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: app helm.sh/chart: app-17.0.5 - name: dev-west-app - namespace: default + name: simple-app-west + namespace: dev type: Opaque --- @@ -85,15 +85,15 @@ data: kind: ConfigMap metadata: annotations: - argocd.argoproj.io/tracking-id: dev-west:/ConfigMap:default/dev-west-mariadb + argocd.argoproj.io/tracking-id: dev-west:/ConfigMap:dev/simple-app-west-mariadb labels: app.kubernetes.io/component: primary app.kubernetes.io/instance: dev-west app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: mariadb helm.sh/chart: mariadb-13.0.1 - name: dev-west-mariadb - namespace: default + name: simple-app-west-mariadb + namespace: dev --- @@ -101,14 +101,14 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: annotations: - argocd.argoproj.io/tracking-id: dev-west:/PersistentVolumeClaim:default/dev-west-app + argocd.argoproj.io/tracking-id: dev-west:/PersistentVolumeClaim:dev/simple-app-west labels: app.kubernetes.io/instance: dev-west app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: app helm.sh/chart: app-17.0.5 - name: dev-west-app - namespace: default + name: simple-app-west + namespace: dev spec: accessModes: - ReadWriteOnce @@ -122,15 +122,15 @@ apiVersion: v1 kind: Service metadata: annotations: - argocd.argoproj.io/tracking-id: dev-west:/Service:default/dev-west-mariadb + argocd.argoproj.io/tracking-id: dev-west:/Service:dev/simple-app-west-mariadb labels: app.kubernetes.io/component: primary app.kubernetes.io/instance: dev-west app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: mariadb helm.sh/chart: mariadb-13.0.1 - name: dev-west-mariadb - namespace: default + name: simple-app-west-mariadb + namespace: dev spec: ports: - name: mysql @@ -140,7 +140,7 @@ spec: targetPort: mysql selector: app.kubernetes.io/component: primary - app.kubernetes.io/instance: dev-west + app.kubernetes.io/instance: simple-app-west app.kubernetes.io/name: mariadb sessionAffinity: None type: ClusterIP @@ -151,30 +151,31 @@ apiVersion: v1 kind: Service metadata: annotations: - argocd.argoproj.io/tracking-id: dev-west:/Service:default/dev-west-app + argocd.argoproj.io/tracking-id: dev-west:/Service:dev/simple-app-west labels: app.kubernetes.io/instance: dev-west app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: app helm.sh/chart: app-17.0.5 - name: dev-west-app - namespace: default + name: simple-app-west + namespace: dev spec: - externalTrafficPolicy: Cluster ports: - name: http + nodePort: null port: 80 protocol: TCP targetPort: http - name: https + nodePort: null port: 443 protocol: TCP targetPort: https selector: - app.kubernetes.io/instance: dev-west + app.kubernetes.io/instance: simple-app-west app.kubernetes.io/name: app sessionAffinity: None - type: LoadBalancer + type: ClusterIP --- @@ -182,26 +183,26 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - argocd.argoproj.io/tracking-id: dev-west:apps/Deployment:default/dev-west-app + argocd.argoproj.io/tracking-id: dev-west:apps/Deployment:dev/simple-app-west labels: app.kubernetes.io/instance: dev-west app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: app helm.sh/chart: app-17.0.5 - name: dev-west-app - namespace: default + name: simple-app-west + namespace: dev spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/instance: dev-west + app.kubernetes.io/instance: simple-app-west app.kubernetes.io/name: app strategy: type: RollingUpdate template: metadata: labels: - app.kubernetes.io/instance: dev-west + app.kubernetes.io/instance: simple-app-west app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: app helm.sh/chart: app-17.0.5 @@ -214,7 +215,7 @@ spec: - podAffinityTerm: labelSelector: matchLabels: - app.kubernetes.io/instance: dev-west + app.kubernetes.io/instance: simple-app-west app.kubernetes.io/name: app topologyKey: kubernetes.io/hostname weight: 1 @@ -225,7 +226,7 @@ spec: - name: ALLOW_EMPTY_PASSWORD value: "yes" - name: MARIADB_HOST - value: dev-west-mariadb + value: simple-app-west-mariadb - name: MARIADB_PORT_NUMBER value: "3306" - name: WORDPRESS_DATABASE_NAME @@ -236,14 +237,14 @@ spec: valueFrom: secretKeyRef: key: mariadb-password - name: dev-west-mariadb + name: simple-app-west-mariadb - name: WORDPRESS_USERNAME value: user - name: WORDPRESS_PASSWORD valueFrom: secretKeyRef: key: wordpress-password - name: dev-west-app + name: simple-app-west - name: WORDPRESS_EMAIL value: user@example.com - name: WORDPRESS_FIRST_NAME @@ -330,7 +331,7 @@ spec: volumes: - name: wordpress-data persistentVolumeClaim: - claimName: dev-west-app + claimName: simple-app-west --- @@ -338,31 +339,31 @@ apiVersion: apps/v1 kind: StatefulSet metadata: annotations: - argocd.argoproj.io/tracking-id: dev-west:apps/StatefulSet:default/dev-west-mariadb + argocd.argoproj.io/tracking-id: dev-west:apps/StatefulSet:dev/simple-app-west-mariadb labels: app.kubernetes.io/component: primary app.kubernetes.io/instance: dev-west app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: mariadb helm.sh/chart: mariadb-13.0.1 - name: dev-west-mariadb - namespace: default + name: simple-app-west-mariadb + namespace: dev spec: replicas: 1 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: primary - app.kubernetes.io/instance: dev-west + app.kubernetes.io/instance: simple-app-west app.kubernetes.io/name: mariadb - serviceName: dev-west-mariadb + serviceName: simple-app-west-mariadb template: metadata: annotations: - checksum/configuration: c820ba10d16656fc63921f936359d597a752a872d2093d14bd8f733192f16073 + checksum/configuration: 24811fed6e3d9f217d003ea864fb2849ddd2515ab6ccbf5b0769141dd997f786 labels: app.kubernetes.io/component: primary - app.kubernetes.io/instance: dev-west + app.kubernetes.io/instance: simple-app-west app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: mariadb helm.sh/chart: mariadb-13.0.1 @@ -376,7 +377,7 @@ spec: labelSelector: matchLabels: app.kubernetes.io/component: primary - app.kubernetes.io/instance: dev-west + app.kubernetes.io/instance: simple-app-west app.kubernetes.io/name: mariadb topologyKey: kubernetes.io/hostname weight: 1 @@ -388,14 +389,14 @@ spec: valueFrom: secretKeyRef: key: mariadb-root-password - name: dev-west-mariadb + name: simple-app-west-mariadb - name: MARIADB_USER value: bn_wordpress - name: MARIADB_PASSWORD valueFrom: secretKeyRef: key: mariadb-password - name: dev-west-mariadb + name: simple-app-west-mariadb - name: MARIADB_DATABASE value: bitnami_wordpress image: docker.io/bitnami/mariadb:11.0.2-debian-11-r2 @@ -452,10 +453,10 @@ spec: subPath: my.cnf securityContext: fsGroup: 1001 - serviceAccountName: dev-west-mariadb + serviceAccountName: simple-app-west-mariadb volumes: - configMap: - name: dev-west-mariadb + name: simple-app-west-mariadb name: config updateStrategy: type: RollingUpdate @@ -463,7 +464,7 @@ spec: - metadata: labels: app.kubernetes.io/component: primary - app.kubernetes.io/instance: dev-west + app.kubernetes.io/instance: simple-app-west app.kubernetes.io/name: mariadb name: data spec: diff --git a/hydrator.metadata b/hydrator.metadata index b42f55d..45be5df 100755 --- a/hydrator.metadata +++ b/hydrator.metadata @@ -1,5 +1,5 @@ { "commands": null, "repoURL": "https://github.com/agaudreault/gitops-tests", - "drySha": "61d5c337ea259389cc3ebfa0e449317a3517be42" + "drySha": "ca2ff0b38fae3dd02444d3615651129f1e394aba" } \ No newline at end of file