Skip to content

add exclusion annotations to all resources #136

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.

Sign up for GitHub

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

Closed
KodieGlosserIBM wants to merge 3 commits into from
Closed

add exclusion annotations to all resources #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9be1c85
add exclusion annotations to all resources
KodieGlosserIBM Dec 12, 2019
0a1bd64
Added exclusion annotation so the 4.3 CVO will ignore these operators…
KodieGlosserIBM Dec 12, 2019
a976890
Merge branch 'master' of github.com:KodieGlosserIBM/cluster-openshift…
KodieGlosserIBM Dec 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions manifests/0000_90_openshift-controller-manager-operator_00_prometheusrole.yaml
View file
Open in desktop
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-controller-manager-operator
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
rules:
- apiGroups:
- ""
Expand Down
2 changes: 2 additions & 0 deletions manifests/0000_90_openshift-controller-manager-operator_01_prometheusrolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ kind: RoleBinding
metadata:
name: prometheus-k8s
namespace: openshift-controller-manager-operator
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
Expand Down
4 changes: 4 additions & 0 deletions manifests/0000_90_openshift-controller-manager-operator_03_operand-servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ kind: Role
metadata:
name: prometheus-k8s
namespace: openshift-controller-manager
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
rules:
- apiGroups:
- ""
Expand All @@ -20,6 +22,8 @@ kind: RoleBinding
metadata:
name: prometheus-k8s
namespace: openshift-controller-manager
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
Expand Down
1 change: 1 addition & 0 deletions manifests/00_namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: Namespace
metadata:
annotations:
openshift.io/node-selector: ""
exclude.release.openshift.io/internal-openshift-hosted: "true"
labels:
openshift.io/run-level: "0"
openshift.io/cluster-monitoring: "true"
Expand Down
1 change: 1 addition & 0 deletions manifests/01_operand-namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: openshift-controller-manager
annotations:
openshift.io/node-selector: ""
exclude.release.openshift.io/internal-openshift-hosted: "true"
labels:
openshift.io/run-level: "1"
openshift.io/cluster-monitoring: "true"
1 change: 1 addition & 0 deletions manifests/03_config.cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ metadata:
name: cluster
annotations:
release.openshift.io/create-only: "true"
exclude.release.openshift.io/internal-openshift-hosted: "true"
spec:
managementState: Managed
2 changes: 2 additions & 0 deletions manifests/03_configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ kind: ConfigMap
metadata:
namespace: openshift-controller-manager-operator
name: openshift-controller-manager-operator-config
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
data:
config.yaml: |
apiVersion: operator.openshift.io/v1
Expand Down
2 changes: 2 additions & 0 deletions manifests/05_builder-deployer-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ kind: ConfigMap
metadata:
namespace: openshift-controller-manager-operator
name: openshift-controller-manager-images
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
data:
builderImage: quay.io/openshift/origin-docker-builder:v4.0
deployerImage: quay.io/openshift/origin-deployer:v4.0
2 changes: 2 additions & 0 deletions manifests/06_roles.yaml
View file
Open in desktop
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:openshift-controller-manager-operator
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
roleRef:
kind: ClusterRole
name: cluster-admin
Expand Down
2 changes: 2 additions & 0 deletions manifests/07_serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ metadata:
name: openshift-controller-manager-operator
labels:
app: openshift-controller-manager-operator
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"