chore: Fix flux-operator adoption by flux

Author: nahsi

bootstrap/bootstrap.yml

@@ -1679,6 +1679,7 @@ spec:
     protocol: TCP
     targetPort: 8080
   selector:
+    app.kubernetes.io/instance: flux-operator
     app.kubernetes.io/name: flux-operator
 ---
 apiVersion: apps/v1
@@ -1692,6 +1693,7 @@ spec:
   replicas: 1
   selector:
     matchLabels:
+      app.kubernetes.io/instance: flux-operator
       app.kubernetes.io/name: flux-operator
   template:
     metadata:
@@ -1700,6 +1702,7 @@ spec:
         prometheus.io/port: "8080"
         prometheus.io/scrape: "true"
       labels:
+        app.kubernetes.io/instance: flux-operator
         app.kubernetes.io/name: flux-operator
     spec:
       affinity:

bootstrap/bootstrap/instance.yml

@@ -137,4 +137,3 @@ spec:
                       labelSelector:
                         matchLabels:
                           app.kubernetes.io/part-of: flux
-

bootstrap/bootstrap/kustomization.yml

@@ -30,3 +30,24 @@ patches:
           - key: "node.kubernetes.io/unreachable"
             operator: "Exists"
             effect: "NoSchedule"
+  - target:
+      kind: Service
+      name: flux-operator
+      namespace: flux-system
+    patch: |-
+      - op: add
+        path: /spec/selector/app.kubernetes.io~1instance
+        value: flux-operator
+  - target:
+      kind: Deployment
+      name: flux-operator
+      namespace: flux-system
+    patch: |-
+      # selector
+      - op: add
+        path: /spec/selector/matchLabels/app.kubernetes.io~1instance
+        value: flux-operator
+      # pod template labels
+      - op: add
+        path: /spec/template/metadata/labels/app.kubernetes.io~1instance
+        value: flux-operator