From a39fc2fd96c30cef46a51d5146d208d96bf0da0f Mon Sep 17 00:00:00 2001 From: Regina Scott <50851526+reginapizza@users.noreply.github.com> Date: Thu, 2 Nov 2023 10:42:05 -0400 Subject: [PATCH 1/5] argocd-operator release 0.8.0 (#1020) * upgrade to argocd v2.8.6 --- build/util/Dockerfile | 4 ++-- .../manifests/argocd-operator.clusterserviceversion.yaml | 2 +- common/defaults.go | 4 ++-- config/manager/kustomization.yaml | 4 ++-- deploy/catalog_source.yaml | 2 +- .../argocd-operator.v0.8.0.clusterserviceversion.yaml | 2 +- .../argocd-operator/argocd-operator.package.yaml | 2 +- go.mod | 4 ++-- go.sum | 8 ++++---- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build/util/Dockerfile b/build/util/Dockerfile index 72bf1fae5..9874cec35 100644 --- a/build/util/Dockerfile +++ b/build/util/Dockerfile @@ -1,5 +1,5 @@ -# Argo CD v2.8.3 -FROM quay.io/argoproj/argocd@sha256:d40da8f5747415eb7f9b5c2d9b645aecd423888cad9b36e4f986bff8ecf0a786 as argocd +# Argo CD v2.8.6 +FROM quay.io/argoproj/argocd@sha256:712ff6ac413d74951988fdf82b1c8f433770be4d85b5ed013f848be0c164d0b9 as argocd # Final Image FROM docker.io/library/ubuntu:22.04 diff --git a/bundle/manifests/argocd-operator.clusterserviceversion.yaml b/bundle/manifests/argocd-operator.clusterserviceversion.yaml index 5301692cb..d55d520ac 100644 --- a/bundle/manifests/argocd-operator.clusterserviceversion.yaml +++ b/bundle/manifests/argocd-operator.clusterserviceversion.yaml @@ -1742,7 +1742,7 @@ spec: fieldPath: metadata.annotations['olm.targetNamespaces'] - name: ENABLE_CONVERSION_WEBHOOK value: "true" - image: quay.io/argoprojlabs/argocd-operator:v0.8.0 + image: quay.io/argoprojlabs/argocd-operator@sha256:6359e98446936109e4c9491a7b919a5eac8ac6cbe737d94583bd979c2071c45f livenessProbe: httpGet: path: /healthz diff --git a/common/defaults.go b/common/defaults.go index e74b3807d..1c949c168 100644 --- a/common/defaults.go +++ b/common/defaults.go @@ -61,7 +61,7 @@ const ( ArgoCDDefaultArgoImage = "quay.io/argoproj/argocd" // ArgoCDDefaultArgoVersion is the Argo CD container image digest to use when version not specified. - ArgoCDDefaultArgoVersion = "sha256:d40da8f5747415eb7f9b5c2d9b645aecd423888cad9b36e4f986bff8ecf0a786" // v2.8.3 + ArgoCDDefaultArgoVersion = "sha256:712ff6ac413d74951988fdf82b1c8f433770be4d85b5ed013f848be0c164d0b9" // v2.8.6 // ArgoCDDefaultBackupKeyLength is the length of the generated default backup key. ArgoCDDefaultBackupKeyLength = 32 @@ -119,7 +119,7 @@ const ( ArgoCDDefaultExportJobImage = "quay.io/argoprojlabs/argocd-operator-util" // ArgoCDDefaultExportJobVersion is the export job container image tag to use when not specified. - ArgoCDDefaultExportJobVersion = "sha256:6f80965a2bef1c80875be0995b18d9be5a6ad4af841cbc170ed3c60101a7deb2" // 0.5.0 + ArgoCDDefaultExportJobVersion = "sha256:dfd3833b199a2e452940ed37a6175323e8fb0be5f2c8ea87f1d21330236679f1" // 0.8.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 index d9f21e827..5ae3991d0 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -11,6 +11,6 @@ configMapGenerator: apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization images: -- name: controller +- digest: sha256:6359e98446936109e4c9491a7b919a5eac8ac6cbe737d94583bd979c2071c45f + name: controller newName: quay.io/argoprojlabs/argocd-operator - newTag: v0.8.0 diff --git a/deploy/catalog_source.yaml b/deploy/catalog_source.yaml index 25dd01a9d..30a4931ba 100644 --- 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:dcf6d07ed5c8b840fb4a6e9019eacd88cd0913bc3c8caa104d3414a2e9972002 # replace with your index image + image: quay.io/argoprojlabs/argocd-operator-registry@sha256:ccae1c0a80ad5846d73f7fdfcb20947daec2d50274619440011543d0cc527e19 # replace with your index image displayName: Argo CD Operators publisher: Argo CD Community \ No newline at end of file diff --git a/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator.v0.8.0.clusterserviceversion.yaml b/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator.v0.8.0.clusterserviceversion.yaml index 5301692cb..d55d520ac 100644 --- a/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator.v0.8.0.clusterserviceversion.yaml +++ b/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator.v0.8.0.clusterserviceversion.yaml @@ -1742,7 +1742,7 @@ spec: fieldPath: metadata.annotations['olm.targetNamespaces'] - name: ENABLE_CONVERSION_WEBHOOK value: "true" - image: quay.io/argoprojlabs/argocd-operator:v0.8.0 + image: quay.io/argoprojlabs/argocd-operator@sha256:6359e98446936109e4c9491a7b919a5eac8ac6cbe737d94583bd979c2071c45f livenessProbe: httpGet: path: /healthz diff --git a/deploy/olm-catalog/argocd-operator/argocd-operator.package.yaml b/deploy/olm-catalog/argocd-operator/argocd-operator.package.yaml index 956740872..1cd25094b 100644 --- a/deploy/olm-catalog/argocd-operator/argocd-operator.package.yaml +++ b/deploy/olm-catalog/argocd-operator/argocd-operator.package.yaml @@ -1,5 +1,5 @@ channels: -- currentCSV: argocd-operator.v0.7.0 +- currentCSV: argocd-operator.v0.8.0 name: alpha defaultChannel: alpha packageName: argocd-operator diff --git a/go.mod b/go.mod index c9d9fe51f..7ed595dc4 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/argoproj-labs/argocd-operator go 1.20 require ( - github.com/argoproj/argo-cd/v2 v2.8.3 + github.com/argoproj/argo-cd/v2 v2.8.6 github.com/coreos/prometheus-operator v0.40.0 github.com/go-logr/logr v1.2.4 github.com/google/go-cmp v0.5.9 @@ -63,7 +63,7 @@ require ( golang.org/x/crypto v0.14.0 // indirect golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect golang.org/x/net v0.17.0 // indirect - golang.org/x/oauth2 v0.9.0 // indirect + golang.org/x/oauth2 v0.10.0 // indirect golang.org/x/sys v0.13.0 // indirect golang.org/x/term v0.13.0 // indirect golang.org/x/text v0.13.0 // indirect diff --git a/go.sum b/go.sum index 683558fc1..7677d1768 100644 --- a/go.sum +++ b/go.sum @@ -649,8 +649,8 @@ github.com/apache/arrow/go/v11 v11.0.0/go.mod h1:Eg5OsL5H+e299f7u5ssuXsuHQVEGC4x github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU= -github.com/argoproj/argo-cd/v2 v2.8.3 h1:ybJ7eNoP7/u5Vqncais6WeVRBEGmZmriAIwLEKmWHIA= -github.com/argoproj/argo-cd/v2 v2.8.3/go.mod h1:Pkw7r6HKh5k/5Ynl4MvwCG79ktYBk+7PbJxCjXSlT30= +github.com/argoproj/argo-cd/v2 v2.8.6 h1:0Fh9EaOj3C3MUwW/lNehWkwXU3sUPCkdKdDuesOBYrk= +github.com/argoproj/argo-cd/v2 v2.8.6/go.mod h1:tTVb2cffiAxi7a0M8LFNU+KtLVNp8z4aCB4CJjRFs/A= github.com/argoproj/pkg v0.13.7-0.20230626144333-d56162821bd1 h1:qsHwwOJ21K2Ao0xPju1sNuqphyMnMYkyB3ZLoLtxWpo= github.com/argoproj/pkg v0.13.7-0.20230626144333-d56162821bd1/go.mod h1:CZHlkyAD1/+FbEn6cB2DQTj48IoLGvEYsWEvtzP3238= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= @@ -2146,8 +2146,8 @@ golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I= golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw= golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE= -golang.org/x/oauth2 v0.9.0 h1:BPpt2kU7oMRq3kCHAA1tbSEshXRw1LpG2ztgDwrzuAs= -golang.org/x/oauth2 v0.9.0/go.mod h1:qYgFZaFiu6Wg24azG8bdV52QJXJGbZzIIsRCdVKzbLw= +golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8= +golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= From 1808497b49d2327e7b4ae41abef0ac37ff6b49b0 Mon Sep 17 00:00:00 2001 From: Regina Scott <50851526+reginapizza@users.noreply.github.com> Date: Mon, 20 Nov 2023 13:13:55 +0000 Subject: [PATCH 2/5] update control plane (#1052) * update control plane * update quay repos with correct control-plane reference * update to new argocd 2.8.6 image SHA --------- Co-authored-by: Regina Scott --- build/util/Dockerfile | 2 +- bundle/manifests/argocd-operator.clusterserviceversion.yaml | 2 +- common/defaults.go | 4 ++-- config/manager/kustomization.yaml | 2 +- deploy/catalog_source.yaml | 2 +- ...perator-controller-manager-metrics-service_v1_service.yaml | 4 ++-- .../0.8.0/argocd-operator.v0.8.0.clusterserviceversion.yaml | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build/util/Dockerfile b/build/util/Dockerfile index 9874cec35..0b94ef2ca 100644 --- a/build/util/Dockerfile +++ b/build/util/Dockerfile @@ -1,5 +1,5 @@ # Argo CD v2.8.6 -FROM quay.io/argoproj/argocd@sha256:712ff6ac413d74951988fdf82b1c8f433770be4d85b5ed013f848be0c164d0b9 as argocd +FROM quay.io/argoproj/argocd@sha256:acaf3735256979326c8dcd3106454cee65572c40e191525174cba2bcb35541c5 as argocd # Final Image FROM docker.io/library/ubuntu:22.04 diff --git a/bundle/manifests/argocd-operator.clusterserviceversion.yaml b/bundle/manifests/argocd-operator.clusterserviceversion.yaml index d55d520ac..ccadbe639 100644 --- a/bundle/manifests/argocd-operator.clusterserviceversion.yaml +++ b/bundle/manifests/argocd-operator.clusterserviceversion.yaml @@ -1742,7 +1742,7 @@ spec: fieldPath: metadata.annotations['olm.targetNamespaces'] - name: ENABLE_CONVERSION_WEBHOOK value: "true" - image: quay.io/argoprojlabs/argocd-operator@sha256:6359e98446936109e4c9491a7b919a5eac8ac6cbe737d94583bd979c2071c45f + image: quay.io/argoprojlabs/argocd-operator@sha256:98e86902867f9e4ca86de7a8536d850e298b4d039aee4cd35e70c6af95b39fff livenessProbe: httpGet: path: /healthz diff --git a/common/defaults.go b/common/defaults.go index 1c949c168..7612ce225 100644 --- a/common/defaults.go +++ b/common/defaults.go @@ -61,7 +61,7 @@ const ( ArgoCDDefaultArgoImage = "quay.io/argoproj/argocd" // ArgoCDDefaultArgoVersion is the Argo CD container image digest to use when version not specified. - ArgoCDDefaultArgoVersion = "sha256:712ff6ac413d74951988fdf82b1c8f433770be4d85b5ed013f848be0c164d0b9" // v2.8.6 + ArgoCDDefaultArgoVersion = "sha256:acaf3735256979326c8dcd3106454cee65572c40e191525174cba2bcb35541c5" // v2.8.6 // ArgoCDDefaultBackupKeyLength is the length of the generated default backup key. ArgoCDDefaultBackupKeyLength = 32 @@ -119,7 +119,7 @@ const ( ArgoCDDefaultExportJobImage = "quay.io/argoprojlabs/argocd-operator-util" // ArgoCDDefaultExportJobVersion is the export job container image tag to use when not specified. - ArgoCDDefaultExportJobVersion = "sha256:dfd3833b199a2e452940ed37a6175323e8fb0be5f2c8ea87f1d21330236679f1" // 0.8.0 + ArgoCDDefaultExportJobVersion = "sha256:463301e24116f311d6e1f658b197fa46138a028602d2d0e2c7add35d97018e46" // 0.8.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 index 5ae3991d0..246bfe637 100644 --- 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:6359e98446936109e4c9491a7b919a5eac8ac6cbe737d94583bd979c2071c45f +- digest: sha256:98e86902867f9e4ca86de7a8536d850e298b4d039aee4cd35e70c6af95b39fff name: controller newName: quay.io/argoprojlabs/argocd-operator diff --git a/deploy/catalog_source.yaml b/deploy/catalog_source.yaml index 30a4931ba..c542177f4 100644 --- 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:ccae1c0a80ad5846d73f7fdfcb20947daec2d50274619440011543d0cc527e19 # replace with your index image + image: quay.io/argoprojlabs/argocd-operator-registry@sha256:385a5a88abd3a2121e556cc5aba96d54d610a89d8790e5ecc6145d4cd35f1fbb # replace with your index image displayName: Argo CD Operators publisher: Argo CD Community \ No newline at end of file diff --git a/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator-controller-manager-metrics-service_v1_service.yaml b/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator-controller-manager-metrics-service_v1_service.yaml index 8d1547d9a..f23604e16 100644 --- a/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator-controller-manager-metrics-service_v1_service.yaml +++ b/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator-controller-manager-metrics-service_v1_service.yaml @@ -3,7 +3,7 @@ kind: Service metadata: creationTimestamp: null labels: - control-plane: argocd-operator + control-plane: controller-manager name: argocd-operator-controller-manager-metrics-service spec: ports: @@ -11,6 +11,6 @@ spec: port: 8443 targetPort: 8080 selector: - control-plane: argocd-operator + control-plane: controller-manager status: loadBalancer: {} diff --git a/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator.v0.8.0.clusterserviceversion.yaml b/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator.v0.8.0.clusterserviceversion.yaml index d55d520ac..85ab296ae 100644 --- a/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator.v0.8.0.clusterserviceversion.yaml +++ b/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator.v0.8.0.clusterserviceversion.yaml @@ -1723,12 +1723,12 @@ spec: replicas: 1 selector: matchLabels: - control-plane: argocd-operator + control-plane: controller-manager strategy: {} template: metadata: labels: - control-plane: argocd-operator + control-plane: controller-manager spec: containers: - args: From 58768a51802bdf44d8ba2ba2854371d7143a34d2 Mon Sep 17 00:00:00 2001 From: Regina Scott <50851526+reginapizza@users.noreply.github.com> Date: Tue, 21 Nov 2023 19:18:40 +0000 Subject: [PATCH 3/5] re-release v0.8.0 (#1075) --- bundle.Dockerfile | 2 +- .../argocd-operator.clusterserviceversion.yaml | 17 ++++++++++------- bundle/metadata/annotations.yaml | 2 +- common/defaults.go | 2 +- config/manager/kustomization.yaml | 2 +- .../argocd-operator.clusterserviceversion.yaml | 8 ++++---- deploy/catalog_source.yaml | 2 +- ...ller-manager-metrics-service_v1_service.yaml | 4 ++-- ...d-operator.v0.8.0.clusterserviceversion.yaml | 17 ++++++++++------- 9 files changed, 31 insertions(+), 25 deletions(-) diff --git a/bundle.Dockerfile b/bundle.Dockerfile index b64564155..321563977 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -6,7 +6,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ LABEL operators.operatorframework.io.bundle.package.v1=argocd-operator LABEL operators.operatorframework.io.bundle.channels.v1=alpha -LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.10.0+git +LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.32.0 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3 diff --git a/bundle/manifests/argocd-operator.clusterserviceversion.yaml b/bundle/manifests/argocd-operator.clusterserviceversion.yaml index ccadbe639..770f11dcf 100644 --- a/bundle/manifests/argocd-operator.clusterserviceversion.yaml +++ b/bundle/manifests/argocd-operator.clusterserviceversion.yaml @@ -218,8 +218,9 @@ metadata: capabilities: Deep Insights categories: Integration & Delivery certified: "false" + createdAt: "2023-11-21T13:52:07Z" description: Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes. - operators.operatorframework.io/builder: operator-sdk-v1.10.0+git + operators.operatorframework.io/builder: operator-sdk-v1.32.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/argoproj-labs/argocd-operator support: Argo CD @@ -637,8 +638,8 @@ spec: - urn:alm:descriptor:com.tectonic.ui:fieldGroup:RBAC - urn:alm:descriptor:com.tectonic.ui:text - description: 'Policy is CSV containing user-defined RBAC policies and role - definitions. Policy rules are in the form: p, subject, resource, action, - object, effect Role definitions and bindings are in the form: g, subject, + definitions. Policy rules are in the form: p, subject, resource, action, + object, effect Role definitions and bindings are in the form: g, subject, inherited-subject See https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/rbac.md for additional information.' displayName: Policy @@ -1215,8 +1216,8 @@ spec: - urn:alm:descriptor:com.tectonic.ui:fieldGroup:RBAC - urn:alm:descriptor:com.tectonic.ui:text - description: 'Policy is CSV containing user-defined RBAC policies and role - definitions. Policy rules are in the form: p, subject, resource, action, - object, effect Role definitions and bindings are in the form: g, subject, + definitions. Policy rules are in the form: p, subject, resource, action, + object, effect Role definitions and bindings are in the form: g, subject, inherited-subject See https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/rbac.md for additional information.' displayName: Policy @@ -1718,7 +1719,9 @@ spec: - create serviceAccountName: argocd-operator-controller-manager deployments: - - name: argocd-operator-controller-manager + - label: + control-plane: argocd-operator + name: argocd-operator-controller-manager spec: replicas: 1 selector: @@ -1742,7 +1745,7 @@ spec: fieldPath: metadata.annotations['olm.targetNamespaces'] - name: ENABLE_CONVERSION_WEBHOOK value: "true" - image: quay.io/argoprojlabs/argocd-operator@sha256:98e86902867f9e4ca86de7a8536d850e298b4d039aee4cd35e70c6af95b39fff + image: quay.io/argoprojlabs/argocd-operator@sha256:e7cfaa424ac22cb75d82908e5fcc27caafe32179eda6f7902f33806e21e880ce livenessProbe: httpGet: path: /healthz diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 215c83d2a..16ac9d971 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -5,7 +5,7 @@ annotations: operators.operatorframework.io.bundle.metadata.v1: metadata/ operators.operatorframework.io.bundle.package.v1: argocd-operator operators.operatorframework.io.bundle.channels.v1: alpha - operators.operatorframework.io.metrics.builder: operator-sdk-v1.10.0+git + operators.operatorframework.io.metrics.builder: operator-sdk-v1.32.0 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3 diff --git a/common/defaults.go b/common/defaults.go index 7612ce225..417616065 100644 --- a/common/defaults.go +++ b/common/defaults.go @@ -119,7 +119,7 @@ const ( ArgoCDDefaultExportJobImage = "quay.io/argoprojlabs/argocd-operator-util" // ArgoCDDefaultExportJobVersion is the export job container image tag to use when not specified. - ArgoCDDefaultExportJobVersion = "sha256:463301e24116f311d6e1f658b197fa46138a028602d2d0e2c7add35d97018e46" // 0.8.0 + ArgoCDDefaultExportJobVersion = "sha256:9b7f3aaf6f34e57171575cdd75fe13d223c4ca9f477598f04fc6147a3eb6a2a4" // 0.8.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 index 246bfe637..410f56ce8 100644 --- 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:98e86902867f9e4ca86de7a8536d850e298b4d039aee4cd35e70c6af95b39fff +- digest: sha256:e7cfaa424ac22cb75d82908e5fcc27caafe32179eda6f7902f33806e21e880ce name: controller newName: quay.io/argoprojlabs/argocd-operator diff --git a/config/manifests/bases/argocd-operator.clusterserviceversion.yaml b/config/manifests/bases/argocd-operator.clusterserviceversion.yaml index 93894fa0e..e3bb61a8c 100644 --- a/config/manifests/bases/argocd-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/argocd-operator.clusterserviceversion.yaml @@ -391,8 +391,8 @@ spec: - urn:alm:descriptor:com.tectonic.ui:fieldGroup:RBAC - urn:alm:descriptor:com.tectonic.ui:text - description: 'Policy is CSV containing user-defined RBAC policies and role - definitions. Policy rules are in the form: p, subject, resource, action, - object, effect Role definitions and bindings are in the form: g, subject, + definitions. Policy rules are in the form: p, subject, resource, action, + object, effect Role definitions and bindings are in the form: g, subject, inherited-subject See https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/rbac.md for additional information.' displayName: Policy @@ -992,8 +992,8 @@ spec: - urn:alm:descriptor:com.tectonic.ui:fieldGroup:RBAC - urn:alm:descriptor:com.tectonic.ui:text - description: 'Policy is CSV containing user-defined RBAC policies and role - definitions. Policy rules are in the form: p, subject, resource, action, - object, effect Role definitions and bindings are in the form: g, subject, + definitions. Policy rules are in the form: p, subject, resource, action, + object, effect Role definitions and bindings are in the form: g, subject, inherited-subject See https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/rbac.md for additional information.' displayName: Policy diff --git a/deploy/catalog_source.yaml b/deploy/catalog_source.yaml index c542177f4..d94e0c265 100644 --- 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:385a5a88abd3a2121e556cc5aba96d54d610a89d8790e5ecc6145d4cd35f1fbb # replace with your index image + image: quay.io/argoprojlabs/argocd-operator-registry@sha256:3001d27f7d6e07f19460028978a2f87d84d76862181bae6a59468552bbc8e2db # replace with your index image displayName: Argo CD Operators publisher: Argo CD Community \ No newline at end of file diff --git a/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator-controller-manager-metrics-service_v1_service.yaml b/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator-controller-manager-metrics-service_v1_service.yaml index f23604e16..8d1547d9a 100644 --- a/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator-controller-manager-metrics-service_v1_service.yaml +++ b/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator-controller-manager-metrics-service_v1_service.yaml @@ -3,7 +3,7 @@ kind: Service metadata: creationTimestamp: null labels: - control-plane: controller-manager + control-plane: argocd-operator name: argocd-operator-controller-manager-metrics-service spec: ports: @@ -11,6 +11,6 @@ spec: port: 8443 targetPort: 8080 selector: - control-plane: controller-manager + control-plane: argocd-operator status: loadBalancer: {} diff --git a/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator.v0.8.0.clusterserviceversion.yaml b/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator.v0.8.0.clusterserviceversion.yaml index 85ab296ae..ad8659e7e 100644 --- a/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator.v0.8.0.clusterserviceversion.yaml +++ b/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator.v0.8.0.clusterserviceversion.yaml @@ -218,8 +218,9 @@ metadata: capabilities: Deep Insights categories: Integration & Delivery certified: "false" + createdAt: "2023-11-21T13:52:07Z" description: Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes. - operators.operatorframework.io/builder: operator-sdk-v1.10.0+git + operators.operatorframework.io/builder: operator-sdk-v1.32.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/argoproj-labs/argocd-operator support: Argo CD @@ -637,8 +638,8 @@ spec: - urn:alm:descriptor:com.tectonic.ui:fieldGroup:RBAC - urn:alm:descriptor:com.tectonic.ui:text - description: 'Policy is CSV containing user-defined RBAC policies and role - definitions. Policy rules are in the form: p, subject, resource, action, - object, effect Role definitions and bindings are in the form: g, subject, + definitions. Policy rules are in the form: p, subject, resource, action, + object, effect Role definitions and bindings are in the form: g, subject, inherited-subject See https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/rbac.md for additional information.' displayName: Policy @@ -1215,8 +1216,8 @@ spec: - urn:alm:descriptor:com.tectonic.ui:fieldGroup:RBAC - urn:alm:descriptor:com.tectonic.ui:text - description: 'Policy is CSV containing user-defined RBAC policies and role - definitions. Policy rules are in the form: p, subject, resource, action, - object, effect Role definitions and bindings are in the form: g, subject, + definitions. Policy rules are in the form: p, subject, resource, action, + object, effect Role definitions and bindings are in the form: g, subject, inherited-subject See https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/rbac.md for additional information.' displayName: Policy @@ -1718,7 +1719,9 @@ spec: - create serviceAccountName: argocd-operator-controller-manager deployments: - - name: argocd-operator-controller-manager + - label: + control-plane: argocd-operator + name: argocd-operator-controller-manager spec: replicas: 1 selector: @@ -1742,7 +1745,7 @@ spec: fieldPath: metadata.annotations['olm.targetNamespaces'] - name: ENABLE_CONVERSION_WEBHOOK value: "true" - image: quay.io/argoprojlabs/argocd-operator@sha256:6359e98446936109e4c9491a7b919a5eac8ac6cbe737d94583bd979c2071c45f + image: quay.io/argoprojlabs/argocd-operator@sha256:e7cfaa424ac22cb75d82908e5fcc27caafe32179eda6f7902f33806e21e880ce livenessProbe: httpGet: path: /healthz From 829483cbf9b3ac3a86be7f3ad6f40a3619a6311d Mon Sep 17 00:00:00 2001 From: Regina Scott Date: Wed, 22 Nov 2023 11:25:57 +0000 Subject: [PATCH 4/5] fix incorrect operator-sdk version changes --- bundle.Dockerfile | 2 +- .../argocd-operator.clusterserviceversion.yaml | 17 +++++++---------- bundle/metadata/annotations.yaml | 2 +- config/manager/kustomization.yaml | 4 ++-- .../argocd-operator.clusterserviceversion.yaml | 8 ++++---- ...ller-manager-metrics-service_v1_service.yaml | 4 ++-- ...ocd-operator-webhook-service_v1_service.yaml | 2 +- ...d-operator.v0.8.0.clusterserviceversion.yaml | 17 +++++++---------- 8 files changed, 25 insertions(+), 31 deletions(-) diff --git a/bundle.Dockerfile b/bundle.Dockerfile index 321563977..b64564155 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -6,7 +6,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ LABEL operators.operatorframework.io.bundle.package.v1=argocd-operator LABEL operators.operatorframework.io.bundle.channels.v1=alpha -LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.32.0 +LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.10.0+git LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3 diff --git a/bundle/manifests/argocd-operator.clusterserviceversion.yaml b/bundle/manifests/argocd-operator.clusterserviceversion.yaml index 770f11dcf..5301692cb 100644 --- a/bundle/manifests/argocd-operator.clusterserviceversion.yaml +++ b/bundle/manifests/argocd-operator.clusterserviceversion.yaml @@ -218,9 +218,8 @@ metadata: capabilities: Deep Insights categories: Integration & Delivery certified: "false" - createdAt: "2023-11-21T13:52:07Z" description: Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes. - operators.operatorframework.io/builder: operator-sdk-v1.32.0 + operators.operatorframework.io/builder: operator-sdk-v1.10.0+git operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/argoproj-labs/argocd-operator support: Argo CD @@ -638,8 +637,8 @@ spec: - urn:alm:descriptor:com.tectonic.ui:fieldGroup:RBAC - urn:alm:descriptor:com.tectonic.ui:text - description: 'Policy is CSV containing user-defined RBAC policies and role - definitions. Policy rules are in the form: p, subject, resource, action, - object, effect Role definitions and bindings are in the form: g, subject, + definitions. Policy rules are in the form: p, subject, resource, action, + object, effect Role definitions and bindings are in the form: g, subject, inherited-subject See https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/rbac.md for additional information.' displayName: Policy @@ -1216,8 +1215,8 @@ spec: - urn:alm:descriptor:com.tectonic.ui:fieldGroup:RBAC - urn:alm:descriptor:com.tectonic.ui:text - description: 'Policy is CSV containing user-defined RBAC policies and role - definitions. Policy rules are in the form: p, subject, resource, action, - object, effect Role definitions and bindings are in the form: g, subject, + definitions. Policy rules are in the form: p, subject, resource, action, + object, effect Role definitions and bindings are in the form: g, subject, inherited-subject See https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/rbac.md for additional information.' displayName: Policy @@ -1719,9 +1718,7 @@ spec: - create serviceAccountName: argocd-operator-controller-manager deployments: - - label: - control-plane: argocd-operator - name: argocd-operator-controller-manager + - name: argocd-operator-controller-manager spec: replicas: 1 selector: @@ -1745,7 +1742,7 @@ spec: fieldPath: metadata.annotations['olm.targetNamespaces'] - name: ENABLE_CONVERSION_WEBHOOK value: "true" - image: quay.io/argoprojlabs/argocd-operator@sha256:e7cfaa424ac22cb75d82908e5fcc27caafe32179eda6f7902f33806e21e880ce + image: quay.io/argoprojlabs/argocd-operator:v0.8.0 livenessProbe: httpGet: path: /healthz diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 16ac9d971..215c83d2a 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -5,7 +5,7 @@ annotations: operators.operatorframework.io.bundle.metadata.v1: metadata/ operators.operatorframework.io.bundle.package.v1: argocd-operator operators.operatorframework.io.bundle.channels.v1: alpha - operators.operatorframework.io.metrics.builder: operator-sdk-v1.32.0 + operators.operatorframework.io.metrics.builder: operator-sdk-v1.10.0+git operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 410f56ce8..d9f21e827 100644 --- 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:e7cfaa424ac22cb75d82908e5fcc27caafe32179eda6f7902f33806e21e880ce - name: controller +- name: controller newName: quay.io/argoprojlabs/argocd-operator + newTag: v0.8.0 diff --git a/config/manifests/bases/argocd-operator.clusterserviceversion.yaml b/config/manifests/bases/argocd-operator.clusterserviceversion.yaml index e3bb61a8c..93894fa0e 100644 --- a/config/manifests/bases/argocd-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/argocd-operator.clusterserviceversion.yaml @@ -391,8 +391,8 @@ spec: - urn:alm:descriptor:com.tectonic.ui:fieldGroup:RBAC - urn:alm:descriptor:com.tectonic.ui:text - description: 'Policy is CSV containing user-defined RBAC policies and role - definitions. Policy rules are in the form: p, subject, resource, action, - object, effect Role definitions and bindings are in the form: g, subject, + definitions. Policy rules are in the form: p, subject, resource, action, + object, effect Role definitions and bindings are in the form: g, subject, inherited-subject See https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/rbac.md for additional information.' displayName: Policy @@ -992,8 +992,8 @@ spec: - urn:alm:descriptor:com.tectonic.ui:fieldGroup:RBAC - urn:alm:descriptor:com.tectonic.ui:text - description: 'Policy is CSV containing user-defined RBAC policies and role - definitions. Policy rules are in the form: p, subject, resource, action, - object, effect Role definitions and bindings are in the form: g, subject, + definitions. Policy rules are in the form: p, subject, resource, action, + object, effect Role definitions and bindings are in the form: g, subject, inherited-subject See https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/rbac.md for additional information.' displayName: Policy diff --git a/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator-controller-manager-metrics-service_v1_service.yaml b/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator-controller-manager-metrics-service_v1_service.yaml index 8d1547d9a..f23604e16 100644 --- a/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator-controller-manager-metrics-service_v1_service.yaml +++ b/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator-controller-manager-metrics-service_v1_service.yaml @@ -3,7 +3,7 @@ kind: Service metadata: creationTimestamp: null labels: - control-plane: argocd-operator + control-plane: controller-manager name: argocd-operator-controller-manager-metrics-service spec: ports: @@ -11,6 +11,6 @@ spec: port: 8443 targetPort: 8080 selector: - control-plane: argocd-operator + control-plane: controller-manager status: loadBalancer: {} diff --git a/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator-webhook-service_v1_service.yaml b/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator-webhook-service_v1_service.yaml index f5dda7bc9..101e0db27 100644 --- a/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator-webhook-service_v1_service.yaml +++ b/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator-webhook-service_v1_service.yaml @@ -9,6 +9,6 @@ spec: protocol: TCP targetPort: 9443 selector: - control-plane: argocd-operator + control-plane: controller-manager status: loadBalancer: {} diff --git a/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator.v0.8.0.clusterserviceversion.yaml b/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator.v0.8.0.clusterserviceversion.yaml index ad8659e7e..a63d61183 100644 --- a/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator.v0.8.0.clusterserviceversion.yaml +++ b/deploy/olm-catalog/argocd-operator/0.8.0/argocd-operator.v0.8.0.clusterserviceversion.yaml @@ -218,9 +218,8 @@ metadata: capabilities: Deep Insights categories: Integration & Delivery certified: "false" - createdAt: "2023-11-21T13:52:07Z" description: Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes. - operators.operatorframework.io/builder: operator-sdk-v1.32.0 + operators.operatorframework.io/builder: operator-sdk-v1.10.0+git operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/argoproj-labs/argocd-operator support: Argo CD @@ -638,8 +637,8 @@ spec: - urn:alm:descriptor:com.tectonic.ui:fieldGroup:RBAC - urn:alm:descriptor:com.tectonic.ui:text - description: 'Policy is CSV containing user-defined RBAC policies and role - definitions. Policy rules are in the form: p, subject, resource, action, - object, effect Role definitions and bindings are in the form: g, subject, + definitions. Policy rules are in the form: p, subject, resource, action, + object, effect Role definitions and bindings are in the form: g, subject, inherited-subject See https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/rbac.md for additional information.' displayName: Policy @@ -1216,8 +1215,8 @@ spec: - urn:alm:descriptor:com.tectonic.ui:fieldGroup:RBAC - urn:alm:descriptor:com.tectonic.ui:text - description: 'Policy is CSV containing user-defined RBAC policies and role - definitions. Policy rules are in the form: p, subject, resource, action, - object, effect Role definitions and bindings are in the form: g, subject, + definitions. Policy rules are in the form: p, subject, resource, action, + object, effect Role definitions and bindings are in the form: g, subject, inherited-subject See https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/rbac.md for additional information.' displayName: Policy @@ -1719,9 +1718,7 @@ spec: - create serviceAccountName: argocd-operator-controller-manager deployments: - - label: - control-plane: argocd-operator - name: argocd-operator-controller-manager + - name: argocd-operator-controller-manager spec: replicas: 1 selector: @@ -1745,7 +1742,7 @@ spec: fieldPath: metadata.annotations['olm.targetNamespaces'] - name: ENABLE_CONVERSION_WEBHOOK value: "true" - image: quay.io/argoprojlabs/argocd-operator@sha256:e7cfaa424ac22cb75d82908e5fcc27caafe32179eda6f7902f33806e21e880ce + image: quay.io/argoprojlabs/argocd-operator:v0.8.0 livenessProbe: httpGet: path: /healthz From 4640bb1c57acf21e2d78db67e0ca8c4fd93c012e Mon Sep 17 00:00:00 2001 From: Regina Scott Date: Wed, 22 Nov 2023 16:21:54 +0000 Subject: [PATCH 5/5] update dex test to use 2.8.6 image --- controllers/argocd/dex_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/argocd/dex_test.go b/controllers/argocd/dex_test.go index 3f0ca40a2..fe2f564a0 100644 --- a/controllers/argocd/dex_test.go +++ b/controllers/argocd/dex_test.go @@ -499,7 +499,7 @@ func TestReconcileArgoCD_reconcileDexDeployment_withUpdate(t *testing.T) { InitContainers: []corev1.Container{ { Name: "copyutil", - Image: "quay.io/argoproj/argocd@sha256:d40da8f5747415eb7f9b5c2d9b645aecd423888cad9b36e4f986bff8ecf0a786", + Image: "quay.io/argoproj/argocd@sha256:acaf3735256979326c8dcd3106454cee65572c40e191525174cba2bcb35541c5", Command: []string{ "cp", "-n",