diff --git a/go.sum b/go.sum index 671f30237..6fc568bd8 100644 --- a/go.sum +++ b/go.sum @@ -111,7 +111,6 @@ github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/evanphx/json-patch v4.2.0+incompatible h1:fUDGZCv/7iAN7u0puUVhvKCcsR6vRfwrJatElLBEf0I= github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.9.0+incompatible h1:kLcOMZeuLAJvL2BPWLMIj5oaZQobrkAqrL+WFZwQses= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= @@ -414,7 +413,6 @@ github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v1.0.0 h1:6m/oheQuQ13N9ks4hubMG6BnvwOeaJrqSPLahSnczz8= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= @@ -453,7 +451,6 @@ go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= -go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738 h1:VcrIfasaLFkyjk6KNlXQSzO+B0fZcnECiDrKJsfxka0= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5 h1:Gqga3zA9tdAcfqobUGjSoCob5L3f8Dt5EuOp3ihNZko= go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5/go.mod h1:skWido08r9w6Lq/w70DO5XYIKMu4QFu1+4VsqLQuJy8= @@ -690,7 +687,6 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -739,7 +735,6 @@ k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= -k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.3.0 h1:WmkrnW7fdrm0/DMClc+HIxtftvxVIPAhlVwMQo5yLco= k8s.io/klog/v2 v2.3.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= @@ -760,7 +755,6 @@ modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03 modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs= modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7 h1:uuHDyjllyzRyCIvvn0OBjiRB0SgBZGqHNYAmjR7fO50= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.9 h1:rusRLrDhjBp6aYtl9sGEvQJr6faoHoDLd0YcUBTZguI= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.9/go.mod h1:dzAXnQbTRyDlZPJX2SUPEqvnB+j7AJjtlox7PEwigU0= diff --git a/manifests/0000_90_openshift-controller-manager-operator_00_prometheusrole.yaml b/manifests/0000_90_openshift-controller-manager-operator_00_prometheusrole.yaml index f56f02181..a7fe35b0b 100644 --- a/manifests/0000_90_openshift-controller-manager-operator_00_prometheusrole.yaml +++ b/manifests/0000_90_openshift-controller-manager-operator_00_prometheusrole.yaml @@ -4,6 +4,8 @@ metadata: # TODO this should be a clusterrole name: prometheus-k8s namespace: openshift-controller-manager-operator + annotations: + include.release.openshift.io/self-managed-high-availability: "true" rules: - apiGroups: - "" diff --git a/manifests/0000_90_openshift-controller-manager-operator_01_prometheusrolebinding.yaml b/manifests/0000_90_openshift-controller-manager-operator_01_prometheusrolebinding.yaml index c15f07b70..be5368e6e 100644 --- a/manifests/0000_90_openshift-controller-manager-operator_01_prometheusrolebinding.yaml +++ b/manifests/0000_90_openshift-controller-manager-operator_01_prometheusrolebinding.yaml @@ -3,6 +3,8 @@ kind: RoleBinding metadata: name: prometheus-k8s namespace: openshift-controller-manager-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-controller-manager-operator_02_servicemonitor.yaml b/manifests/0000_90_openshift-controller-manager-operator_02_servicemonitor.yaml index ff5ce7c9d..13261defd 100644 --- a/manifests/0000_90_openshift-controller-manager-operator_02_servicemonitor.yaml +++ b/manifests/0000_90_openshift-controller-manager-operator_02_servicemonitor.yaml @@ -4,6 +4,7 @@ metadata: name: openshift-controller-manager-operator namespace: openshift-controller-manager-operator annotations: + include.release.openshift.io/self-managed-high-availability: "true" exclude.release.openshift.io/internal-openshift-hosted: "true" spec: endpoints: diff --git a/manifests/0000_90_openshift-controller-manager-operator_03_operand-servicemonitor.yaml b/manifests/0000_90_openshift-controller-manager-operator_03_operand-servicemonitor.yaml index 26c0a4bcd..368e87fb6 100644 --- a/manifests/0000_90_openshift-controller-manager-operator_03_operand-servicemonitor.yaml +++ b/manifests/0000_90_openshift-controller-manager-operator_03_operand-servicemonitor.yaml @@ -3,6 +3,8 @@ kind: Role metadata: name: prometheus-k8s namespace: openshift-controller-manager + annotations: + include.release.openshift.io/self-managed-high-availability: "true" rules: - apiGroups: - "" @@ -20,6 +22,8 @@ kind: RoleBinding metadata: name: prometheus-k8s namespace: openshift-controller-manager + annotations: + include.release.openshift.io/self-managed-high-availability: "true" roleRef: apiGroup: rbac.authorization.k8s.io kind: Role @@ -35,6 +39,7 @@ metadata: name: openshift-controller-manager namespace: openshift-controller-manager annotations: + include.release.openshift.io/self-managed-high-availability: "true" exclude.release.openshift.io/internal-openshift-hosted: "true" spec: endpoints: diff --git a/manifests/00_namespace.yaml b/manifests/00_namespace.yaml index 92554dea5..cc2d19da0 100644 --- a/manifests/00_namespace.yaml +++ b/manifests/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/cluster-monitoring: "true" diff --git a/manifests/03_config.cr.yaml b/manifests/03_config.cr.yaml index e4a66de0b..4f855953b 100644 --- a/manifests/03_config.cr.yaml +++ b/manifests/03_config.cr.yaml @@ -3,6 +3,7 @@ kind: OpenShiftControllerManager 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/03_configmap.yaml b/manifests/03_configmap.yaml index ca64ee6bb..746ac1aff 100644 --- a/manifests/03_configmap.yaml +++ b/manifests/03_configmap.yaml @@ -3,6 +3,8 @@ kind: ConfigMap metadata: namespace: openshift-controller-manager-operator name: openshift-controller-manager-operator-config + annotations: + include.release.openshift.io/self-managed-high-availability: "true" data: config.yaml: | apiVersion: operator.openshift.io/v1 diff --git a/manifests/04_metricservice.yaml b/manifests/04_metricservice.yaml index d8b9674f3..c19701620 100644 --- a/manifests/04_metricservice.yaml +++ b/manifests/04_metricservice.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-controller-manager-operator-serving-cert exclude.release.openshift.io/internal-openshift-hosted: "true" labels: diff --git a/manifests/05_builder-deployer-config.yaml b/manifests/05_builder-deployer-config.yaml index f63571e71..7d52d3f15 100644 --- a/manifests/05_builder-deployer-config.yaml +++ b/manifests/05_builder-deployer-config.yaml @@ -3,6 +3,8 @@ kind: ConfigMap metadata: namespace: openshift-controller-manager-operator name: openshift-controller-manager-images + annotations: + include.release.openshift.io/self-managed-high-availability: "true" data: builderImage: quay.io/openshift/origin-docker-builder:v4.0 deployerImage: quay.io/openshift/origin-deployer:v4.0 diff --git a/manifests/06_roles.yaml b/manifests/06_roles.yaml index fa39b078f..bb663d01c 100644 --- a/manifests/06_roles.yaml +++ b/manifests/06_roles.yaml @@ -2,6 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: system:openshift:operator:openshift-controller-manager-operator + annotations: + include.release.openshift.io/self-managed-high-availability: "true" roleRef: kind: ClusterRole name: cluster-admin diff --git a/manifests/07_serviceaccount.yaml b/manifests/07_serviceaccount.yaml index fb7e7a3b2..5bbc85b6c 100644 --- a/manifests/07_serviceaccount.yaml +++ b/manifests/07_serviceaccount.yaml @@ -3,5 +3,7 @@ kind: ServiceAccount metadata: namespace: openshift-controller-manager-operator name: openshift-controller-manager-operator + annotations: + include.release.openshift.io/self-managed-high-availability: "true" labels: app: openshift-controller-manager-operator diff --git a/manifests/09_deployment.yaml b/manifests/09_deployment.yaml index f7b2b7866..b1121da94 100644 --- a/manifests/09_deployment.yaml +++ b/manifests/09_deployment.yaml @@ -6,6 +6,7 @@ metadata: labels: app: openshift-controller-manager-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/10_clusteroperator.yaml b/manifests/10_clusteroperator.yaml index 21232dc54..0c6e78782 100644 --- a/manifests/10_clusteroperator.yaml +++ b/manifests/10_clusteroperator.yaml @@ -3,6 +3,7 @@ kind: ClusterOperator metadata: name: openshift-controller-manager annotations: + include.release.openshift.io/self-managed-high-availability: "true" exclude.release.openshift.io/internal-openshift-hosted: "true" spec: {} status: