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] 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