fix: change contriller-manager labels

zncdatadev · Nov 3, 2023 · 71ebfa9 · 71ebfa9
1 parent 1600275
commit 71ebfa9
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 41 deletions.
diff --git a/bundle/manifests/spark-k8s-operator.clusterserviceversion.yaml b/bundle/manifests/spark-k8s-operator.clusterserviceversion.yaml
@@ -29,17 +29,7 @@ metadata:
                 "nginx.ingress.kubernetes.io/rewrite-target": "/"
               },
               "enabled": true,
-              "hosts": [
-                {
-                  "host": "spark-history-server.example.com",
-                  "paths": [
-                    {
-                      "path": "/",
-                      "pathType": "ImplementationSpecific"
-                    }
-                  ]
-                }
-              ]
+              "host": "spark-history-server.example.com"
             },
             "persistence": {
               "accessMode": "ReadWriteOnce",
@@ -66,7 +56,7 @@ metadata:
         }
       ]
     capabilities: Basic Install
-    createdAt: "2023-10-24T01:44:48Z"
+    createdAt: "2023-11-03T07:01:15Z"
     operators.operatorframework.io/builder: operator-sdk-v1.32.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v4-alpha
   name: spark-k8s-operator.v0.0.1-alpha
@@ -198,10 +188,10 @@ spec:
       deployments:
       - label:
           app.kubernetes.io/component: manager
-          app.kubernetes.io/created-by: spark-k8s-operator
+          app.kubernetes.io/created-by: operator-lifecycle-manager
           app.kubernetes.io/instance: controller-manager
           app.kubernetes.io/managed-by: kustomize
-          app.kubernetes.io/name: deployment
+          app.kubernetes.io/name: spark-k8s-operator
           app.kubernetes.io/part-of: spark-k8s-operator
           control-plane: controller-manager
         name: spark-k8s-operator-controller-manager
@@ -216,6 +206,12 @@ spec:
               annotations:
                 kubectl.kubernetes.io/default-container: manager
               labels:
+                app.kubernetes.io/component: manager
+                app.kubernetes.io/created-by: operator-lifecycle-manager
+                app.kubernetes.io/instance: controller-manager
+                app.kubernetes.io/managed-by: kustomize
+                app.kubernetes.io/name: spark-k8s-operator
+                app.kubernetes.io/part-of: spark-k8s-operator
                 control-plane: controller-manager
             spec:
               affinity:

diff --git a/bundle/manifests/stack.zncdata.net_sparkhistoryservers.yaml b/bundle/manifests/stack.zncdata.net_sparkhistoryservers.yaml
@@ -62,29 +62,9 @@ spec:
                   enabled:
                     default: true
                     type: boolean
-                  hosts:
-                    items:
-                      properties:
-                        host:
-                          default: spark-history-server.example.coom
-                          type: string
-                        paths:
-                          items:
-                            properties:
-                              path:
-                                default: /
-                                type: string
-                              pathType:
-                                default: ImplementationSpecific
-                                description: PathType represents the type of path
-                                  referred to by a HTTPIngressPath.
-                                type: string
-                            type: object
-                          type: array
-                      required:
-                      - paths
-                      type: object
-                    type: array
+                  host:
+                    default: spark-history-server.example.com
+                    type: string
                   tls:
                     description: IngressTLS describes the transport layer security
                       associated with an ingress.
@@ -108,8 +88,6 @@ spec:
                           and value of the "Host" header is used for routing.
                         type: string
                     type: object
-                required:
-                - hosts
                 type: object
               labels:
                 additionalProperties:
@@ -462,6 +440,18 @@ spec:
                   - type
                   type: object
                 type: array
+              urls:
+                items:
+                  properties:
+                    name:
+                      type: string
+                    url:
+                      type: string
+                  required:
+                  - name
+                  - url
+                  type: object
+                type: array
             type: object
         type: object
     served: true

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -18,10 +18,10 @@ metadata:
   namespace: system
   labels:
     control-plane: controller-manager
-    app.kubernetes.io/name: deployment
+    app.kubernetes.io/name: spark-k8s-operator
     app.kubernetes.io/instance: controller-manager
     app.kubernetes.io/component: manager
-    app.kubernetes.io/created-by: spark-k8s-operator
+    app.kubernetes.io/created-by: operator-lifecycle-manager
     app.kubernetes.io/part-of: spark-k8s-operator
     app.kubernetes.io/managed-by: kustomize
 spec:
@@ -35,6 +35,12 @@ spec:
         kubectl.kubernetes.io/default-container: manager
       labels:
         control-plane: controller-manager
+        app.kubernetes.io/name: spark-k8s-operator
+        app.kubernetes.io/instance: controller-manager
+        app.kubernetes.io/component: manager
+        app.kubernetes.io/created-by: operator-lifecycle-manager
+        app.kubernetes.io/part-of: spark-k8s-operator
+        app.kubernetes.io/managed-by: kustomize
     spec:
       # TODO(user): Uncomment the following code to configure the nodeAffinity expression
       # according to the platforms which are supported by your solution.