Re-generate manifests with operator-sdk v1.18

A few changes were required to generate the bundle with v1.18.0: - "control-plane" label on the deployment - Main container must be named "manager"
shipwright-io · Oct 30, 2023 · d1a17c4 · d1a17c4
1 parent d2be782
commit d1a17c4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 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=shipwright-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=alpha
-LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.16.0+git
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.17.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/shipwright-operator.clusterserviceversion.yaml b/bundle/manifests/shipwright-operator.clusterserviceversion.yaml
@@ -20,7 +20,7 @@ metadata:
     certified: "false"
     containerImage: ko://github.com/shipwright-io/operator
     description: Shipwright is a framework for building container images on Kubernetes.
-    operators.operatorframework.io/builder: operator-sdk-v1.16.0+git
+    operators.operatorframework.io/builder: operator-sdk-v1.17.0+git
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/shipwright-io/operator
     support: The Shipwright Contributors
@@ -759,13 +759,15 @@ spec:
           selector:
             matchLabels:
               app: shipwright-operator
+              control-plane: controller-manager
           strategy: {}
           template:
             metadata:
               annotations:
-                kubectl.kubernetes.io/default-container: operator
+                kubectl.kubernetes.io/default-container: manager
               labels:
                 app: shipwright-operator
+                control-plane: controller-manager
             spec:
               containers:
               - args:
@@ -789,6 +791,10 @@ spec:
               - args:
                 - --health-probe-bind-address=:8081
                 - --metrics-bind-address=127.0.0.1:8080
+                - --leader-elect
+                name: operator
+                resources: {}
+              - args:
                 - --leader-elect
                 env:
                 - name: USE_MANAGED_WEBHOOK_CERTS
@@ -800,7 +806,7 @@ spec:
                     port: 8081
                   initialDelaySeconds: 15
                   periodSeconds: 20
-                name: operator
+                name: manager
                 readinessProbe:
                   httpGet:
                     path: /readyz

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: shipwright-operator
   operators.operatorframework.io.bundle.channels.v1: alpha
-  operators.operatorframework.io.metrics.builder: operator-sdk-v1.16.0+git
+  operators.operatorframework.io.metrics.builder: operator-sdk-v1.17.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/manager.yaml b/config/manager/manager.yaml
@@ -12,17 +12,20 @@ metadata:
   namespace: system
   labels:
     app: shipwright-operator
+    control-plane: controller-manager
 spec:
   selector:
     matchLabels:
       app: shipwright-operator
+      control-plane: controller-manager
   replicas: 1
   template:
     metadata:
       annotations:
-        kubectl.kubernetes.io/default-container: operator
+        kubectl.kubernetes.io/default-container: manager
       labels:
         app: shipwright-operator
+        control-plane: controller-manager
     spec:
       securityContext:
         runAsNonRoot: true
@@ -33,7 +36,7 @@ spec:
         - name: USE_MANAGED_WEBHOOK_CERTS
           value: "true"
         image: ko://github.com/shipwright-io/operator
-        name: operator
+        name: manager
         securityContext:
           allowPrivilegeEscalation: false
         livenessProbe: