manifests: Drop single-node-developer

There's an enhancement proposal for this profile [1], and the Code Ready Containers folks took a run at using it in [2] before backing off in [3]. I don't have any problems with having a specific CRC profile, but until we end up going that way, save ourselves the mental overhead of trying to guess whether it will want each of our manifest resources by dropping the annotation across the board. Effectively reverts abd8a20 (Annotate manifests for single-node-developer cluster profile, 2020-11-27, openshift#498). Generated with: $ sed -i '/single-node-developer/d' manifests/*.yaml $ git checkout HEAD -- manifests/00-custom-resource-definition* where I'm leaving the CRDs alone to avoid things like [4]: hack/verify-generated-crd.sh --- vendor/github.com/openshift/api/operator/v1/0000_50_ingress-operator_00-ingresscontroller.crd.yaml 2021-12-22 07:10:24.000000000 +0000 +++ manifests/00-custom-resource-definition.yaml 2021-12-22 07:10:25.000000000 +0000 @@ -5,7 +5,6 @@ metadata: api-approved.openshift.io: openshift/api#616 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" name: ingresscontrollers.operator.openshift.io spec: group: operator.openshift.io invalid CRD: vendor/github.com/openshift/api/operator/v1/0000_50_ingress-operator_00-ingresscontroller.crd.yaml => manifests/00-custom-resource-definition.yaml [1]: https://github.com/openshift/enhancements/blob/2911c46bf7d2f22eb1ab81739b4f9c2603fd0c07/enhancements/single-node/developer-cluster-profile.md [2]: crc-org/snc#338 [3]: crc-org/snc#373 (comment) [4]: https://prow.ci.openshift.org/view/gs/origin-ci-test/pr-logs/pull/openshift_cluster-ingress-operator/692/pull-ci-openshift-cluster-ingress-operator-master-verify/1473551168843026432#1:build-log.txt%3A14
wking · Dec 22, 2021 · 0dd22b3 · 0dd22b3
1 parent 71c14e9
commit 0dd22b3
Show file tree

Hide file tree

Showing 15 changed files with 0 additions and 22 deletions.
diff --git a/manifests/00-cluster-role.yaml b/manifests/00-cluster-role.yaml
@@ -8,7 +8,6 @@ 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"
 rules:
 - apiGroups:
   - ""

diff --git a/manifests/00-ingress-credentials-request.yaml b/manifests/00-ingress-credentials-request.yaml
@@ -7,7 +7,6 @@ metadata:
   namespace: openshift-cloud-credential-operator
   annotations:
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
 spec:
   serviceAccountNames:
   - ingress-operator
@@ -35,7 +34,6 @@ metadata:
   namespace: openshift-cloud-credential-operator
   annotations:
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
 spec:
   secretRef:
     name: cloud-credentials
@@ -55,7 +53,6 @@ metadata:
   namespace: openshift-cloud-credential-operator
   annotations:
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
 spec:
   serviceAccountNames:
   - ingress-operator
@@ -75,7 +72,6 @@ metadata:
   namespace: openshift-cloud-credential-operator
   annotations:
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
 spec:
   providerSpec:
     apiVersion: cloudcredential.openshift.io/v1
@@ -99,7 +95,6 @@ metadata:
   namespace: openshift-cloud-credential-operator
   annotations:
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
 spec:
   providerSpec:
     apiVersion: cloudcredential.openshift.io/v1
@@ -123,7 +118,6 @@ metadata:
   namespace: openshift-cloud-credential-operator
   annotations:
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
 spec:
   providerSpec:
     apiVersion: cloudcredential.openshift.io/v1

diff --git a/manifests/00-namespace.yaml b/manifests/00-namespace.yaml
@@ -4,7 +4,6 @@ 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: ""
     workload.openshift.io/allowed: "management"
   labels:

diff --git a/manifests/0000_90_ingress-operator_00_prometheusrole.yaml b/manifests/0000_90_ingress-operator_00_prometheusrole.yaml
@@ -6,7 +6,6 @@ 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"
 rules:
 - apiGroups:
   - ""

diff --git a/manifests/0000_90_ingress-operator_01_prometheusrolebinding.yaml b/manifests/0000_90_ingress-operator_01_prometheusrolebinding.yaml
@@ -6,7 +6,6 @@ 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"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role

diff --git a/manifests/0000_90_ingress-operator_02_servicemonitor.yaml b/manifests/0000_90_ingress-operator_02_servicemonitor.yaml
@@ -6,7 +6,6 @@ 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"
 spec:
   endpoints:
   - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token

diff --git a/manifests/0000_90_ingress-operator_03_prometheusrules.yaml b/manifests/0000_90_ingress-operator_03_prometheusrules.yaml
@@ -8,7 +8,6 @@ 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"
 spec:
   groups:
     - name: openshift-ingress.rules

diff --git a/manifests/01-cluster-role-binding.yaml b/manifests/01-cluster-role-binding.yaml
@@ -6,7 +6,6 @@ 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"
 subjects:
 - kind: ServiceAccount
   name: ingress-operator

diff --git a/manifests/01-role-binding.yaml b/manifests/01-role-binding.yaml
@@ -7,7 +7,6 @@ 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"
 subjects:
 - kind: ServiceAccount
   name: ingress-operator
@@ -27,7 +26,6 @@ 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"
 subjects:
 - kind: ServiceAccount
   name: ingress-operator

diff --git a/manifests/01-role.yaml b/manifests/01-role.yaml
@@ -7,7 +7,6 @@ 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"
 rules:
 - apiGroups:
   - operator.openshift.io
@@ -47,7 +46,6 @@ 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"
 rules:
 - apiGroups:
   - rbac.authorization.k8s.io

diff --git a/manifests/01-service-account.yaml b/manifests/01-service-account.yaml
@@ -8,4 +8,3 @@ 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"
diff --git a/manifests/01-service.yaml b/manifests/01-service.yaml
@@ -4,7 +4,6 @@ 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"
     service.beta.openshift.io/serving-cert-secret-name: metrics-tls
   labels:
     name: ingress-operator

diff --git a/manifests/01-trusted-ca-configmap.yaml b/manifests/01-trusted-ca-configmap.yaml
@@ -6,7 +6,6 @@ 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/manifests/02-deployment.yaml b/manifests/02-deployment.yaml
@@ -6,7 +6,6 @@ metadata:
   annotations:
     config.openshift.io/inject-proxy: ingress-operator
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
 spec:
   replicas: 1
   strategy:

diff --git a/manifests/03-cluster-operator.yaml b/manifests/03-cluster-operator.yaml
@@ -8,7 +8,6 @@ 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"
 status:
   versions:
     - name: operator