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