From e0dcc52b94e224a2c8edca78afe1d53430c4967b 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 10:31:39 -0700 Subject: [PATCH 1/3] [Argo CD Bot] hydrate 61d5c337ea259389cc3ebfa0e449317a3517be42 --- hydrator.metadata | 5 + prod-east/README.md | 11 + prod-east/hydrator.metadata | 5 + prod-east/manifest.yaml | 477 ++++++++++++++++++++++++++++++++++++ prod-west/README.md | 11 + prod-west/hydrator.metadata | 5 + prod-west/manifest.yaml | 477 ++++++++++++++++++++++++++++++++++++ 7 files changed, 991 insertions(+) create mode 100755 hydrator.metadata create mode 100644 prod-east/README.md create mode 100755 prod-east/hydrator.metadata create mode 100755 prod-east/manifest.yaml create mode 100644 prod-west/README.md create mode 100755 prod-west/hydrator.metadata create mode 100755 prod-west/manifest.yaml diff --git a/hydrator.metadata b/hydrator.metadata new file mode 100755 index 0000000..b42f55d --- /dev/null +++ b/hydrator.metadata @@ -0,0 +1,5 @@ +{ + "commands": null, + "repoURL": "https://github.com/agaudreault/gitops-tests", + "drySha": "61d5c337ea259389cc3ebfa0e449317a3517be42" +} \ No newline at end of file diff --git a/prod-east/README.md b/prod-east/README.md new file mode 100644 index 0000000..a0242c3 --- /dev/null +++ b/prod-east/README.md @@ -0,0 +1,11 @@ + +# Manifest Hydration + +To hydrate the manifests in this repository, run the following commands: + +```shell + +git clone https://github.com/agaudreault/gitops-tests +# cd into the cloned directory +git checkout 61d5c337ea259389cc3ebfa0e449317a3517be42 +``` \ No newline at end of file diff --git a/prod-east/hydrator.metadata b/prod-east/hydrator.metadata new file mode 100755 index 0000000..b42f55d --- /dev/null +++ b/prod-east/hydrator.metadata @@ -0,0 +1,5 @@ +{ + "commands": null, + "repoURL": "https://github.com/agaudreault/gitops-tests", + "drySha": "61d5c337ea259389cc3ebfa0e449317a3517be42" +} \ No newline at end of file diff --git a/prod-east/manifest.yaml b/prod-east/manifest.yaml new file mode 100755 index 0000000..b8e5288 --- /dev/null +++ b/prod-east/manifest.yaml @@ -0,0 +1,477 @@ +apiVersion: v1 +automountServiceAccountToken: false +kind: ServiceAccount +metadata: + annotations: + argocd.argoproj.io/tracking-id: prod-east:/ServiceAccount:default/prod-east-mariadb + labels: + app.kubernetes.io/instance: prod-east + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: mariadb + helm.sh/chart: mariadb-13.0.1 + name: prod-east-mariadb + namespace: default + +--- + +apiVersion: v1 +data: + mariadb-password: SDdMN3pRSUV0MQ== + mariadb-root-password: M0JNMGdFMU9HbQ== +kind: Secret +metadata: + annotations: + argocd.argoproj.io/tracking-id: prod-east:/Secret:default/prod-east-mariadb + labels: + app.kubernetes.io/instance: prod-east + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: mariadb + helm.sh/chart: mariadb-13.0.1 + name: prod-east-mariadb + namespace: default +type: Opaque + +--- + +apiVersion: v1 +data: + wordpress-password: S0J5OG10UlBoUw== +kind: Secret +metadata: + annotations: + argocd.argoproj.io/tracking-id: prod-east:/Secret:default/prod-east-app + labels: + app.kubernetes.io/instance: prod-east + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: app + helm.sh/chart: app-17.0.5 + name: prod-east-app + namespace: default +type: Opaque + +--- + +apiVersion: v1 +data: + my.cnf: |- + [mysqld] + skip-name-resolve + explicit_defaults_for_timestamp + basedir=/opt/bitnami/mariadb + datadir=/bitnami/mariadb/data + plugin_dir=/opt/bitnami/mariadb/plugin + port=3306 + socket=/opt/bitnami/mariadb/tmp/mysql.sock + tmpdir=/opt/bitnami/mariadb/tmp + max_allowed_packet=16M + bind-address=* + pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid + log-error=/opt/bitnami/mariadb/logs/mysqld.log + character-set-server=UTF8 + collation-server=utf8_general_ci + slow_query_log=0 + long_query_time=10.0 + + [client] + port=3306 + socket=/opt/bitnami/mariadb/tmp/mysql.sock + default-character-set=UTF8 + plugin_dir=/opt/bitnami/mariadb/plugin + + [manager] + port=3306 + socket=/opt/bitnami/mariadb/tmp/mysql.sock + pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid +kind: ConfigMap +metadata: + annotations: + argocd.argoproj.io/tracking-id: prod-east:/ConfigMap:default/prod-east-mariadb + labels: + app.kubernetes.io/component: primary + app.kubernetes.io/instance: prod-east + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: mariadb + helm.sh/chart: mariadb-13.0.1 + name: prod-east-mariadb + namespace: default + +--- + +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + annotations: + argocd.argoproj.io/tracking-id: prod-east:/PersistentVolumeClaim:default/prod-east-app + labels: + app.kubernetes.io/instance: prod-east + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: app + helm.sh/chart: app-17.0.5 + name: prod-east-app + namespace: default +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 10Gi + +--- + +apiVersion: v1 +kind: Service +metadata: + annotations: + argocd.argoproj.io/tracking-id: prod-east:/Service:default/prod-east-mariadb + labels: + app.kubernetes.io/component: primary + app.kubernetes.io/instance: prod-east + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: mariadb + helm.sh/chart: mariadb-13.0.1 + name: prod-east-mariadb + namespace: default +spec: + ports: + - name: mysql + nodePort: null + port: 3306 + protocol: TCP + targetPort: mysql + selector: + app.kubernetes.io/component: primary + app.kubernetes.io/instance: prod-east + app.kubernetes.io/name: mariadb + sessionAffinity: None + type: ClusterIP + +--- + +apiVersion: v1 +kind: Service +metadata: + annotations: + argocd.argoproj.io/tracking-id: prod-east:/Service:default/prod-east-app + labels: + app.kubernetes.io/instance: prod-east + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: app + helm.sh/chart: app-17.0.5 + name: prod-east-app + namespace: default +spec: + externalTrafficPolicy: Cluster + ports: + - name: http + port: 80 + protocol: TCP + targetPort: http + - name: https + port: 443 + protocol: TCP + targetPort: https + selector: + app.kubernetes.io/instance: prod-east + app.kubernetes.io/name: app + sessionAffinity: None + type: LoadBalancer + +--- + +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + argocd.argoproj.io/tracking-id: prod-east:apps/Deployment:default/prod-east-app + labels: + app.kubernetes.io/instance: prod-east + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: app + helm.sh/chart: app-17.0.5 + name: prod-east-app + namespace: default +spec: + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/instance: prod-east + app.kubernetes.io/name: app + strategy: + type: RollingUpdate + template: + metadata: + labels: + app.kubernetes.io/instance: prod-east + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: app + helm.sh/chart: app-17.0.5 + spec: + affinity: + nodeAffinity: null + podAffinity: null + podAntiAffinity: + preferredDuringSchedulingIgnoredDuringExecution: + - podAffinityTerm: + labelSelector: + matchLabels: + app.kubernetes.io/instance: prod-east + app.kubernetes.io/name: app + topologyKey: kubernetes.io/hostname + weight: 1 + containers: + - env: + - name: BITNAMI_DEBUG + value: "false" + - name: ALLOW_EMPTY_PASSWORD + value: "yes" + - name: MARIADB_HOST + value: prod-east-mariadb + - name: MARIADB_PORT_NUMBER + value: "3306" + - name: WORDPRESS_DATABASE_NAME + value: bitnami_wordpress + - name: WORDPRESS_DATABASE_USER + value: bn_wordpress + - name: WORDPRESS_DATABASE_PASSWORD + valueFrom: + secretKeyRef: + key: mariadb-password + name: prod-east-mariadb + - name: WORDPRESS_USERNAME + value: user + - name: WORDPRESS_PASSWORD + valueFrom: + secretKeyRef: + key: wordpress-password + name: prod-east-app + - name: WORDPRESS_EMAIL + value: user@example.com + - name: WORDPRESS_FIRST_NAME + value: FirstName + - name: WORDPRESS_LAST_NAME + value: LastName + - name: WORDPRESS_HTACCESS_OVERRIDE_NONE + value: "no" + - name: WORDPRESS_ENABLE_HTACCESS_PERSISTENCE + value: "no" + - name: WORDPRESS_BLOG_NAME + value: User's Blog! + - name: WORDPRESS_SKIP_BOOTSTRAP + value: "no" + - name: WORDPRESS_TABLE_PREFIX + value: wp_ + - name: WORDPRESS_SCHEME + value: http + - name: WORDPRESS_EXTRA_WP_CONFIG_CONTENT + value: "" + - name: WORDPRESS_PLUGINS + value: none + - name: APACHE_HTTP_PORT_NUMBER + value: "8080" + - name: APACHE_HTTPS_PORT_NUMBER + value: "8443" + envFrom: null + image: docker.io/bitnami/wordpress:6.2.2-debian-11-r82 + imagePullPolicy: IfNotPresent + livenessProbe: + failureThreshold: 6 + httpGet: + httpHeaders: [] + path: /wp-admin/install.php + port: http + scheme: HTTP + initialDelaySeconds: 120 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 5 + name: wordpress + ports: + - containerPort: 8080 + name: http + - containerPort: 8443 + name: https + readinessProbe: + failureThreshold: 6 + httpGet: + httpHeaders: [] + path: /wp-login.php + port: http + scheme: HTTP + initialDelaySeconds: 30 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 5 + resources: + limits: {} + requests: + cpu: 300m + memory: 512Mi + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + readOnlyRootFilesystem: false + runAsNonRoot: true + runAsUser: 1001 + volumeMounts: + - mountPath: /bitnami/wordpress + name: wordpress-data + subPath: wordpress + hostAliases: + - hostnames: + - status.localhost + ip: 127.0.0.1 + securityContext: + fsGroup: 1001 + seccompProfile: + type: RuntimeDefault + serviceAccountName: default + volumes: + - name: wordpress-data + persistentVolumeClaim: + claimName: prod-east-app + +--- + +apiVersion: apps/v1 +kind: StatefulSet +metadata: + annotations: + argocd.argoproj.io/tracking-id: prod-east:apps/StatefulSet:default/prod-east-mariadb + labels: + app.kubernetes.io/component: primary + app.kubernetes.io/instance: prod-east + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: mariadb + helm.sh/chart: mariadb-13.0.1 + name: prod-east-mariadb + namespace: default +spec: + replicas: 1 + revisionHistoryLimit: 10 + selector: + matchLabels: + app.kubernetes.io/component: primary + app.kubernetes.io/instance: prod-east + app.kubernetes.io/name: mariadb + serviceName: prod-east-mariadb + template: + metadata: + annotations: + checksum/configuration: d6867ee1221d3b28fbf640c55a96449ec10f255a0b71d5b017b3b4a5bde29565 + labels: + app.kubernetes.io/component: primary + app.kubernetes.io/instance: prod-east + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: mariadb + helm.sh/chart: mariadb-13.0.1 + spec: + affinity: + nodeAffinity: null + podAffinity: null + podAntiAffinity: + preferredDuringSchedulingIgnoredDuringExecution: + - podAffinityTerm: + labelSelector: + matchLabels: + app.kubernetes.io/component: primary + app.kubernetes.io/instance: prod-east + app.kubernetes.io/name: mariadb + topologyKey: kubernetes.io/hostname + weight: 1 + containers: + - env: + - name: BITNAMI_DEBUG + value: "false" + - name: MARIADB_ROOT_PASSWORD + valueFrom: + secretKeyRef: + key: mariadb-root-password + name: prod-east-mariadb + - name: MARIADB_USER + value: bn_wordpress + - name: MARIADB_PASSWORD + valueFrom: + secretKeyRef: + key: mariadb-password + name: prod-east-mariadb + - name: MARIADB_DATABASE + value: bitnami_wordpress + image: docker.io/bitnami/mariadb:11.0.2-debian-11-r2 + imagePullPolicy: IfNotPresent + livenessProbe: + exec: + command: + - /bin/bash + - -ec + - | + password_aux="${MARIADB_ROOT_PASSWORD:-}" + if [[ -f "${MARIADB_ROOT_PASSWORD_FILE:-}" ]]; then + password_aux=$(cat "$MARIADB_ROOT_PASSWORD_FILE") + fi + mysqladmin status -uroot -p"${password_aux}" + failureThreshold: 3 + initialDelaySeconds: 120 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 1 + name: mariadb + ports: + - containerPort: 3306 + name: mysql + readinessProbe: + exec: + command: + - /bin/bash + - -ec + - | + password_aux="${MARIADB_ROOT_PASSWORD:-}" + if [[ -f "${MARIADB_ROOT_PASSWORD_FILE:-}" ]]; then + password_aux=$(cat "$MARIADB_ROOT_PASSWORD_FILE") + fi + mysqladmin status -uroot -p"${password_aux}" + failureThreshold: 3 + initialDelaySeconds: 30 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 1 + resources: + limits: {} + requests: {} + securityContext: + allowPrivilegeEscalation: false + privileged: false + runAsNonRoot: true + runAsUser: 1001 + volumeMounts: + - mountPath: /bitnami/mariadb + name: data + - mountPath: /opt/bitnami/mariadb/conf/my.cnf + name: config + subPath: my.cnf + securityContext: + fsGroup: 1001 + serviceAccountName: prod-east-mariadb + volumes: + - configMap: + name: prod-east-mariadb + name: config + updateStrategy: + type: RollingUpdate + volumeClaimTemplates: + - metadata: + labels: + app.kubernetes.io/component: primary + app.kubernetes.io/instance: prod-east + app.kubernetes.io/name: mariadb + name: data + spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 8Gi + +--- + diff --git a/prod-west/README.md b/prod-west/README.md new file mode 100644 index 0000000..a0242c3 --- /dev/null +++ b/prod-west/README.md @@ -0,0 +1,11 @@ + +# Manifest Hydration + +To hydrate the manifests in this repository, run the following commands: + +```shell + +git clone https://github.com/agaudreault/gitops-tests +# cd into the cloned directory +git checkout 61d5c337ea259389cc3ebfa0e449317a3517be42 +``` \ No newline at end of file diff --git a/prod-west/hydrator.metadata b/prod-west/hydrator.metadata new file mode 100755 index 0000000..b42f55d --- /dev/null +++ b/prod-west/hydrator.metadata @@ -0,0 +1,5 @@ +{ + "commands": null, + "repoURL": "https://github.com/agaudreault/gitops-tests", + "drySha": "61d5c337ea259389cc3ebfa0e449317a3517be42" +} \ No newline at end of file diff --git a/prod-west/manifest.yaml b/prod-west/manifest.yaml new file mode 100755 index 0000000..f7dd6dc --- /dev/null +++ b/prod-west/manifest.yaml @@ -0,0 +1,477 @@ +apiVersion: v1 +automountServiceAccountToken: false +kind: ServiceAccount +metadata: + annotations: + argocd.argoproj.io/tracking-id: prod-west:/ServiceAccount:default/prod-west-mariadb + labels: + app.kubernetes.io/instance: prod-west + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: mariadb + helm.sh/chart: mariadb-13.0.1 + name: prod-west-mariadb + namespace: default + +--- + +apiVersion: v1 +data: + mariadb-password: SnY0cnBGY0hGRA== + mariadb-root-password: VTQ0SkZHWHlWcw== +kind: Secret +metadata: + annotations: + argocd.argoproj.io/tracking-id: prod-west:/Secret:default/prod-west-mariadb + labels: + app.kubernetes.io/instance: prod-west + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: mariadb + helm.sh/chart: mariadb-13.0.1 + name: prod-west-mariadb + namespace: default +type: Opaque + +--- + +apiVersion: v1 +data: + wordpress-password: SlNXSXc2dVFkeA== +kind: Secret +metadata: + annotations: + argocd.argoproj.io/tracking-id: prod-west:/Secret:default/prod-west-app + labels: + app.kubernetes.io/instance: prod-west + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: app + helm.sh/chart: app-17.0.5 + name: prod-west-app + namespace: default +type: Opaque + +--- + +apiVersion: v1 +data: + my.cnf: |- + [mysqld] + skip-name-resolve + explicit_defaults_for_timestamp + basedir=/opt/bitnami/mariadb + datadir=/bitnami/mariadb/data + plugin_dir=/opt/bitnami/mariadb/plugin + port=3306 + socket=/opt/bitnami/mariadb/tmp/mysql.sock + tmpdir=/opt/bitnami/mariadb/tmp + max_allowed_packet=16M + bind-address=* + pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid + log-error=/opt/bitnami/mariadb/logs/mysqld.log + character-set-server=UTF8 + collation-server=utf8_general_ci + slow_query_log=0 + long_query_time=10.0 + + [client] + port=3306 + socket=/opt/bitnami/mariadb/tmp/mysql.sock + default-character-set=UTF8 + plugin_dir=/opt/bitnami/mariadb/plugin + + [manager] + port=3306 + socket=/opt/bitnami/mariadb/tmp/mysql.sock + pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid +kind: ConfigMap +metadata: + annotations: + argocd.argoproj.io/tracking-id: prod-west:/ConfigMap:default/prod-west-mariadb + labels: + app.kubernetes.io/component: primary + app.kubernetes.io/instance: prod-west + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: mariadb + helm.sh/chart: mariadb-13.0.1 + name: prod-west-mariadb + namespace: default + +--- + +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + annotations: + argocd.argoproj.io/tracking-id: prod-west:/PersistentVolumeClaim:default/prod-west-app + labels: + app.kubernetes.io/instance: prod-west + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: app + helm.sh/chart: app-17.0.5 + name: prod-west-app + namespace: default +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 10Gi + +--- + +apiVersion: v1 +kind: Service +metadata: + annotations: + argocd.argoproj.io/tracking-id: prod-west:/Service:default/prod-west-mariadb + labels: + app.kubernetes.io/component: primary + app.kubernetes.io/instance: prod-west + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: mariadb + helm.sh/chart: mariadb-13.0.1 + name: prod-west-mariadb + namespace: default +spec: + ports: + - name: mysql + nodePort: null + port: 3306 + protocol: TCP + targetPort: mysql + selector: + app.kubernetes.io/component: primary + app.kubernetes.io/instance: prod-west + app.kubernetes.io/name: mariadb + sessionAffinity: None + type: ClusterIP + +--- + +apiVersion: v1 +kind: Service +metadata: + annotations: + argocd.argoproj.io/tracking-id: prod-west:/Service:default/prod-west-app + labels: + app.kubernetes.io/instance: prod-west + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: app + helm.sh/chart: app-17.0.5 + name: prod-west-app + namespace: default +spec: + externalTrafficPolicy: Cluster + ports: + - name: http + port: 80 + protocol: TCP + targetPort: http + - name: https + port: 443 + protocol: TCP + targetPort: https + selector: + app.kubernetes.io/instance: prod-west + app.kubernetes.io/name: app + sessionAffinity: None + type: LoadBalancer + +--- + +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + argocd.argoproj.io/tracking-id: prod-west:apps/Deployment:default/prod-west-app + labels: + app.kubernetes.io/instance: prod-west + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: app + helm.sh/chart: app-17.0.5 + name: prod-west-app + namespace: default +spec: + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/instance: prod-west + app.kubernetes.io/name: app + strategy: + type: RollingUpdate + template: + metadata: + labels: + app.kubernetes.io/instance: prod-west + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: app + helm.sh/chart: app-17.0.5 + spec: + affinity: + nodeAffinity: null + podAffinity: null + podAntiAffinity: + preferredDuringSchedulingIgnoredDuringExecution: + - podAffinityTerm: + labelSelector: + matchLabels: + app.kubernetes.io/instance: prod-west + app.kubernetes.io/name: app + topologyKey: kubernetes.io/hostname + weight: 1 + containers: + - env: + - name: BITNAMI_DEBUG + value: "false" + - name: ALLOW_EMPTY_PASSWORD + value: "yes" + - name: MARIADB_HOST + value: prod-west-mariadb + - name: MARIADB_PORT_NUMBER + value: "3306" + - name: WORDPRESS_DATABASE_NAME + value: bitnami_wordpress + - name: WORDPRESS_DATABASE_USER + value: bn_wordpress + - name: WORDPRESS_DATABASE_PASSWORD + valueFrom: + secretKeyRef: + key: mariadb-password + name: prod-west-mariadb + - name: WORDPRESS_USERNAME + value: user + - name: WORDPRESS_PASSWORD + valueFrom: + secretKeyRef: + key: wordpress-password + name: prod-west-app + - name: WORDPRESS_EMAIL + value: user@example.com + - name: WORDPRESS_FIRST_NAME + value: FirstName + - name: WORDPRESS_LAST_NAME + value: LastName + - name: WORDPRESS_HTACCESS_OVERRIDE_NONE + value: "no" + - name: WORDPRESS_ENABLE_HTACCESS_PERSISTENCE + value: "no" + - name: WORDPRESS_BLOG_NAME + value: User's Blog! + - name: WORDPRESS_SKIP_BOOTSTRAP + value: "no" + - name: WORDPRESS_TABLE_PREFIX + value: wp_ + - name: WORDPRESS_SCHEME + value: http + - name: WORDPRESS_EXTRA_WP_CONFIG_CONTENT + value: "" + - name: WORDPRESS_PLUGINS + value: none + - name: APACHE_HTTP_PORT_NUMBER + value: "8080" + - name: APACHE_HTTPS_PORT_NUMBER + value: "8443" + envFrom: null + image: docker.io/bitnami/wordpress:6.2.2-debian-11-r82 + imagePullPolicy: IfNotPresent + livenessProbe: + failureThreshold: 6 + httpGet: + httpHeaders: [] + path: /wp-admin/install.php + port: http + scheme: HTTP + initialDelaySeconds: 120 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 5 + name: wordpress + ports: + - containerPort: 8080 + name: http + - containerPort: 8443 + name: https + readinessProbe: + failureThreshold: 6 + httpGet: + httpHeaders: [] + path: /wp-login.php + port: http + scheme: HTTP + initialDelaySeconds: 30 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 5 + resources: + limits: {} + requests: + cpu: 300m + memory: 512Mi + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + readOnlyRootFilesystem: false + runAsNonRoot: true + runAsUser: 1001 + volumeMounts: + - mountPath: /bitnami/wordpress + name: wordpress-data + subPath: wordpress + hostAliases: + - hostnames: + - status.localhost + ip: 127.0.0.1 + securityContext: + fsGroup: 1001 + seccompProfile: + type: RuntimeDefault + serviceAccountName: default + volumes: + - name: wordpress-data + persistentVolumeClaim: + claimName: prod-west-app + +--- + +apiVersion: apps/v1 +kind: StatefulSet +metadata: + annotations: + argocd.argoproj.io/tracking-id: prod-west:apps/StatefulSet:default/prod-west-mariadb + labels: + app.kubernetes.io/component: primary + app.kubernetes.io/instance: prod-west + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: mariadb + helm.sh/chart: mariadb-13.0.1 + name: prod-west-mariadb + namespace: default +spec: + replicas: 1 + revisionHistoryLimit: 10 + selector: + matchLabels: + app.kubernetes.io/component: primary + app.kubernetes.io/instance: prod-west + app.kubernetes.io/name: mariadb + serviceName: prod-west-mariadb + template: + metadata: + annotations: + checksum/configuration: 118f46c93fdcb3b7b6624e5340ad13eed950d7f9018c77ba4a5f9b8349b2fde5 + labels: + app.kubernetes.io/component: primary + app.kubernetes.io/instance: prod-west + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: mariadb + helm.sh/chart: mariadb-13.0.1 + spec: + affinity: + nodeAffinity: null + podAffinity: null + podAntiAffinity: + preferredDuringSchedulingIgnoredDuringExecution: + - podAffinityTerm: + labelSelector: + matchLabels: + app.kubernetes.io/component: primary + app.kubernetes.io/instance: prod-west + app.kubernetes.io/name: mariadb + topologyKey: kubernetes.io/hostname + weight: 1 + containers: + - env: + - name: BITNAMI_DEBUG + value: "false" + - name: MARIADB_ROOT_PASSWORD + valueFrom: + secretKeyRef: + key: mariadb-root-password + name: prod-west-mariadb + - name: MARIADB_USER + value: bn_wordpress + - name: MARIADB_PASSWORD + valueFrom: + secretKeyRef: + key: mariadb-password + name: prod-west-mariadb + - name: MARIADB_DATABASE + value: bitnami_wordpress + image: docker.io/bitnami/mariadb:11.0.2-debian-11-r2 + imagePullPolicy: IfNotPresent + livenessProbe: + exec: + command: + - /bin/bash + - -ec + - | + password_aux="${MARIADB_ROOT_PASSWORD:-}" + if [[ -f "${MARIADB_ROOT_PASSWORD_FILE:-}" ]]; then + password_aux=$(cat "$MARIADB_ROOT_PASSWORD_FILE") + fi + mysqladmin status -uroot -p"${password_aux}" + failureThreshold: 3 + initialDelaySeconds: 120 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 1 + name: mariadb + ports: + - containerPort: 3306 + name: mysql + readinessProbe: + exec: + command: + - /bin/bash + - -ec + - | + password_aux="${MARIADB_ROOT_PASSWORD:-}" + if [[ -f "${MARIADB_ROOT_PASSWORD_FILE:-}" ]]; then + password_aux=$(cat "$MARIADB_ROOT_PASSWORD_FILE") + fi + mysqladmin status -uroot -p"${password_aux}" + failureThreshold: 3 + initialDelaySeconds: 30 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 1 + resources: + limits: {} + requests: {} + securityContext: + allowPrivilegeEscalation: false + privileged: false + runAsNonRoot: true + runAsUser: 1001 + volumeMounts: + - mountPath: /bitnami/mariadb + name: data + - mountPath: /opt/bitnami/mariadb/conf/my.cnf + name: config + subPath: my.cnf + securityContext: + fsGroup: 1001 + serviceAccountName: prod-west-mariadb + volumes: + - configMap: + name: prod-west-mariadb + name: config + updateStrategy: + type: RollingUpdate + volumeClaimTemplates: + - metadata: + labels: + app.kubernetes.io/component: primary + app.kubernetes.io/instance: prod-west + app.kubernetes.io/name: mariadb + name: data + spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 8Gi + +--- + From 5736fb0b1dbe298c25ee1bf6a800974738d5d172 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:40:54 -0700 Subject: [PATCH 2/3] [Argo CD Bot] hydrate 61d5c337ea259389cc3ebfa0e449317a3517be42 --- prod-east/README.md | 2 ++ prod-east/hydrator.metadata | 5 ++++- prod-east/manifest.yaml | 6 +++--- prod-west/README.md | 2 ++ prod-west/hydrator.metadata | 5 ++++- prod-west/manifest.yaml | 6 +++--- 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/prod-east/README.md b/prod-east/README.md index a0242c3..140c02c 100644 --- a/prod-east/README.md +++ b/prod-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 prod-east --include-crds ``` \ No newline at end of file diff --git a/prod-east/hydrator.metadata b/prod-east/hydrator.metadata index b42f55d..de74ded 100755 --- a/prod-east/hydrator.metadata +++ b/prod-east/hydrator.metadata @@ -1,5 +1,8 @@ { - "commands": null, + "commands": [ + "helm dependency build", + "helm template . --name-template prod-east --include-crds" + ], "repoURL": "https://github.com/agaudreault/gitops-tests", "drySha": "61d5c337ea259389cc3ebfa0e449317a3517be42" } \ No newline at end of file diff --git a/prod-east/manifest.yaml b/prod-east/manifest.yaml index b8e5288..f3a2e58 100755 --- a/prod-east/manifest.yaml +++ b/prod-east/manifest.yaml @@ -16,8 +16,8 @@ metadata: apiVersion: v1 data: - mariadb-password: SDdMN3pRSUV0MQ== - mariadb-root-password: M0JNMGdFMU9HbQ== + mariadb-password: V3hSTVRjcU51bg== + mariadb-root-password: SFFvUURFTmh4Sw== kind: Secret metadata: annotations: @@ -35,7 +35,7 @@ type: Opaque apiVersion: v1 data: - wordpress-password: S0J5OG10UlBoUw== + wordpress-password: VDZmRzJMQ21RVg== kind: Secret metadata: annotations: diff --git a/prod-west/README.md b/prod-west/README.md index a0242c3..bc32bb4 100644 --- a/prod-west/README.md +++ b/prod-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 prod-west --include-crds ``` \ No newline at end of file diff --git a/prod-west/hydrator.metadata b/prod-west/hydrator.metadata index b42f55d..4d08c72 100755 --- a/prod-west/hydrator.metadata +++ b/prod-west/hydrator.metadata @@ -1,5 +1,8 @@ { - "commands": null, + "commands": [ + "helm dependency build", + "helm template . --name-template prod-west --include-crds" + ], "repoURL": "https://github.com/agaudreault/gitops-tests", "drySha": "61d5c337ea259389cc3ebfa0e449317a3517be42" } \ No newline at end of file diff --git a/prod-west/manifest.yaml b/prod-west/manifest.yaml index f7dd6dc..94171d4 100755 --- a/prod-west/manifest.yaml +++ b/prod-west/manifest.yaml @@ -16,8 +16,8 @@ metadata: apiVersion: v1 data: - mariadb-password: SnY0cnBGY0hGRA== - mariadb-root-password: VTQ0SkZHWHlWcw== + mariadb-password: Wk90ZVZZY2Z1eA== + mariadb-root-password: azRaVFNGbWZ6OQ== kind: Secret metadata: annotations: @@ -35,7 +35,7 @@ type: Opaque apiVersion: v1 data: - wordpress-password: SlNXSXc2dVFkeA== + wordpress-password: UkVwYlpiOW1KOA== kind: Secret metadata: annotations: From 8bf8cc37a5a1c2d67bca3b7a074bc3994ed02004 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:48 -0700 Subject: [PATCH 3/3] [Argo CD Bot] hydrate ca2ff0b38fae3dd02444d3615651129f1e394aba --- hydrator.metadata | 2 +- prod-east/README.md | 4 +- prod-east/hydrator.metadata | 4 +- prod-east/manifest.yaml | 103 ++++++++++++++++++------------------ prod-west/README.md | 4 +- prod-west/hydrator.metadata | 4 +- prod-west/manifest.yaml | 103 ++++++++++++++++++------------------ 7 files changed, 113 insertions(+), 111 deletions(-) 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 diff --git a/prod-east/README.md b/prod-east/README.md index 140c02c..81b87f6 100644 --- a/prod-east/README.md +++ b/prod-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 prod-east --include-crds +helm template . --name-template simple-app-east --namespace production-2 --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/prod/values.yaml --include-crds ``` \ No newline at end of file diff --git a/prod-east/hydrator.metadata b/prod-east/hydrator.metadata index de74ded..cfeb03e 100755 --- a/prod-east/hydrator.metadata +++ b/prod-east/hydrator.metadata @@ -1,8 +1,8 @@ { "commands": [ "helm dependency build", - "helm template . --name-template prod-east --include-crds" + "helm template . --name-template simple-app-east --namespace production-2 --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/prod/values.yaml --include-crds" ], "repoURL": "https://github.com/agaudreault/gitops-tests", - "drySha": "61d5c337ea259389cc3ebfa0e449317a3517be42" + "drySha": "ca2ff0b38fae3dd02444d3615651129f1e394aba" } \ No newline at end of file diff --git a/prod-east/manifest.yaml b/prod-east/manifest.yaml index f3a2e58..4d77750 100755 --- a/prod-east/manifest.yaml +++ b/prod-east/manifest.yaml @@ -3,50 +3,50 @@ automountServiceAccountToken: false kind: ServiceAccount metadata: annotations: - argocd.argoproj.io/tracking-id: prod-east:/ServiceAccount:default/prod-east-mariadb + argocd.argoproj.io/tracking-id: prod-east:/ServiceAccount:production-2/simple-app-east-mariadb labels: app.kubernetes.io/instance: prod-east app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: mariadb helm.sh/chart: mariadb-13.0.1 - name: prod-east-mariadb - namespace: default + name: simple-app-east-mariadb + namespace: production-2 --- apiVersion: v1 data: - mariadb-password: V3hSTVRjcU51bg== - mariadb-root-password: SFFvUURFTmh4Sw== + mariadb-password: MXBYVU52U0pkRQ== + mariadb-root-password: RjV3dmNuR1h0UA== kind: Secret metadata: annotations: - argocd.argoproj.io/tracking-id: prod-east:/Secret:default/prod-east-mariadb + argocd.argoproj.io/tracking-id: prod-east:/Secret:production-2/simple-app-east-mariadb labels: app.kubernetes.io/instance: prod-east app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: mariadb helm.sh/chart: mariadb-13.0.1 - name: prod-east-mariadb - namespace: default + name: simple-app-east-mariadb + namespace: production-2 type: Opaque --- apiVersion: v1 data: - wordpress-password: VDZmRzJMQ21RVg== + wordpress-password: WVRjNjBlenhZTA== kind: Secret metadata: annotations: - argocd.argoproj.io/tracking-id: prod-east:/Secret:default/prod-east-app + argocd.argoproj.io/tracking-id: prod-east:/Secret:production-2/simple-app-east labels: app.kubernetes.io/instance: prod-east app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: app helm.sh/chart: app-17.0.5 - name: prod-east-app - namespace: default + name: simple-app-east + namespace: production-2 type: Opaque --- @@ -85,15 +85,15 @@ data: kind: ConfigMap metadata: annotations: - argocd.argoproj.io/tracking-id: prod-east:/ConfigMap:default/prod-east-mariadb + argocd.argoproj.io/tracking-id: prod-east:/ConfigMap:production-2/simple-app-east-mariadb labels: app.kubernetes.io/component: primary app.kubernetes.io/instance: prod-east app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: mariadb helm.sh/chart: mariadb-13.0.1 - name: prod-east-mariadb - namespace: default + name: simple-app-east-mariadb + namespace: production-2 --- @@ -101,14 +101,14 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: annotations: - argocd.argoproj.io/tracking-id: prod-east:/PersistentVolumeClaim:default/prod-east-app + argocd.argoproj.io/tracking-id: prod-east:/PersistentVolumeClaim:production-2/simple-app-east labels: app.kubernetes.io/instance: prod-east app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: app helm.sh/chart: app-17.0.5 - name: prod-east-app - namespace: default + name: simple-app-east + namespace: production-2 spec: accessModes: - ReadWriteOnce @@ -122,15 +122,15 @@ apiVersion: v1 kind: Service metadata: annotations: - argocd.argoproj.io/tracking-id: prod-east:/Service:default/prod-east-mariadb + argocd.argoproj.io/tracking-id: prod-east:/Service:production-2/simple-app-east-mariadb labels: app.kubernetes.io/component: primary app.kubernetes.io/instance: prod-east app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: mariadb helm.sh/chart: mariadb-13.0.1 - name: prod-east-mariadb - namespace: default + name: simple-app-east-mariadb + namespace: production-2 spec: ports: - name: mysql @@ -140,7 +140,7 @@ spec: targetPort: mysql selector: app.kubernetes.io/component: primary - app.kubernetes.io/instance: prod-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: prod-east:/Service:default/prod-east-app + argocd.argoproj.io/tracking-id: prod-east:/Service:production-2/simple-app-east labels: app.kubernetes.io/instance: prod-east app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: app helm.sh/chart: app-17.0.5 - name: prod-east-app - namespace: default + name: simple-app-east + namespace: production-2 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: prod-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: prod-east:apps/Deployment:default/prod-east-app + argocd.argoproj.io/tracking-id: prod-east:apps/Deployment:production-2/simple-app-east labels: app.kubernetes.io/instance: prod-east app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: app helm.sh/chart: app-17.0.5 - name: prod-east-app - namespace: default + name: simple-app-east + namespace: production-2 spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/instance: prod-east + app.kubernetes.io/instance: simple-app-east app.kubernetes.io/name: app strategy: type: RollingUpdate template: metadata: labels: - app.kubernetes.io/instance: prod-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: prod-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: prod-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: prod-east-mariadb + name: simple-app-east-mariadb - name: WORDPRESS_USERNAME value: user - name: WORDPRESS_PASSWORD valueFrom: secretKeyRef: key: wordpress-password - name: prod-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: prod-east-app + claimName: simple-app-east --- @@ -338,31 +339,31 @@ apiVersion: apps/v1 kind: StatefulSet metadata: annotations: - argocd.argoproj.io/tracking-id: prod-east:apps/StatefulSet:default/prod-east-mariadb + argocd.argoproj.io/tracking-id: prod-east:apps/StatefulSet:production-2/simple-app-east-mariadb labels: app.kubernetes.io/component: primary app.kubernetes.io/instance: prod-east app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: mariadb helm.sh/chart: mariadb-13.0.1 - name: prod-east-mariadb - namespace: default + name: simple-app-east-mariadb + namespace: production-2 spec: replicas: 1 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: primary - app.kubernetes.io/instance: prod-east + app.kubernetes.io/instance: simple-app-east app.kubernetes.io/name: mariadb - serviceName: prod-east-mariadb + serviceName: simple-app-east-mariadb template: metadata: annotations: - checksum/configuration: d6867ee1221d3b28fbf640c55a96449ec10f255a0b71d5b017b3b4a5bde29565 + checksum/configuration: ddf826fcbadca91ea9c596940d068266ad8c571e1c1d4e3f8ff094d214926ca9 labels: app.kubernetes.io/component: primary - app.kubernetes.io/instance: prod-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: prod-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: prod-east-mariadb + name: simple-app-east-mariadb - name: MARIADB_USER value: bn_wordpress - name: MARIADB_PASSWORD valueFrom: secretKeyRef: key: mariadb-password - name: prod-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: prod-east-mariadb + serviceAccountName: simple-app-east-mariadb volumes: - configMap: - name: prod-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: prod-east + app.kubernetes.io/instance: simple-app-east app.kubernetes.io/name: mariadb name: data spec: diff --git a/prod-west/README.md b/prod-west/README.md index bc32bb4..7e241e7 100644 --- a/prod-west/README.md +++ b/prod-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 prod-west --include-crds +helm template . --name-template simple-app-west --namespace production-1 --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/prod/values.yaml --values /tmp/_argocd-repo/dbb92269-9c18-47ad-b229-ae14b41dd16e/services/simple-application/prod/values-production-1.yaml --include-crds ``` \ No newline at end of file diff --git a/prod-west/hydrator.metadata b/prod-west/hydrator.metadata index 4d08c72..9a9319e 100755 --- a/prod-west/hydrator.metadata +++ b/prod-west/hydrator.metadata @@ -1,8 +1,8 @@ { "commands": [ "helm dependency build", - "helm template . --name-template prod-west --include-crds" + "helm template . --name-template simple-app-west --namespace production-1 --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/prod/values.yaml --values /tmp/_argocd-repo/dbb92269-9c18-47ad-b229-ae14b41dd16e/services/simple-application/prod/values-production-1.yaml --include-crds" ], "repoURL": "https://github.com/agaudreault/gitops-tests", - "drySha": "61d5c337ea259389cc3ebfa0e449317a3517be42" + "drySha": "ca2ff0b38fae3dd02444d3615651129f1e394aba" } \ No newline at end of file diff --git a/prod-west/manifest.yaml b/prod-west/manifest.yaml index 94171d4..286bac8 100755 --- a/prod-west/manifest.yaml +++ b/prod-west/manifest.yaml @@ -3,50 +3,50 @@ automountServiceAccountToken: false kind: ServiceAccount metadata: annotations: - argocd.argoproj.io/tracking-id: prod-west:/ServiceAccount:default/prod-west-mariadb + argocd.argoproj.io/tracking-id: prod-west:/ServiceAccount:production-1/simple-app-west-mariadb labels: app.kubernetes.io/instance: prod-west app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: mariadb helm.sh/chart: mariadb-13.0.1 - name: prod-west-mariadb - namespace: default + name: simple-app-west-mariadb + namespace: production-1 --- apiVersion: v1 data: - mariadb-password: Wk90ZVZZY2Z1eA== - mariadb-root-password: azRaVFNGbWZ6OQ== + mariadb-password: bUlnTTJtRlpWdA== + mariadb-root-password: S0I2cWg4dUExZw== kind: Secret metadata: annotations: - argocd.argoproj.io/tracking-id: prod-west:/Secret:default/prod-west-mariadb + argocd.argoproj.io/tracking-id: prod-west:/Secret:production-1/simple-app-west-mariadb labels: app.kubernetes.io/instance: prod-west app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: mariadb helm.sh/chart: mariadb-13.0.1 - name: prod-west-mariadb - namespace: default + name: simple-app-west-mariadb + namespace: production-1 type: Opaque --- apiVersion: v1 data: - wordpress-password: UkVwYlpiOW1KOA== + wordpress-password: NnZqWmFWQlFpaA== kind: Secret metadata: annotations: - argocd.argoproj.io/tracking-id: prod-west:/Secret:default/prod-west-app + argocd.argoproj.io/tracking-id: prod-west:/Secret:production-1/simple-app-west labels: app.kubernetes.io/instance: prod-west app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: app helm.sh/chart: app-17.0.5 - name: prod-west-app - namespace: default + name: simple-app-west + namespace: production-1 type: Opaque --- @@ -85,15 +85,15 @@ data: kind: ConfigMap metadata: annotations: - argocd.argoproj.io/tracking-id: prod-west:/ConfigMap:default/prod-west-mariadb + argocd.argoproj.io/tracking-id: prod-west:/ConfigMap:production-1/simple-app-west-mariadb labels: app.kubernetes.io/component: primary app.kubernetes.io/instance: prod-west app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: mariadb helm.sh/chart: mariadb-13.0.1 - name: prod-west-mariadb - namespace: default + name: simple-app-west-mariadb + namespace: production-1 --- @@ -101,14 +101,14 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: annotations: - argocd.argoproj.io/tracking-id: prod-west:/PersistentVolumeClaim:default/prod-west-app + argocd.argoproj.io/tracking-id: prod-west:/PersistentVolumeClaim:production-1/simple-app-west labels: app.kubernetes.io/instance: prod-west app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: app helm.sh/chart: app-17.0.5 - name: prod-west-app - namespace: default + name: simple-app-west + namespace: production-1 spec: accessModes: - ReadWriteOnce @@ -122,15 +122,15 @@ apiVersion: v1 kind: Service metadata: annotations: - argocd.argoproj.io/tracking-id: prod-west:/Service:default/prod-west-mariadb + argocd.argoproj.io/tracking-id: prod-west:/Service:production-1/simple-app-west-mariadb labels: app.kubernetes.io/component: primary app.kubernetes.io/instance: prod-west app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: mariadb helm.sh/chart: mariadb-13.0.1 - name: prod-west-mariadb - namespace: default + name: simple-app-west-mariadb + namespace: production-1 spec: ports: - name: mysql @@ -140,7 +140,7 @@ spec: targetPort: mysql selector: app.kubernetes.io/component: primary - app.kubernetes.io/instance: prod-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: prod-west:/Service:default/prod-west-app + argocd.argoproj.io/tracking-id: prod-west:/Service:production-1/simple-app-west labels: app.kubernetes.io/instance: prod-west app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: app helm.sh/chart: app-17.0.5 - name: prod-west-app - namespace: default + name: simple-app-west + namespace: production-1 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: prod-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: prod-west:apps/Deployment:default/prod-west-app + argocd.argoproj.io/tracking-id: prod-west:apps/Deployment:production-1/simple-app-west labels: app.kubernetes.io/instance: prod-west app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: app helm.sh/chart: app-17.0.5 - name: prod-west-app - namespace: default + name: simple-app-west + namespace: production-1 spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/instance: prod-west + app.kubernetes.io/instance: simple-app-west app.kubernetes.io/name: app strategy: type: RollingUpdate template: metadata: labels: - app.kubernetes.io/instance: prod-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: prod-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: prod-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: prod-west-mariadb + name: simple-app-west-mariadb - name: WORDPRESS_USERNAME value: user - name: WORDPRESS_PASSWORD valueFrom: secretKeyRef: key: wordpress-password - name: prod-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: prod-west-app + claimName: simple-app-west --- @@ -338,31 +339,31 @@ apiVersion: apps/v1 kind: StatefulSet metadata: annotations: - argocd.argoproj.io/tracking-id: prod-west:apps/StatefulSet:default/prod-west-mariadb + argocd.argoproj.io/tracking-id: prod-west:apps/StatefulSet:production-1/simple-app-west-mariadb labels: app.kubernetes.io/component: primary app.kubernetes.io/instance: prod-west app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: mariadb helm.sh/chart: mariadb-13.0.1 - name: prod-west-mariadb - namespace: default + name: simple-app-west-mariadb + namespace: production-1 spec: replicas: 1 revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/component: primary - app.kubernetes.io/instance: prod-west + app.kubernetes.io/instance: simple-app-west app.kubernetes.io/name: mariadb - serviceName: prod-west-mariadb + serviceName: simple-app-west-mariadb template: metadata: annotations: - checksum/configuration: 118f46c93fdcb3b7b6624e5340ad13eed950d7f9018c77ba4a5f9b8349b2fde5 + checksum/configuration: e4cdbfd085a464056af74052bc4754946eedd85ae91668fc6a0e7532bbfe645a labels: app.kubernetes.io/component: primary - app.kubernetes.io/instance: prod-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: prod-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: prod-west-mariadb + name: simple-app-west-mariadb - name: MARIADB_USER value: bn_wordpress - name: MARIADB_PASSWORD valueFrom: secretKeyRef: key: mariadb-password - name: prod-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: prod-west-mariadb + serviceAccountName: simple-app-west-mariadb volumes: - configMap: - name: prod-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: prod-west + app.kubernetes.io/instance: simple-app-west app.kubernetes.io/name: mariadb name: data spec: