bug 1871890: add current profile annotations to CVO manifests

This is matches openshift/enhancements#414 and doesn't change existing behavior
openshift · Sep 22, 2020 · 0b5a52f · 0b5a52f
1 parent be96a0b
commit 0b5a52f
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 29 deletions.
diff --git a/go.sum b/go.sum
diff --git a/manifests/0000_90_cluster-authentication-operator_01_prometheusrbac.yaml b/manifests/0000_90_cluster-authentication-operator_01_prometheusrbac.yaml
@@ -4,6 +4,8 @@ kind: Role
 metadata:
   name: prometheus-k8s
   namespace: openshift-authentication-operator
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 rules:
 - apiGroups:
   - ""
@@ -22,6 +24,8 @@ kind: Role
 metadata:
   name: prometheus-k8s
   namespace: openshift-authentication
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 rules:
 - apiGroups:
   - ""
@@ -40,6 +44,8 @@ kind: RoleBinding
 metadata:
   name: prometheus-k8s
   namespace: openshift-authentication-operator
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -55,6 +61,8 @@ kind: RoleBinding
 metadata:
   name: prometheus-k8s
   namespace: openshift-authentication
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role

diff --git a/manifests/0000_90_cluster-authentication-operator_02_servicemonitor.yaml b/manifests/0000_90_cluster-authentication-operator_02_servicemonitor.yaml
@@ -4,6 +4,8 @@ kind: ServiceMonitor
 metadata:
   name: authentication-operator
   namespace: openshift-authentication-operator
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   endpoints:
   - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
@@ -30,6 +32,8 @@ kind: ServiceMonitor
 metadata:
   name: oauth-openshift
   namespace: openshift-authentication
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   endpoints:
   - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token

diff --git a/manifests/00_namespace.yaml b/manifests/00_namespace.yaml
@@ -3,6 +3,7 @@ kind: Namespace
 metadata:
   name: openshift-authentication-operator
   annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
     openshift.io/node-selector: ""
   labels:
     openshift.io/cluster-monitoring: "true"
diff --git a/manifests/02_config.cr.yaml b/manifests/02_config.cr.yaml
@@ -3,6 +3,7 @@ kind: Authentication
 metadata:
   name: cluster
   annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
     release.openshift.io/create-only: "true"
 spec:
   managementState: Managed
diff --git a/manifests/02_service.yaml b/manifests/02_service.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
     service.alpha.openshift.io/serving-cert-secret-name: serving-cert
   labels:
     app: authentication-operator

diff --git a/manifests/03_configmap.yaml b/manifests/03_configmap.yaml
@@ -3,6 +3,8 @@ kind: ConfigMap
 metadata:
   namespace: openshift-authentication-operator
   name: authentication-operator-config
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 data:
   operator-config.yaml: |
     apiVersion: operator.openshift.io/v1alpha1

diff --git a/manifests/03_openshift_service_ca.yaml b/manifests/03_openshift_service_ca.yaml
@@ -4,5 +4,6 @@ metadata:
   name: service-ca-bundle
   namespace: openshift-authentication-operator
   annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
     service.beta.openshift.io/inject-cabundle: "true"
 data: {}
diff --git a/manifests/03_operator_trusted_ca.yaml b/manifests/03_operator_trusted_ca.yaml
@@ -4,6 +4,7 @@ metadata:
   namespace: openshift-authentication-operator
   name: trusted-ca-bundle
   annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
     release.openshift.io/create-only: "true"
   labels:
     config.openshift.io/inject-trusted-cabundle: "true"
diff --git a/manifests/04_roles.yaml b/manifests/04_roles.yaml
@@ -2,6 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: system:openshift:operator:authentication
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 roleRef:
   kind: ClusterRole
   name: cluster-admin  # TODO fix, this is madness

diff --git a/manifests/05_serviceaccount.yaml b/manifests/05_serviceaccount.yaml
@@ -3,5 +3,7 @@ kind: ServiceAccount
 metadata:
   namespace: openshift-authentication-operator
   name: authentication-operator
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
   labels:
     app: authentication-operator
diff --git a/manifests/07_deployment.yaml b/manifests/07_deployment.yaml
@@ -6,6 +6,7 @@ metadata:
   labels:
     app: authentication-operator
   annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
     config.openshift.io/inject-proxy: authentication-operator
     exclude.release.openshift.io/internal-openshift-hosted: "true"
 spec:

diff --git a/manifests/08_clusteroperator.yaml b/manifests/08_clusteroperator.yaml
@@ -3,6 +3,7 @@ kind: ClusterOperator
 metadata:
   name: authentication
   annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
     exclude.release.openshift.io/internal-openshift-hosted: "true"
 status:
   versions: