From 77c8403d40f3d2a7f7033df7708398b7b3a31941 Mon Sep 17 00:00:00 2001 From: Regina Scott Date: Thu, 18 Jul 2024 16:28:33 -0400 Subject: [PATCH] release 0.11.0 continue --- bundle.Dockerfile | 4 ++++ .../argocd-operator.clusterserviceversion.yaml | 10 +++++----- bundle/metadata/annotations.yaml | 4 ++++ common/defaults.go | 2 +- config/manager/kustomization.yaml | 2 +- .../bases/argocd-operator.clusterserviceversion.yaml | 8 ++++---- deploy/catalog_source.yaml | 2 +- ...rgocd-operator.v0.11.0.clusterserviceversion.yaml | 12 ++++++------ 8 files changed, 26 insertions(+), 18 deletions(-) diff --git a/bundle.Dockerfile b/bundle.Dockerfile index f9861f9af..53c4ff0b2 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -8,6 +8,7 @@ LABEL operators.operatorframework.io.bundle.package.v1=argocd-operator LABEL operators.operatorframework.io.bundle.channels.v1=alpha <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.35.0 ======= LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.32.0 @@ -15,6 +16,9 @@ LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.32.0 ======= LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.10.0+git >>>>>>> a58a9d8 (release 0.11.0) +======= +LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.32.0 +>>>>>>> f523423 (release 0.11.0 continue) LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v4 diff --git a/bundle/manifests/argocd-operator.clusterserviceversion.yaml b/bundle/manifests/argocd-operator.clusterserviceversion.yaml index d6a939eb7..01a068358 100644 --- a/bundle/manifests/argocd-operator.clusterserviceversion.yaml +++ b/bundle/manifests/argocd-operator.clusterserviceversion.yaml @@ -667,8 +667,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 @@ -1245,8 +1245,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 @@ -1894,7 +1894,7 @@ spec: fieldPath: metadata.annotations['olm.targetNamespaces'] - name: ENABLE_CONVERSION_WEBHOOK value: "true" - image: quay.io/argoprojlabs/argocd-operator@sha256:80c4c2dd0f582d43c99a7e60597e16ef2e321427a77ca8ecf551278fa5f1ce06 + image: quay.io/argoprojlabs/argocd-operator@sha256:dafdfde863b81c8da28f37819ac4fc504ee0e9519ddcebd4dbe7c22a51d644e5 livenessProbe: httpGet: path: /healthz diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 4d0245a28..28c455816 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -6,6 +6,7 @@ annotations: operators.operatorframework.io.bundle.package.v1: argocd-operator operators.operatorframework.io.bundle.channels.v1: alpha <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD operators.operatorframework.io.metrics.builder: operator-sdk-v1.35.0 ======= @@ -14,6 +15,9 @@ annotations: ======= operators.operatorframework.io.metrics.builder: operator-sdk-v1.10.0+git >>>>>>> a58a9d8 (release 0.11.0) +======= + operators.operatorframework.io.metrics.builder: operator-sdk-v1.32.0 +>>>>>>> f523423 (release 0.11.0 continue) operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v4 diff --git a/common/defaults.go b/common/defaults.go index f69400427..f8548c5a6 100644 --- a/common/defaults.go +++ b/common/defaults.go @@ -122,7 +122,7 @@ const ( ArgoCDDefaultExportJobImage = "quay.io/argoprojlabs/argocd-operator-util" // ArgoCDDefaultExportJobVersion is the export job container image tag to use when not specified. - ArgoCDDefaultExportJobVersion = "sha256:69c61e7159494bf4a373e933bb9b31e0c7ab70783020c69fd5c7f27fc8b72954" // 0.11.0 + 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 index 93caad894..a691d8f69 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -11,7 +11,7 @@ configMapGenerator: apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization images: -- digest: sha256:80c4c2dd0f582d43c99a7e60597e16ef2e321427a77ca8ecf551278fa5f1ce06 +- digest: sha256:dafdfde863b81c8da28f37819ac4fc504ee0e9519ddcebd4dbe7c22a51d644e5 name: controller newName: quay.io/argoprojlabs/argocd-operator <<<<<<< HEAD diff --git a/config/manifests/bases/argocd-operator.clusterserviceversion.yaml b/config/manifests/bases/argocd-operator.clusterserviceversion.yaml index f7427220e..f734f5aee 100644 --- a/config/manifests/bases/argocd-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/argocd-operator.clusterserviceversion.yaml @@ -483,8 +483,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 @@ -1084,8 +1084,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 7ee7722c5..181db8c1e 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:8909f3549e630d2a5b98b7b411d402003801a819523f327cc605cf4b27121ce6 # 0.10.1 + image: quay.io/argoprojlabs/argocd-operator-registry@sha256:64e4fe0bf7b3dd5e89689d750fb63d7e3111068f18a7ed8656265cb1775f3b68 # 0.11.0 displayName: Argo CD Operators publisher: Argo CD Community \ No newline at end of file diff --git a/deploy/olm-catalog/argocd-operator/0.11.0/argocd-operator.v0.11.0.clusterserviceversion.yaml b/deploy/olm-catalog/argocd-operator/0.11.0/argocd-operator.v0.11.0.clusterserviceversion.yaml index 1226a7303..0e5ffd292 100644 --- a/deploy/olm-catalog/argocd-operator/0.11.0/argocd-operator.v0.11.0.clusterserviceversion.yaml +++ b/deploy/olm-catalog/argocd-operator/0.11.0/argocd-operator.v0.11.0.clusterserviceversion.yaml @@ -248,7 +248,7 @@ metadata: categories: Integration & Delivery certified: "false" 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 @@ -666,8 +666,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 @@ -1244,8 +1244,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 @@ -1891,7 +1891,7 @@ spec: fieldPath: metadata.annotations['olm.targetNamespaces'] - name: ENABLE_CONVERSION_WEBHOOK value: "true" - image: quay.io/argoprojlabs/argocd-operator@sha256:80c4c2dd0f582d43c99a7e60597e16ef2e321427a77ca8ecf551278fa5f1ce06 + image: quay.io/argoprojlabs/argocd-operator@sha256:dafdfde863b81c8da28f37819ac4fc504ee0e9519ddcebd4dbe7c22a51d644e5 livenessProbe: httpGet: path: /healthz