Operator Bundle Update [main]

pkg/templates/charts/toggle/assisted-service/templates/assisted-service-clusterrole.yaml

@@ -352,6 +352,7 @@ rules:
   - networking.k8s.io
   resources:
   - ingresses
+  - networkpolicies
   verbs:
   - create
   - delete

pkg/templates/charts/toggle/assisted-service/templates/infrastructure-operator-networkpolicy.yaml

@@ -0,0 +1,57 @@
+{{- if .Values.global.networkPolicies.enabled }}
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  labels:
+    control-plane: infrastructure-operator
+  name: infrastructure-operator
+  namespace: '{{ .Values.global.namespace }}'
+spec:
+  egress:
+  - ports:
+    - port: 5353
+      protocol: UDP
+    - port: 5353
+      protocol: TCP
+    to:
+    - namespaceSelector:
+        matchLabels:
+          kubernetes.io/metadata.name: openshift-dns
+  - ports:
+    - port: 6443
+      protocol: TCP
+    to:
+    - namespaceSelector: {}
+      podSelector:
+        matchLabels:
+          component: apiserver
+  - ports:
+    - port: 443
+      protocol: TCP
+    to:
+    - ipBlock:
+        cidr: 0.0.0.0/0
+        except:
+        - 169.254.169.254/32
+    - ipBlock:
+        cidr: ::/0
+  ingress:
+  - from:
+    - podSelector: {}
+  - from:
+    - namespaceSelector:
+        matchLabels:
+          network.openshift.io/policy-group: monitoring
+    ports:
+    - port: 8080
+      protocol: TCP
+  - ports:
+    - port: 9443
+      protocol: TCP
+  podSelector:
+    matchLabels:
+      control-plane: infrastructure-operator
+  policyTypes:
+  - Ingress
+  - Egress
+{{- end }}

pkg/templates/crds/hive-operator/hive.openshift.io_machinepools.yaml

@@ -260,7 +260,10 @@ spec:
                             - diskSizeGB
                           type: object
                         osImage:
-                          description: OSImage defines the image to use for the OS.
+                          description: |-
+                            OSImage defines the marketplace image to use for the OS. Mutually exclusive with OSImageID;
+                            if both are specified, OSImage is ignored. If neither is specified, the managed cluster will
+                            inject a default.
                           properties:
                             offer:
                               description: Offer is the offer of the image.
@@ -288,6 +291,12 @@ spec:
                             - sku
                             - version
                           type: object
+                        osImageID:
+                          description: |-
+                            OSImageID is the resource path of the managed or gallery image to be used on the VMs.
+                            Mutually exclusive with OSImage; if both are specified, OSImage is ignored. If neither is
+                            specified, the managed cluster will inject a default.
+                          type: string
                         outboundType:
                           description: OutboundType is a strategy for how egress from cluster is achieved. When not specified default is "Loadbalancer".
                           type: string