bug 1871890: add current profile annotations to CVO manifests #352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Sep 28, 2020

-Original file line number
+Diff line change
@@ Expand Up / @@ -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:
       - ""
@@ Expand All / @@ -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:
       - ""
@@ Expand All / @@ -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
@@ Expand All / @@ -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
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand All / @@ -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
@@ Expand Down @@

manifests/00_namespace.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -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"

manifests/02_config.cr.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -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

manifests/02_service.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@

manifests/03_configmap.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@

manifests/03_openshift_service_ca.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -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: {}

manifests/03_operator_trusted_ca.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -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"

manifests/04_roles.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@

manifests/05_serviceaccount.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -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

manifests/07_deployment.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -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:
@@ Expand Down @@

manifests/08_clusteroperator.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -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:
@@ Expand Down @@

Provide feedback