Skip to content

Commit

Permalink
add current profile annotations to CVO manifests
Browse files Browse the repository at this point in the history
This is matches openshift/enhancements#414 and doesn't change existing behavior
  • Loading branch information
deads2k committed Aug 24, 2020
1 parent 5d38e30 commit 8cc685c
Show file tree
Hide file tree
Showing 15 changed files with 24 additions and 0 deletions.
1 change: 1 addition & 0 deletions manifests/0000_12_etcd-operator_00_namespace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions manifests/0000_12_etcd-operator_01_config.crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: etcds.operator.openshift.io
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
spec:
scope: Cluster
group: operator.openshift.io
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_12_etcd-operator_01_operator.cr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: Etcd
metadata:
name: cluster
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/create-only: "true"
spec:
managementState: Managed
1 change: 1 addition & 0 deletions manifests/0000_12_etcd-operator_02_service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: etcd-operator-serving-cert
labels:
app: etcd-operator
Expand Down
4 changes: 4 additions & 0 deletions manifests/0000_12_etcd-operator_03_configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ kind: ConfigMap
metadata:
namespace: openshift-etcd-operator
name: etcd-operator-config
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
data:
config.yaml: |
apiVersion: operator.openshift.io/v1alpha1
Expand All @@ -12,6 +14,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/create-only: "true"
name: etcd-ca-bundle
namespace: openshift-etcd-operator
Expand All @@ -20,6 +23,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/create-only: "true"
service.beta.openshift.io/inject-cabundle: "true"
name: etcd-service-ca-bundle
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_12_etcd-operator_03_secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: Secret
type: SecretTypeTLS
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/create-only: "true"
name: etcd-client
namespace: openshift-etcd-operator
2 changes: 2 additions & 0 deletions manifests/0000_12_etcd-operator_04_clusterrolebinding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: system:openshift:operator:etcd-operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
roleRef:
kind: ClusterRole
name: cluster-admin
Expand Down
2 changes: 2 additions & 0 deletions manifests/0000_12_etcd-operator_05_serviceaccount.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ kind: ServiceAccount
metadata:
namespace: openshift-etcd-operator
name: etcd-operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
1 change: 1 addition & 0 deletions manifests/0000_12_etcd-operator_06_deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
namespace: openshift-etcd-operator
name: etcd-operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
exclude.release.openshift.io/internal-openshift-hosted: "true"
labels:
app: etcd-operator
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_12_etcd-operator_07_clusteroperator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: ClusterOperator
metadata:
name: etcd
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
exclude.release.openshift.io/internal-openshift-hosted: "true"
spec: {}
status:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: etcd-quorum-guard
namespace: openshift-etcd
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
exclude.release.openshift.io/internal-openshift-hosted: "true"
spec:
replicas: 3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
namespace: openshift-etcd
name: etcd-quorum-guard
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
exclude.release.openshift.io/internal-openshift-hosted: "true"
spec:
maxUnavailable: 1
Expand Down
2 changes: 2 additions & 0 deletions manifests/0000_90_etcd-operator_01_prometheusrole.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ metadata:
# TODO this should be a clusterrole
name: prometheus-k8s
namespace: openshift-etcd-operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
rules:
- apiGroups:
- ""
Expand Down
2 changes: 2 additions & 0 deletions manifests/0000_90_etcd-operator_02_prometheusrolebinding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ kind: RoleBinding
metadata:
name: prometheus-k8s
namespace: openshift-etcd-operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
Expand Down
2 changes: 2 additions & 0 deletions manifests/0000_90_etcd-operator_03_servicemonitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ kind: ServiceMonitor
metadata:
name: etcd-operator
namespace: openshift-etcd-operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
spec:
endpoints:
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
Expand Down

0 comments on commit 8cc685c

Please sign in to comment.