fix incorrect operator-sdk version changes

argoproj-labs · Nov 22, 2023 · cf29566 · cf29566
1 parent 58768a5
commit cf29566
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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:

diff --git 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
@@ -11,6 +11,10 @@ configMapGenerator:
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
+<<<<<<< HEAD
 - digest: sha256:e7cfaa424ac22cb75d82908e5fcc27caafe32179eda6f7902f33806e21e880ce
   name: controller
+=======
+- name: controller
+>>>>>>> b31c4f2 (fix incorrect operator-sdk version changes)
   newName: quay.io/argoprojlabs/argocd-operator
diff --git a/.../argocd-operator/0.8.0/argocd-operator-controller-manager-metrics-service_v1_service.yaml b/.../argocd-operator/0.8.0/argocd-operator-controller-manager-metrics-service_v1_service.yaml
@@ -3,14 +3,14 @@ kind: Service
 metadata:
   creationTimestamp: null
   labels:
-    control-plane: argocd-operator
+    control-plane: controller-manager
   name: argocd-operator-controller-manager-metrics-service
 spec:
   ports:
   - name: https
     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
@@ -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
@@ -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: