Merge pull request #381 from deads2k/profile

bug 1871890: add current profile annotations to CVO manifests
openshift · Aug 26, 2020 · 9cf1a0a · 9cf1a0a
2 parents 9bf7d9d + 9981afb
commit 9cf1a0a
Show file tree

Hide file tree

Showing 108 changed files with 5,490 additions and 3,876 deletions.
diff --git a/go.mod b/go.mod
@@ -7,10 +7,9 @@ require (
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-bindata/go-bindata v3.1.2+incompatible
 	github.com/gonum/graph v0.0.0-20170401004347-50b27dea7ebb
-	github.com/imdario/mergo v0.3.7
 	github.com/kubernetes-sigs/kube-storage-version-migrator v0.0.0-20191127225502-51849bc15f17
-	github.com/openshift/api v0.0.0-20200723134351-89de68875e7c
-	github.com/openshift/build-machinery-go v0.0.0-20200713135615-1f43d26dccc7
+	github.com/openshift/api v0.0.0-20200824162408-86251274d75f
+	github.com/openshift/build-machinery-go v0.0.0-20200819073603-48aa266c95f7
 	github.com/openshift/client-go v0.0.0-20200722173614-5a1b0aaeff15
 	github.com/openshift/library-go v0.0.0-20200807122248-f5cb4d19a4fe
 	github.com/spf13/cobra v1.0.0

diff --git a/go.sum b/go.sum
@@ -379,8 +379,12 @@ github.com/openshift/api v0.0.0-20200722170803-0ba2c3658da6 h1:h2zOwAA/Zg7mc9d16
 github.com/openshift/api v0.0.0-20200722170803-0ba2c3658da6/go.mod h1:IXsT3F4NjLtRzfnQvwU+g/oPWpoNsVV5vd5aaOMO8eU=
 github.com/openshift/api v0.0.0-20200723134351-89de68875e7c h1:qsj/GaQ1sdT584yIcGmqqRpR5xtX5jTw5Gis3/09YI4=
 github.com/openshift/api v0.0.0-20200723134351-89de68875e7c/go.mod h1:IXsT3F4NjLtRzfnQvwU+g/oPWpoNsVV5vd5aaOMO8eU=
+github.com/openshift/api v0.0.0-20200824162408-86251274d75f h1:11gpR/EcEicP/Nm3FtWXWGnRKhnlh9n3SaKr87sozjk=
+github.com/openshift/api v0.0.0-20200824162408-86251274d75f/go.mod h1:VxlbNnMs63PHurw9hgy1DKQKWmTmhRf3PULl7KwA5Kg=
 github.com/openshift/build-machinery-go v0.0.0-20200713135615-1f43d26dccc7 h1:iP7TOaN+tEVNUQ0ODEbN1ukjLz918lsIt7Czf8giWlM=
 github.com/openshift/build-machinery-go v0.0.0-20200713135615-1f43d26dccc7/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
+github.com/openshift/build-machinery-go v0.0.0-20200819073603-48aa266c95f7 h1:mOq7Mg1Q9d7nIDxe1SJ6pluMBQsbVxa6olyAGmfYWTg=
+github.com/openshift/build-machinery-go v0.0.0-20200819073603-48aa266c95f7/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
 github.com/openshift/client-go v0.0.0-20200722173614-5a1b0aaeff15 h1:b2QkHrmaYtY6kzy2VrYLc+KBmCuTpJjgvBahPqpt6V0=
 github.com/openshift/client-go v0.0.0-20200722173614-5a1b0aaeff15/go.mod h1:yd4Zpcdk+8JyMWi6v+h78jPqK0FvXbJY41Wq3SZxl+c=
 github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20200312103335-32e07ea4f8ca h1:YNtyJnE53QuEUSjl7L1AARocI021o7cU2bvh4prDtiE=

diff --git a/manifests/0000_30_openshift-apiserver-operator_00_namespace.yaml b/manifests/0000_30_openshift-apiserver-operator_00_namespace.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Namespace
 metadata:
   annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
     openshift.io/node-selector: ""
   labels:
     openshift.io/run-level: "0"

diff --git a/manifests/0000_30_openshift-apiserver-operator_01_operator.cr.yaml b/manifests/0000_30_openshift-apiserver-operator_01_operator.cr.yaml
@@ -3,6 +3,7 @@ kind: OpenShiftAPIServer
 metadata:
   name: cluster
   annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
     release.openshift.io/create-only: "true"
 spec:
-  managementState: Managed
+  managementState: Managed
diff --git a/manifests/0000_30_openshift-apiserver-operator_03_configmap.yaml b/manifests/0000_30_openshift-apiserver-operator_03_configmap.yaml
@@ -3,6 +3,8 @@ kind: ConfigMap
 metadata:
   namespace: openshift-apiserver-operator
   name: openshift-apiserver-operator-config
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 data:
   config.yaml: |
     apiVersion: operator.openshift.io/v1

diff --git a/manifests/0000_30_openshift-apiserver-operator_03_trusted_ca_cm.yaml b/manifests/0000_30_openshift-apiserver-operator_03_trusted_ca_cm.yaml
@@ -4,6 +4,7 @@ metadata:
   namespace: openshift-apiserver-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/0000_30_openshift-apiserver-operator_04_roles.yaml b/manifests/0000_30_openshift-apiserver-operator_04_roles.yaml
@@ -2,6 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: system:openshift:operator:openshift-apiserver-operator
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 roleRef:
   kind: ClusterRole
   name: cluster-admin

diff --git a/manifests/0000_30_openshift-apiserver-operator_05_serviceaccount.yaml b/manifests/0000_30_openshift-apiserver-operator_05_serviceaccount.yaml
@@ -3,5 +3,7 @@ kind: ServiceAccount
 metadata:
   namespace: openshift-apiserver-operator
   name: openshift-apiserver-operator
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
   labels:
     app: openshift-apiserver-operator
diff --git a/manifests/0000_30_openshift-apiserver-operator_06_service.yaml b/manifests/0000_30_openshift-apiserver-operator_06_service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
     service.alpha.openshift.io/serving-cert-secret-name: openshift-apiserver-operator-serving-cert
   labels:
     app: openshift-apiserver-operator

diff --git a/manifests/0000_30_openshift-apiserver-operator_07_deployment.yaml b/manifests/0000_30_openshift-apiserver-operator_07_deployment.yaml
@@ -6,6 +6,7 @@ metadata:
   labels:
     app: openshift-apiserver-operator
   annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
     exclude.release.openshift.io/internal-openshift-hosted: "true"
 spec:
   replicas: 1

diff --git a/manifests/0000_30_openshift-apiserver-operator_08_clusteroperator.yaml b/manifests/0000_30_openshift-apiserver-operator_08_clusteroperator.yaml
@@ -3,6 +3,7 @@ kind: ClusterOperator
 metadata:
   name: openshift-apiserver
   annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
     exclude.release.openshift.io/internal-openshift-hosted: "true"
 spec: {}
 status:

diff --git a/manifests/0000_90_openshift-apiserver-operator_01_prometheusrole.yaml b/manifests/0000_90_openshift-apiserver-operator_01_prometheusrole.yaml
@@ -4,6 +4,8 @@ metadata:
   # TODO this should be a clusterrole
   name: prometheus-k8s
   namespace: openshift-apiserver-operator
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 rules:
 - apiGroups:
   - ""

diff --git a/manifests/0000_90_openshift-apiserver-operator_02_prometheusrolebinding.yaml b/manifests/0000_90_openshift-apiserver-operator_02_prometheusrolebinding.yaml
@@ -3,6 +3,8 @@ kind: RoleBinding
 metadata:
   name: prometheus-k8s
   namespace: openshift-apiserver-operator
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role

diff --git a/manifests/0000_90_openshift-apiserver-operator_03_servicemonitor.yaml b/manifests/0000_90_openshift-apiserver-operator_03_servicemonitor.yaml
@@ -3,6 +3,8 @@ kind: ServiceMonitor
 metadata:
   name: openshift-apiserver-operator
   namespace: openshift-apiserver-operator
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   endpoints:
   - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token

diff --git a/manifests/0000_90_openshift-apiserver-operator_04_servicemonitor-apiserver.yaml b/manifests/0000_90_openshift-apiserver-operator_04_servicemonitor-apiserver.yaml
@@ -3,6 +3,8 @@ kind: Role
 metadata:
   name: prometheus-k8s
   namespace: openshift-apiserver
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 rules:
 - apiGroups:
   - ""
@@ -20,6 +22,8 @@ kind: RoleBinding
 metadata:
   name: prometheus-k8s
   namespace: openshift-apiserver
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -34,6 +38,8 @@ kind: ServiceMonitor
 metadata:
   name: openshift-apiserver
   namespace: openshift-apiserver
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   endpoints:
   - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token

diff --git a/manifests/0000_90_openshift-apiserver-operator_05_check-endpoints_service.yaml b/manifests/0000_90_openshift-apiserver-operator_05_check-endpoints_service.yaml
@@ -3,6 +3,8 @@ kind: Service
 metadata:
   name: check-endpoints
   namespace: openshift-apiserver
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   ports:
   - name: check-endpoints

diff --git a/manifests/0000_90_openshift-apiserver-operator_05_check-endpoints_servicemonitor.yaml b/manifests/0000_90_openshift-apiserver-operator_05_check-endpoints_servicemonitor.yaml
@@ -3,6 +3,8 @@ kind: ServiceMonitor
 metadata:
   name: openshift-apiserver-operator-check-endpoints
   namespace: openshift-apiserver
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   endpoints:
   - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token

diff --git a/vendor/github.com/openshift/api/Makefile b/vendor/github.com/openshift/api/Makefile
diff --git a/vendor/github.com/openshift/api/README.md b/vendor/github.com/openshift/api/README.md
diff --git a/...t/api/authorization/v1/0000_03_authorization-openshift_01_rolebindingrestriction.crd.yaml b/...t/api/authorization/v1/0000_03_authorization-openshift_01_rolebindingrestriction.crd.yaml
diff --git a/vendor/github.com/openshift/api/build/v1/generated.proto b/vendor/github.com/openshift/api/build/v1/generated.proto
diff --git a/vendor/github.com/openshift/api/build/v1/types.go b/vendor/github.com/openshift/api/build/v1/types.go
diff --git a/vendor/github.com/openshift/api/build/v1/zz_generated.swagger_doc_generated.go b/vendor/github.com/openshift/api/build/v1/zz_generated.swagger_doc_generated.go
diff --git a/....com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusteroperator.crd.yaml b/....com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusteroperator.crd.yaml
diff --git a/...b.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml b/...b.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml
diff --git a/vendor/github.com/openshift/api/config/v1/0000_03_config-operator_01_operatorhub.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_03_config-operator_01_operatorhub.crd.yaml
diff --git a/vendor/github.com/openshift/api/config/v1/0000_03_config-operator_01_proxy.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_03_config-operator_01_proxy.crd.yaml