diff --git a/hack/gen-crd.sh b/hack/gen-crd.sh index 592be746ae..30b2634722 100755 --- a/hack/gen-crd.sh +++ b/hack/gen-crd.sh @@ -5,7 +5,8 @@ set -eu function annotate_crd() { script1='/^ annotations:/a\ \ \ \ \ exclude.release.openshift.io/internal-openshift-hosted: "true"\ -\ \ \ \ include.release.openshift.io/self-managed-high-availability: "true"' +\ \ \ \ include.release.openshift.io/self-managed-high-availability: "true"\ +\ \ \ \ include.release.openshift.io/single-node-developer: "true"' script2='/^ controller-gen.kubebuilder.io\/version: (devel)/d' input="${1}" output="${2}" diff --git a/install/0000_30_machine-api-operator_00_namespace.yaml b/install/0000_30_machine-api-operator_00_namespace.yaml index 9c7c8937e7..4165652d9d 100644 --- a/install/0000_30_machine-api-operator_00_namespace.yaml +++ b/install/0000_30_machine-api-operator_00_namespace.yaml @@ -4,6 +4,7 @@ metadata: annotations: include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" openshift.io/node-selector: "" name: openshift-machine-api labels: diff --git a/install/0000_30_machine-api-operator_01_images.configmap.yaml b/install/0000_30_machine-api-operator_01_images.configmap.yaml index ee55e63097..1778d97bf9 100644 --- a/install/0000_30_machine-api-operator_01_images.configmap.yaml +++ b/install/0000_30_machine-api-operator_01_images.configmap.yaml @@ -6,6 +6,7 @@ metadata: annotations: include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" data: images.json: > { diff --git a/install/0000_30_machine-api-operator_01_trusted-ca-configmap.yaml b/install/0000_30_machine-api-operator_01_trusted-ca-configmap.yaml index 9af0d0980c..cfdeb3cf2e 100644 --- a/install/0000_30_machine-api-operator_01_trusted-ca-configmap.yaml +++ b/install/0000_30_machine-api-operator_01_trusted-ca-configmap.yaml @@ -4,6 +4,7 @@ metadata: annotations: include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" release.openshift.io/create-only: "true" labels: config.openshift.io/inject-trusted-cabundle: "true" diff --git a/install/0000_30_machine-api-operator_02_machine.crd.yaml b/install/0000_30_machine-api-operator_02_machine.crd.yaml index 7d3ad0c65a..193c9cb9a4 100644 --- a/install/0000_30_machine-api-operator_02_machine.crd.yaml +++ b/install/0000_30_machine-api-operator_02_machine.crd.yaml @@ -6,6 +6,7 @@ metadata: annotations: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" creationTimestamp: null name: machines.machine.openshift.io spec: diff --git a/install/0000_30_machine-api-operator_03_machineset.crd.yaml b/install/0000_30_machine-api-operator_03_machineset.crd.yaml index f1992d9a61..96371c3818 100644 --- a/install/0000_30_machine-api-operator_03_machineset.crd.yaml +++ b/install/0000_30_machine-api-operator_03_machineset.crd.yaml @@ -6,6 +6,7 @@ metadata: annotations: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" creationTimestamp: null name: machinesets.machine.openshift.io spec: diff --git a/install/0000_30_machine-api-operator_07_machinehealthcheck.crd.yaml b/install/0000_30_machine-api-operator_07_machinehealthcheck.crd.yaml index a37884324e..75bbb4a768 100644 --- a/install/0000_30_machine-api-operator_07_machinehealthcheck.crd.yaml +++ b/install/0000_30_machine-api-operator_07_machinehealthcheck.crd.yaml @@ -6,6 +6,7 @@ metadata: annotations: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" creationTimestamp: null name: machinehealthchecks.machine.openshift.io spec: diff --git a/install/0000_30_machine-api-operator_08_webhook_service.crd.yaml b/install/0000_30_machine-api-operator_08_webhook_service.crd.yaml index c34d54fa2f..3603a971ac 100644 --- a/install/0000_30_machine-api-operator_08_webhook_service.crd.yaml +++ b/install/0000_30_machine-api-operator_08_webhook_service.crd.yaml @@ -8,6 +8,7 @@ metadata: annotations: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" service.beta.openshift.io/serving-cert-secret-name: machine-api-operator-webhook-cert spec: type: ClusterIP diff --git a/install/0000_30_machine-api-operator_09_rbac.yaml b/install/0000_30_machine-api-operator_09_rbac.yaml index 047c58078a..2fedeb28a9 100644 --- a/install/0000_30_machine-api-operator_09_rbac.yaml +++ b/install/0000_30_machine-api-operator_09_rbac.yaml @@ -5,6 +5,7 @@ metadata: namespace: openshift-machine-api annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" --- apiVersion: v1 @@ -14,6 +15,7 @@ metadata: namespace: openshift-machine-api annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" --- apiVersion: v1 @@ -23,6 +25,7 @@ metadata: namespace: openshift-machine-api annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" automountServiceAccountToken: false --- apiVersion: rbac.authorization.k8s.io/v1 @@ -32,6 +35,7 @@ metadata: namespace: openshift-config annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" rules: - apiGroups: - "" @@ -50,6 +54,7 @@ metadata: namespace: openshift-machine-api annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" rules: - apiGroups: @@ -127,6 +132,7 @@ metadata: name: machine-api-controllers annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" rules: - apiGroups: @@ -220,6 +226,7 @@ metadata: namespace: openshift-machine-api annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" rules: - apiGroups: @@ -294,6 +301,7 @@ metadata: name: machine-api-operator annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" rules: - apiGroups: ["authentication.k8s.io"] resources: @@ -361,6 +369,7 @@ metadata: name: machine-api-controllers annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -378,6 +387,7 @@ metadata: namespace: openshift-machine-api annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" roleRef: apiGroup: rbac.authorization.k8s.io kind: Role @@ -395,6 +405,7 @@ metadata: namespace: openshift-config annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" roleRef: apiGroup: rbac.authorization.k8s.io kind: Role @@ -411,6 +422,7 @@ metadata: name: machine-api-operator annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -428,6 +440,7 @@ metadata: namespace: openshift-machine-api annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" roleRef: apiGroup: rbac.authorization.k8s.io kind: Role @@ -445,6 +458,7 @@ metadata: namespace: openshift-machine-api annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" roleRef: apiGroup: rbac.authorization.k8s.io kind: Role @@ -463,6 +477,7 @@ metadata: namespace: openshift-machine-api annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" rules: - apiGroups: - "" @@ -490,6 +505,7 @@ metadata: rbac.authorization.k8s.io/aggregate-to-cluster-reader: "true" annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" rules: - apiGroups: - machine.openshift.io diff --git a/install/0000_30_machine-api-operator_10_kube-rbac-proxy-config.yaml b/install/0000_30_machine-api-operator_10_kube-rbac-proxy-config.yaml index b8439d2abc..1cb84f8868 100644 --- a/install/0000_30_machine-api-operator_10_kube-rbac-proxy-config.yaml +++ b/install/0000_30_machine-api-operator_10_kube-rbac-proxy-config.yaml @@ -5,6 +5,7 @@ metadata: namespace: openshift-machine-api annotations: include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" data: config-file.yaml: |+ authorization: diff --git a/install/0000_30_machine-api-operator_10_service.yaml b/install/0000_30_machine-api-operator_10_service.yaml index 195760bfa7..1f5f205edf 100644 --- a/install/0000_30_machine-api-operator_10_service.yaml +++ b/install/0000_30_machine-api-operator_10_service.yaml @@ -7,6 +7,7 @@ metadata: annotations: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" service.alpha.openshift.io/serving-cert-secret-name: machine-api-operator-tls labels: k8s-app: machine-api-operator @@ -28,6 +29,7 @@ metadata: annotations: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" service.alpha.openshift.io/serving-cert-secret-name: machine-api-controllers-tls labels: k8s-app: controller diff --git a/install/0000_30_machine-api-operator_11_deployment.yaml b/install/0000_30_machine-api-operator_11_deployment.yaml index d7d76533d3..d1a4d7f64e 100644 --- a/install/0000_30_machine-api-operator_11_deployment.yaml +++ b/install/0000_30_machine-api-operator_11_deployment.yaml @@ -8,6 +8,7 @@ metadata: annotations: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" spec: replicas: 1 selector: diff --git a/install/0000_30_machine-api-operator_12_clusteroperator.yaml b/install/0000_30_machine-api-operator_12_clusteroperator.yaml index d9dd46b474..fa13be939c 100644 --- a/install/0000_30_machine-api-operator_12_clusteroperator.yaml +++ b/install/0000_30_machine-api-operator_12_clusteroperator.yaml @@ -5,6 +5,7 @@ metadata: annotations: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" spec: {} status: versions: diff --git a/install/0000_90_machine-api-operator_03_servicemonitor.yaml b/install/0000_90_machine-api-operator_03_servicemonitor.yaml index a60b8237e5..d21c8c2174 100644 --- a/install/0000_90_machine-api-operator_03_servicemonitor.yaml +++ b/install/0000_90_machine-api-operator_03_servicemonitor.yaml @@ -8,6 +8,7 @@ metadata: annotations: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" spec: endpoints: - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token @@ -34,6 +35,7 @@ metadata: annotations: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" spec: namespaceSelector: matchNames: diff --git a/install/0000_90_machine-api-operator_04_alertrules.yaml b/install/0000_90_machine-api-operator_04_alertrules.yaml index faa03848bc..450d0af61d 100644 --- a/install/0000_90_machine-api-operator_04_alertrules.yaml +++ b/install/0000_90_machine-api-operator_04_alertrules.yaml @@ -9,6 +9,7 @@ metadata: annotations: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" + include.release.openshift.io/single-node-developer: "true" spec: groups: - name: machine-without-valid-node-ref