update argocd version form 2.11.7 to 2.11.9 (#1557)

* update argocd version form 2.11.7 to 2.11.9 Signed-off-by: Anand Kumar Singh <[email protected]> * discard formating changes Signed-off-by: Anand Kumar Singh <[email protected]> * update crd with upstream argo-cd Signed-off-by: Anand Kumar Singh <[email protected]> * running make generate manifest Signed-off-by: Anand Kumar Singh <[email protected]> * fix: bundle command Signed-off-by: Anand Kumar Singh <[email protected]> --------- Signed-off-by: Anand Kumar Singh <[email protected]>
argoproj-labs · Oct 10, 2024 · 764dd5d · 764dd5d
1 parent 8bbf319
commit 764dd5d
Show file tree

Hide file tree

Showing 20 changed files with 37,212 additions and 18 deletions.
diff --git a/Makefile b/Makefile
@@ -170,6 +170,7 @@ bundle: manifests kustomize ## Generate bundle manifests and metadata, then vali
 	cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
 	$(KUSTOMIZE) build config/manifests | operator-sdk generate bundle -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS)
 	operator-sdk bundle validate ./bundle
+	sed -i '' 's/control-plane: argocd-operator/control-plane: controller-manager/g' bundle/manifests/argocd-operator-webhook-service_v1_service.yaml bundle/manifests/argocd-operator-controller-manager-metrics-service_v1_service.yaml bundle/manifests/argocd-operator.clusterserviceversion.yaml
 	rm -fr deploy/olm-catalog/argocd-operator/$(VERSION)
 	mkdir -p deploy/olm-catalog/argocd-operator/$(VERSION)
 	cp -r bundle/manifests/* deploy/olm-catalog/argocd-operator/$(VERSION)/

diff --git a/build/util/Dockerfile b/build/util/Dockerfile
@@ -1,5 +1,5 @@
-# Argo CD v2.11.7
-FROM quay.io/argoproj/argocd@sha256:47e3e00dc501680e77b2496c67ed2e6bff8de1c71e55b56b37b9b11fc34f2ed4 as argocd
+# Argo CD v2.11.9
+FROM quay.io/argoproj/argocd@sha256:23f79b0e8cbbc1aefc15918a33fe8bcafa1aedc19554852acd12943ce0a577a2 as argocd
 
 # Final Image
 FROM docker.io/library/ubuntu:24.04

diff --git a/bundle/manifests/argocd-operator.clusterserviceversion.yaml b/bundle/manifests/argocd-operator.clusterserviceversion.yaml
@@ -247,6 +247,7 @@ metadata:
     capabilities: Deep Insights
     categories: Integration & Delivery
     certified: "false"
+    createdAt: "2024-10-09T13:28:42Z"
     description: Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes.
     operators.operatorframework.io/builder: operator-sdk-v1.32.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
@@ -1898,7 +1899,7 @@ spec:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
                 - name: ENABLE_CONVERSION_WEBHOOK
                   value: "true"
-                image: quay.io/argoprojlabs/argocd-operator@sha256:dafdfde863b81c8da28f37819ac4fc504ee0e9519ddcebd4dbe7c22a51d644e5
+                image: quay.io/argoprojlabs/argocd-operator:v0.11.1
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -1988,7 +1989,7 @@ spec:
   maturity: alpha
   provider:
     name: Argo CD Community
-  replaces: argocd-operator.v0.11.0
+  replaces: argocd-operator.v0.10.1
   version: 0.11.1
   webhookdefinitions:
   - admissionReviewVersions:

diff --git a/bundle/manifests/argoproj.io_applications.yaml b/bundle/manifests/argoproj.io_applications.yaml
@@ -29,10 +29,6 @@ spec:
       name: Revision
       priority: 10
       type: string
-    - jsonPath: .spec.project
-      name: Project
-      priority: 10
-      type: string
     name: v1alpha1
     schema:
       openAPIV3Schema:

diff --git a/common/defaults.go b/common/defaults.go
@@ -64,7 +64,7 @@ const (
 	ArgoCDDefaultArgoImage = "quay.io/argoproj/argocd"
 
 	// ArgoCDDefaultArgoVersion is the Argo CD container image digest to use when version not specified.
-	ArgoCDDefaultArgoVersion = "sha256:47e3e00dc501680e77b2496c67ed2e6bff8de1c71e55b56b37b9b11fc34f2ed4" // v2.11.7
+	ArgoCDDefaultArgoVersion = "sha256:23f79b0e8cbbc1aefc15918a33fe8bcafa1aedc19554852acd12943ce0a577a2" // v2.11.9
 
 	// ArgoCDDefaultBackupKeyLength is the length of the generated default backup key.
 	ArgoCDDefaultBackupKeyLength = 32

diff --git a/config/crd/bases/argoproj.io_applications.yaml b/config/crd/bases/argoproj.io_applications.yaml
@@ -28,10 +28,6 @@ spec:
       name: Revision
       priority: 10
       type: string
-    - jsonPath: .spec.project
-      name: Project
-      priority: 10
-      type: string
     name: v1alpha1
     schema:
       openAPIV3Schema:

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -11,6 +11,6 @@ configMapGenerator:
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
-- digest: sha256:dafdfde863b81c8da28f37819ac4fc504ee0e9519ddcebd4dbe7c22a51d644e5
-  name: controller
+- name: controller
   newName: quay.io/argoprojlabs/argocd-operator
+  newTag: v0.11.1
diff --git a/...argocd-operator/0.11.1/argocd-operator-controller-manager-metrics-service_v1_service.yaml b/...argocd-operator/0.11.1/argocd-operator-controller-manager-metrics-service_v1_service.yaml
@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Service
+metadata:
+  creationTimestamp: null
+  labels:
+    control-plane: controller-manager
+  name: argocd-operator-controller-manager-metrics-service
+spec:
+  ports:
+  - name: https
+    port: 8443
+    targetPort: 8080
+  selector:
+    control-plane: controller-manager
+status:
+  loadBalancer: {}
diff --git a/deploy/olm-catalog/argocd-operator/0.11.1/argocd-operator-manager-config_v1_configmap.yaml b/deploy/olm-catalog/argocd-operator/0.11.1/argocd-operator-manager-config_v1_configmap.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+data:
+  controller_manager_config.yaml: |
+    apiVersion: controller-runtime.sigs.k8s.io/v1alpha1
+    kind: ControllerManagerConfig
+    health:
+      healthProbeBindAddress: :8081
+    metrics:
+      bindAddress: 127.0.0.1:8080
+    webhook:
+      port: 9443
+    leaderElection:
+      leaderElect: true
+      resourceName: b674928d.argoproj.io
+kind: ConfigMap
+metadata:
+  name: argocd-operator-manager-config
diff --git a/...rator/0.11.1/argocd-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml b/...rator/0.11.1/argocd-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml
@@ -0,0 +1,10 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  creationTimestamp: null
+  name: argocd-operator-metrics-reader
+rules:
+- nonResourceURLs:
+  - /metrics
+  verbs:
+  - get
diff --git a/deploy/olm-catalog/argocd-operator/0.11.1/argocd-operator-webhook-service_v1_service.yaml b/deploy/olm-catalog/argocd-operator/0.11.1/argocd-operator-webhook-service_v1_service.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  creationTimestamp: null
+  name: argocd-operator-webhook-service
+spec:
+  ports:
+  - port: 443
+    protocol: TCP
+    targetPort: 9443
+  selector:
+    control-plane: controller-manager
+status:
+  loadBalancer: {}