Skip to content
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

add current profile annotations to CVO manifests #629

Merged
merged 1 commit into from
Oct 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: registry-monitoring
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
rules:
- apiGroups:
- image.openshift.io
Expand All @@ -15,6 +17,8 @@ kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: registry-monitoring
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
subjects:
- kind: ServiceAccount
name: prometheus-k8s
Expand All @@ -30,6 +34,8 @@ metadata:
# TODO this should be a clusterrole
name: prometheus-k8s
namespace: openshift-image-registry
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
rules:
- apiGroups:
- ""
Expand All @@ -47,6 +53,8 @@ kind: RoleBinding
metadata:
name: prometheus-k8s
namespace: openshift-image-registry
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 number Diff line change
Expand Up @@ -4,6 +4,8 @@ kind: ServiceMonitor
metadata:
name: image-registry
namespace: openshift-image-registry
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
spec:
endpoints:
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ kind: ServiceMonitor
metadata:
name: image-registry-operator
namespace: openshift-image-registry
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
spec:
endpoints:
- targetPort: 60000
Expand Down
1 change: 1 addition & 0 deletions manifests/01-namespace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ kind: Namespace
metadata:
name: openshift-image-registry
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
openshift.io/node-selector: ""
labels:
openshift.io/cluster-monitoring: "true"
Expand Down
2 changes: 2 additions & 0 deletions manifests/01-registry-credentials-request-azure.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ metadata:
controller-tools.k8s.io: "1.0"
name: openshift-image-registry-azure
namespace: openshift-cloud-credential-operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
spec:
secretRef:
name: installer-cloud-credentials
Expand Down
2 changes: 2 additions & 0 deletions manifests/01-registry-credentials-request-gcs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ metadata:
controller-tools.k8s.io: "1.0"
name: openshift-image-registry-gcs
namespace: openshift-cloud-credential-operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
spec:
secretRef:
name: installer-cloud-credentials
Expand Down
2 changes: 2 additions & 0 deletions manifests/01-registry-credentials-request-openstack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ metadata:
controller-tools.k8s.io: "1.0"
name: openshift-image-registry-openstack
namespace: openshift-cloud-credential-operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
spec:
secretRef:
name: installer-cloud-credentials
Expand Down
2 changes: 2 additions & 0 deletions manifests/01-registry-credentials-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ metadata:
controller-tools.k8s.io: "1.0"
name: openshift-image-registry
namespace: openshift-cloud-credential-operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
spec:
secretRef:
name: installer-cloud-credentials
Expand Down
4 changes: 4 additions & 0 deletions manifests/02-rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: cluster-image-registry-operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
rules:
- apiGroups:
- imageregistry.operator.openshift.io
Expand Down Expand Up @@ -120,6 +122,8 @@ kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: default-account-cluster-image-registry-operator
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
subjects:
- kind: ServiceAccount
name: cluster-image-registry-operator
Expand Down
2 changes: 2 additions & 0 deletions manifests/03-sa.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ kind: ServiceAccount
metadata:
name: cluster-image-registry-operator
namespace: openshift-image-registry
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
1 change: 1 addition & 0 deletions manifests/04-ca-trusted.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/create-only: "true"
labels:
config.openshift.io/inject-trusted-cabundle: "true"
Expand Down
4 changes: 4 additions & 0 deletions manifests/05-ca-rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: node-ca
namespace: openshift-image-registry
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
rules:
- apiGroups:
- security.openshift.io
Expand All @@ -19,6 +21,8 @@ apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: node-ca
namespace: openshift-image-registry
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
subjects:
- kind: ServiceAccount
name: node-ca
Expand Down
2 changes: 2 additions & 0 deletions manifests/06-ca-serviceaccount.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ kind: ServiceAccount
metadata:
name: node-ca
namespace: openshift-image-registry
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
1 change: 1 addition & 0 deletions manifests/07-operator-service.yaml
Original file line number Diff 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: image-registry-operator-tls
labels:
name: image-registry-operator
Expand Down
3 changes: 2 additions & 1 deletion manifests/07-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ metadata:
name: cluster-image-registry-operator
namespace: openshift-image-registry
annotations:
config.openshift.io/inject-proxy: cluster-image-registry-operator
config.openshift.io/inject-proxy: cluster-image-registry-operator
include.release.openshift.io/self-managed-high-availability: "true"
spec:
replicas: 1
selector:
Expand Down
2 changes: 2 additions & 0 deletions manifests/08-clusteroperator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ apiVersion: config.openshift.io/v1
kind: ClusterOperator
metadata:
name: image-registry
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
spec: {}
status:
versions:
Expand Down
2 changes: 2 additions & 0 deletions manifests/09-prometheus-rules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ metadata:
name: image-registry-operator-alerts
name: image-registry-operator-alerts
namespace: openshift-image-registry
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
spec:
groups:
- name: ImageRegistryOperator
Expand Down