Skip to content

Add annotations to manifests to exclude in hosted deployment #269

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

Merged
openshift-merge-robot merged 1 commit into from
Nov 14, 2019
Merged

Add annotations to manifests to exclude in hosted deployment #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 install/0000_00_cluster-version-operator_03_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ kind: Deployment
metadata:
name: cluster-version-operator
namespace: openshift-cluster-version
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
Copy link
Copy Markdown
Member

@wking wking Nov 13, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why internal-openshift-hosted? Wouldn't this be internal-cluster-version-operator or some such? Then folks can drop components with #252 and EXCLUDE_MANIFESTS=internal-cluster-version-operator,.whatever,others,they,need-to-exclude. Or if we want a single knob for all the exclusions you need, we probably want docs (at least in the PR/commit message) for the intended components that fall under internal-openshift-hosted.

Copy link
Copy Markdown
Contributor Author

@csrwng csrwng Nov 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

internal-openshift-hosted is the profile that this exclusion is for ( a hosted control plane deployment as opposed to a traditional self-hosted one ). It doesn't prevent us from excluding the same manifest for other "profiles" such as single-node.

spec:
selector:
matchLabels:
Expand Down
2 changes: 2 additions & 0 deletions install/0000_90_cluster-version-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-cluster-version
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 install/0000_90_cluster-version-operator_02_servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ metadata:
k8s-app: cluster-version-operator
name: cluster-version-operator
namespace: openshift-cluster-version
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
spec:
endpoints:
- interval: 30s
Expand All @@ -24,6 +26,8 @@ metadata:
k8s-app: cluster-version-operator
name: cluster-version-operator
namespace: openshift-cluster-version
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
spec:
groups:
- name: cluster-version
Expand Down
2 changes: 2 additions & 0 deletions install/0001_00_cluster-version-operator_03_service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ metadata:
namespace: openshift-cluster-version
labels:
k8s-app: cluster-version-operator
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
spec:
type: ClusterIP
selector:
Expand Down