From b45c3e54c75111bed75913f9bb4627e6bb379cee Mon Sep 17 00:00:00 2001 From: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Date: Fri, 6 Oct 2023 16:48:09 -0400 Subject: [PATCH] undo unnecessary manifest changes Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --- .../argocd-server-applications/kustomization.yaml | 7 ------- .../argocd-application-controller-statefulset.yaml | 2 +- ...rgocd-applicationset-controller-deployment.yaml | 2 +- .../base/dex/argocd-dex-server-deployment.yaml | 2 +- manifests/base/kustomization.yaml | 2 +- ...argocd-notifications-controller-deployment.yaml | 2 +- .../repo-server/argocd-repo-server-deployment.yaml | 4 ++-- .../base/server/argocd-server-deployment.yaml | 2 +- manifests/core-install.yaml | 8 ++++---- manifests/core-install/kustomization.yaml | 2 +- manifests/ha/base/kustomization.yaml | 2 +- manifests/ha/install.yaml | 14 +++++++------- manifests/ha/namespace-install.yaml | 14 +++++++------- manifests/install.yaml | 14 +++++++------- manifests/namespace-install.yaml | 14 +++++++------- test/remote/manifests/kustomization.yaml | 2 +- 16 files changed, 43 insertions(+), 50 deletions(-) delete mode 100644 examples/k8s-rbac/argocd-server-applications/kustomization.yaml diff --git a/examples/k8s-rbac/argocd-server-applications/kustomization.yaml b/examples/k8s-rbac/argocd-server-applications/kustomization.yaml deleted file mode 100644 index 330dde4a914d2..0000000000000 --- a/examples/k8s-rbac/argocd-server-applications/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- argocd-server-rbac-clusterrole.yaml -- argocd-server-rbac-clusterrolebinding.yaml -- argocd-notifications-controller-rbac-clusterrole.yaml -- argocd-notifications-controller-rbac-clusterrolebinding.yaml diff --git a/manifests/base/application-controller/argocd-application-controller-statefulset.yaml b/manifests/base/application-controller/argocd-application-controller-statefulset.yaml index 270fa05bcc62e..f08ed961383ce 100644 --- a/manifests/base/application-controller/argocd-application-controller-statefulset.yaml +++ b/manifests/base/application-controller/argocd-application-controller-statefulset.yaml @@ -155,7 +155,7 @@ spec: name: argocd-cmd-params-cm key: controller.kubectl.parallelism.limit optional: true - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always name: argocd-application-controller ports: diff --git a/manifests/base/applicationset-controller/argocd-applicationset-controller-deployment.yaml b/manifests/base/applicationset-controller/argocd-applicationset-controller-deployment.yaml index ff7cf84c3e60a..89e4f5d68a0b3 100644 --- a/manifests/base/applicationset-controller/argocd-applicationset-controller-deployment.yaml +++ b/manifests/base/applicationset-controller/argocd-applicationset-controller-deployment.yaml @@ -18,7 +18,7 @@ spec: containers: - args: - /usr/local/bin/argocd-applicationset-controller - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always name: argocd-applicationset-controller ports: diff --git a/manifests/base/dex/argocd-dex-server-deployment.yaml b/manifests/base/dex/argocd-dex-server-deployment.yaml index 8d3b37d177913..c3cf7b91af3c3 100644 --- a/manifests/base/dex/argocd-dex-server-deployment.yaml +++ b/manifests/base/dex/argocd-dex-server-deployment.yaml @@ -18,7 +18,7 @@ spec: serviceAccountName: argocd-dex-server initContainers: - name: copyutil - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always command: [/bin/cp, -n, /usr/local/bin/argocd, /shared/argocd-dex] volumeMounts: diff --git a/manifests/base/kustomization.yaml b/manifests/base/kustomization.yaml index e80274cddc620..fac1e51a2cec3 100644 --- a/manifests/base/kustomization.yaml +++ b/manifests/base/kustomization.yaml @@ -5,7 +5,7 @@ kind: Kustomization images: - name: quay.io/argoproj/argocd newName: quay.io/argoproj/argocd - newTag: latest + newTag: v2.8.4 resources: - ./application-controller - ./dex diff --git a/manifests/base/notification/argocd-notifications-controller-deployment.yaml b/manifests/base/notification/argocd-notifications-controller-deployment.yaml index 9cd1a068808b1..9b37f3c17fd82 100644 --- a/manifests/base/notification/argocd-notifications-controller-deployment.yaml +++ b/manifests/base/notification/argocd-notifications-controller-deployment.yaml @@ -58,7 +58,7 @@ spec: livenessProbe: tcpSocket: port: 9001 - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always name: argocd-notifications-controller volumeMounts: diff --git a/manifests/base/repo-server/argocd-repo-server-deployment.yaml b/manifests/base/repo-server/argocd-repo-server-deployment.yaml index eb230e0f9b856..5e8be8478ea49 100644 --- a/manifests/base/repo-server/argocd-repo-server-deployment.yaml +++ b/manifests/base/repo-server/argocd-repo-server-deployment.yaml @@ -19,7 +19,7 @@ spec: automountServiceAccountToken: false containers: - name: argocd-repo-server - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always args: - /usr/local/bin/argocd-repo-server @@ -223,7 +223,7 @@ spec: - -n - /usr/local/bin/argocd - /var/run/argocd/argocd-cmp-server - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 name: copyutil securityContext: runAsNonRoot: true diff --git a/manifests/base/server/argocd-server-deployment.yaml b/manifests/base/server/argocd-server-deployment.yaml index 66c6ed384b1d2..8f64ab86599a1 100644 --- a/manifests/base/server/argocd-server-deployment.yaml +++ b/manifests/base/server/argocd-server-deployment.yaml @@ -18,7 +18,7 @@ spec: serviceAccountName: argocd-server containers: - name: argocd-server - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always args: - /usr/local/bin/argocd-server diff --git a/manifests/core-install.yaml b/manifests/core-install.yaml index cfbdccaff6004..5ff3999b5801d 100644 --- a/manifests/core-install.yaml +++ b/manifests/core-install.yaml @@ -18880,7 +18880,7 @@ spec: key: applicationsetcontroller.allowed.scm.providers name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always name: argocd-applicationset-controller ports: @@ -19180,7 +19180,7 @@ spec: value: /helm-working-dir - name: HELM_DATA_HOME value: /helm-working-dir - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -19232,7 +19232,7 @@ spec: - -n - /usr/local/bin/argocd - /var/run/argocd/argocd-cmp-server - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 name: copyutil securityContext: allowPrivilegeEscalation: false @@ -19451,7 +19451,7 @@ spec: key: controller.kubectl.parallelism.limit name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always name: argocd-application-controller ports: diff --git a/manifests/core-install/kustomization.yaml b/manifests/core-install/kustomization.yaml index 07a82b3707700..bb80a60ff6695 100644 --- a/manifests/core-install/kustomization.yaml +++ b/manifests/core-install/kustomization.yaml @@ -12,4 +12,4 @@ resources: images: - name: quay.io/argoproj/argocd newName: quay.io/argoproj/argocd - newTag: latest + newTag: v2.8.4 diff --git a/manifests/ha/base/kustomization.yaml b/manifests/ha/base/kustomization.yaml index ae40b96e8657e..fd7852d76075e 100644 --- a/manifests/ha/base/kustomization.yaml +++ b/manifests/ha/base/kustomization.yaml @@ -12,7 +12,7 @@ patches: images: - name: quay.io/argoproj/argocd newName: quay.io/argoproj/argocd - newTag: latest + newTag: v2.8.4 resources: - ../../base/application-controller - ../../base/applicationset-controller diff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml index 8cf6eab026a36..fb85dbbec7480 100644 --- a/manifests/ha/install.yaml +++ b/manifests/ha/install.yaml @@ -20129,7 +20129,7 @@ spec: key: applicationsetcontroller.allowed.scm.providers name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always name: argocd-applicationset-controller ports: @@ -20252,7 +20252,7 @@ spec: - -n - /usr/local/bin/argocd - /shared/argocd-dex - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always name: copyutil securityContext: @@ -20328,7 +20328,7 @@ spec: key: application.namespaces name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always livenessProbe: tcpSocket: @@ -20654,7 +20654,7 @@ spec: value: /helm-working-dir - name: HELM_DATA_HOME value: /helm-working-dir - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -20706,7 +20706,7 @@ spec: - -n - /usr/local/bin/argocd - /var/run/argocd/argocd-cmp-server - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 name: copyutil securityContext: allowPrivilegeEscalation: false @@ -20995,7 +20995,7 @@ spec: key: server.enable.proxy.extension name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always livenessProbe: httpGet: @@ -21241,7 +21241,7 @@ spec: key: controller.kubectl.parallelism.limit name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always name: argocd-application-controller ports: diff --git a/manifests/ha/namespace-install.yaml b/manifests/ha/namespace-install.yaml index 17102742063ef..f68feb55af6e8 100644 --- a/manifests/ha/namespace-install.yaml +++ b/manifests/ha/namespace-install.yaml @@ -1635,7 +1635,7 @@ spec: key: applicationsetcontroller.allowed.scm.providers name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always name: argocd-applicationset-controller ports: @@ -1758,7 +1758,7 @@ spec: - -n - /usr/local/bin/argocd - /shared/argocd-dex - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always name: copyutil securityContext: @@ -1834,7 +1834,7 @@ spec: key: application.namespaces name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always livenessProbe: tcpSocket: @@ -2160,7 +2160,7 @@ spec: value: /helm-working-dir - name: HELM_DATA_HOME value: /helm-working-dir - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -2212,7 +2212,7 @@ spec: - -n - /usr/local/bin/argocd - /var/run/argocd/argocd-cmp-server - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 name: copyutil securityContext: allowPrivilegeEscalation: false @@ -2501,7 +2501,7 @@ spec: key: server.enable.proxy.extension name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always livenessProbe: httpGet: @@ -2747,7 +2747,7 @@ spec: key: controller.kubectl.parallelism.limit name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always name: argocd-application-controller ports: diff --git a/manifests/install.yaml b/manifests/install.yaml index 44afb901a4c56..b529292252b33 100644 --- a/manifests/install.yaml +++ b/manifests/install.yaml @@ -19230,7 +19230,7 @@ spec: key: applicationsetcontroller.allowed.scm.providers name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always name: argocd-applicationset-controller ports: @@ -19353,7 +19353,7 @@ spec: - -n - /usr/local/bin/argocd - /shared/argocd-dex - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always name: copyutil securityContext: @@ -19429,7 +19429,7 @@ spec: key: application.namespaces name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always livenessProbe: tcpSocket: @@ -19711,7 +19711,7 @@ spec: value: /helm-working-dir - name: HELM_DATA_HOME value: /helm-working-dir - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -19763,7 +19763,7 @@ spec: - -n - /usr/local/bin/argocd - /var/run/argocd/argocd-cmp-server - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 name: copyutil securityContext: allowPrivilegeEscalation: false @@ -20050,7 +20050,7 @@ spec: key: server.enable.proxy.extension name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always livenessProbe: httpGet: @@ -20296,7 +20296,7 @@ spec: key: controller.kubectl.parallelism.limit name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always name: argocd-application-controller ports: diff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml index f52315ccf9ec8..33c8010825954 100644 --- a/manifests/namespace-install.yaml +++ b/manifests/namespace-install.yaml @@ -736,7 +736,7 @@ spec: key: applicationsetcontroller.allowed.scm.providers name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always name: argocd-applicationset-controller ports: @@ -859,7 +859,7 @@ spec: - -n - /usr/local/bin/argocd - /shared/argocd-dex - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always name: copyutil securityContext: @@ -935,7 +935,7 @@ spec: key: application.namespaces name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always livenessProbe: tcpSocket: @@ -1217,7 +1217,7 @@ spec: value: /helm-working-dir - name: HELM_DATA_HOME value: /helm-working-dir - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -1269,7 +1269,7 @@ spec: - -n - /usr/local/bin/argocd - /var/run/argocd/argocd-cmp-server - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 name: copyutil securityContext: allowPrivilegeEscalation: false @@ -1556,7 +1556,7 @@ spec: key: server.enable.proxy.extension name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always livenessProbe: httpGet: @@ -1802,7 +1802,7 @@ spec: key: controller.kubectl.parallelism.limit name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:latest + image: quay.io/argoproj/argocd:v2.8.4 imagePullPolicy: Always name: argocd-application-controller ports: diff --git a/test/remote/manifests/kustomization.yaml b/test/remote/manifests/kustomization.yaml index 9a2e08e2a3794..b655cc5c7c66c 100644 --- a/test/remote/manifests/kustomization.yaml +++ b/test/remote/manifests/kustomization.yaml @@ -6,4 +6,4 @@ resources: images: - name: argocd-e2e-cluster - newTag: latest + newTag: v2.8.4