Rebase master with 0.11.0 changes (#1489)

* Generated manifests for 0.11.0 version (#1402) Signed-off-by: Anand Francis Joseph <[email protected]> * release 0.11.0 * release 0.11.0 continue * fix upgrade of argocd to 2.11.6 * run make bundle --------- Signed-off-by: Anand Francis Joseph <[email protected]> Co-authored-by: Anand Francis Joseph <[email protected]>
argoproj-labs · Aug 2, 2024 · b4daa97 · b4daa97
1 parent fc0d8c5
commit b4daa97
Show file tree

Hide file tree

Showing 19 changed files with 45,870 additions and 18 deletions.
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= 0.10.1
+VERSION ?= 0.11.0
 
 # Try to detect Docker or Podman
 CONTAINER_RUNTIME := $(shell command -v docker 2> /dev/null || command -v podman 2> /dev/null)

diff --git a/build/util/Dockerfile b/build/util/Dockerfile
@@ -1,5 +1,5 @@
-# Argo CD v2.11.2
-FROM quay.io/argoproj/argocd@sha256:fc175461c4669709917705fa84439143cc7c9370798667b33d06c8087d472f3b as argocd
+# Argo CD v2.11.6
+FROM quay.io/argoproj/argocd@sha256:7f82e7eec131866c3cbd91e5035381d62bd9318269cd3d16e6e2d42ede402292 as argocd
 
 # Final Image
 FROM docker.io/library/ubuntu:24.04
@@ -17,12 +17,18 @@ RUN groupadd -g $ARGOCD_USER_ID argocd && \
     apt-get update && \
     apt-get dist-upgrade -y && \
     apt-get install -y \
-    git git-lfs tini curl python3-pip gpg tzdata && \
+    git git-lfs tini curl python3-pip gpg tzdata unzip && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-# Install the AWS CLI
-RUN pip3 install awscli
+# Create a symlink for python to point to python3
+RUN ln -s /usr/bin/python3 /usr/bin/python
+
+# Install AWS CLI v2
+RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \
+    unzip awscliv2.zip && \
+    ./aws/install && \
+    rm -rf awscliv2.zip aws
 
 # Install the Microsoft Azure CLI
 RUN curl -sL https://aka.ms/InstallAzureCLIDeb | bash && \

diff --git a/bundle/manifests/argocd-operator.clusterserviceversion.yaml b/bundle/manifests/argocd-operator.clusterserviceversion.yaml
@@ -247,13 +247,13 @@ metadata:
     capabilities: Deep Insights
     categories: Integration & Delivery
     certified: "false"
-    createdAt: "2024-07-31T13:50:54Z"
+    createdAt: "2024-08-01T17:15:42Z"
     description: Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes.
     operators.operatorframework.io/builder: operator-sdk-v1.35.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
     repository: https://github.com/argoproj-labs/argocd-operator
     support: Argo CD
-  name: argocd-operator.v0.10.1
+  name: argocd-operator.v0.11.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -1894,7 +1894,7 @@ spec:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
                 - name: ENABLE_CONVERSION_WEBHOOK
                   value: "true"
-                image: quay.io/argoprojlabs/argocd-operator:v0.10.1
+                image: quay.io/argoprojlabs/argocd-operator:v0.11.0
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -1984,8 +1984,8 @@ spec:
   maturity: alpha
   provider:
     name: Argo CD Community
-  replaces: argocd-operator.v0.10.0
-  version: 0.10.1
+  replaces: argocd-operator.v0.10.1
+  version: 0.11.0
   webhookdefinitions:
   - admissionReviewVersions:
     - v1alpha1

diff --git a/common/defaults.go b/common/defaults.go
@@ -70,7 +70,7 @@ const (
 	ArgoCDDefaultArgoImage = "quay.io/argoproj/argocd"
 
 	// ArgoCDDefaultArgoVersion is the Argo CD container image digest to use when version not specified.
-	ArgoCDDefaultArgoVersion = "sha256:d2c274ff26c7ab164907de05826bdfe2e6f326af70edd0bb83194b75fbb71f9e" // v2.11.2
+	ArgoCDDefaultArgoVersion = "sha256:7f82e7eec131866c3cbd91e5035381d62bd9318269cd3d16e6e2d42ede402292" // v2.11.6
 
 	// ArgoCDDefaultBackupKeyLength is the length of the generated default backup key.
 	ArgoCDDefaultBackupKeyLength = 32
@@ -128,7 +128,7 @@ const (
 	ArgoCDDefaultExportJobImage = "quay.io/argoprojlabs/argocd-operator-util"
 
 	// ArgoCDDefaultExportJobVersion is the export job container image tag to use when not specified.
-	ArgoCDDefaultExportJobVersion = "sha256:298747d7eb4d3d4d4f928e907afca4bfd89dc4568ca225e8133d050e55d6785e" // 0.10.1
+	ArgoCDDefaultExportJobVersion = "sha256:463185c62f35e73e287a859c42926fea7c23cecd2db7f94675f4d46629d4b4d8" // 0.11.0
 
 	// ArgoCDDefaultExportLocalCapicity is the default capacity to use for local export.
 	ArgoCDDefaultExportLocalCapicity = "2Gi"

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -13,4 +13,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/argoprojlabs/argocd-operator
-  newTag: v0.10.1
+  newTag: v0.11.0
diff --git a/config/manifests/bases/argocd-operator.clusterserviceversion.yaml b/config/manifests/bases/argocd-operator.clusterserviceversion.yaml
@@ -1419,5 +1419,5 @@ spec:
   maturity: alpha
   provider:
     name: Argo CD Community
-  replaces: argocd-operator.v0.10.0
-  version: 0.10.1
+  replaces: argocd-operator.v0.10.1
+  version: 0.11.0
diff --git a/deploy/catalog_source.yaml b/deploy/catalog_source.yaml
@@ -4,6 +4,6 @@ metadata:
   name: argocd-catalog
 spec:
   sourceType: grpc
-  image: quay.io/argoprojlabs/argocd-operator-registry@sha256:8909f3549e630d2a5b98b7b411d402003801a819523f327cc605cf4b27121ce6 # 0.10.1
+  image: quay.io/argoprojlabs/argocd-operator-registry@sha256:64e4fe0bf7b3dd5e89689d750fb63d7e3111068f18a7ed8656265cb1775f3b68 # 0.11.0
   displayName: Argo CD Operators
   publisher: Argo CD Community
diff --git a/...argocd-operator/0.11.0/argocd-operator-controller-manager-metrics-service_v1_service.yaml b/...argocd-operator/0.11.0/argocd-operator-controller-manager-metrics-service_v1_service.yaml
@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Service
+metadata:
+  creationTimestamp: null
+  labels:
+    control-plane: argocd-operator
+  name: argocd-operator-controller-manager-metrics-service
+spec:
+  ports:
+  - name: https
+    port: 8443
+    targetPort: 8080
+  selector:
+    control-plane: argocd-operator
+status:
+  loadBalancer: {}
diff --git a/deploy/olm-catalog/argocd-operator/0.11.0/argocd-operator-manager-config_v1_configmap.yaml b/deploy/olm-catalog/argocd-operator/0.11.0/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.0/argocd-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml b/...rator/0.11.0/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.0/argocd-operator-webhook-service_v1_service.yaml b/deploy/olm-catalog/argocd-operator/0.11.0/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: argocd-operator
+status:
+  loadBalancer: {}