Skip to content

manifests: Add capability.openshift.io/name #414

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 2 commits into from
Feb 16, 2022
Merged

manifests: Add capability.openshift.io/name #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1aa4a6
manifests: Drop unused single-node-developer profile
wking Feb 9, 2022
024493c
manifests: Add capability.openshift.io/name
wking Feb 9, 2022
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: 1 addition & 1 deletion manifests/01-namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ apiVersion: v1
kind: Namespace
metadata:
annotations:
capability.openshift.io/name: openshift-samples
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
openshift.io/node-selector: ""
workload.openshift.io/allowed: "management"
labels:
Expand Down
4 changes: 2 additions & 2 deletions manifests/010-prometheus-rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ metadata:
name: samples-operator-alerts
namespace: openshift-cluster-samples-operator
annotations:
capability.openshift.io/name: openshift-samples
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
spec:
groups:
- name: SamplesOperator
Expand Down Expand Up @@ -95,4 +95,4 @@ spec:
provided in the 'imagestreamtag-to-image' config map in the 'openshift-cluster-samples-operator' namespace to
assist the mirroring process.
Or, the use of allowed registries or blocked registries with global imagestream configuration will not allow
samples operator to create imagestreams using the default image registry 'registry.redhat.io'.
samples operator to create imagestreams using the default image registry 'registry.redhat.io'.
2 changes: 1 addition & 1 deletion manifests/02-sa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ metadata:
name: cluster-samples-operator
namespace: openshift-cluster-samples-operator
annotations:
capability.openshift.io/name: openshift-samples
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
2 changes: 1 addition & 1 deletion manifests/03-rbac-imageconfig-role-binding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: cluster-samples-operator-imageconfig-reader
annotations:
capability.openshift.io/name: openshift-samples
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
subjects:
- kind: ServiceAccount
name: cluster-samples-operator
Expand Down
2 changes: 1 addition & 1 deletion manifests/03-rbac-imageconfig-role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ kind: ClusterRole
metadata:
name: cluster-samples-operator-imageconfig-reader
annotations:
capability.openshift.io/name: openshift-samples
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
rules:
- apiGroups:
- config.openshift.io
Expand Down
2 changes: 1 addition & 1 deletion manifests/03-rbac-proxies-role-binding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: cluster-samples-operator-proxy-reader
annotations:
capability.openshift.io/name: openshift-samples
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
subjects:
- kind: ServiceAccount
name: cluster-samples-operator
Expand Down
2 changes: 1 addition & 1 deletion manifests/03-rbac-proxies-role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ kind: ClusterRole
metadata:
name: cluster-samples-operator-proxy-reader
annotations:
capability.openshift.io/name: openshift-samples
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
rules:
- apiGroups:
- config.openshift.io
Expand Down
10 changes: 5 additions & 5 deletions manifests/03-rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ metadata:
name: cluster-samples-operator
namespace: openshift-cluster-samples-operator
annotations:
capability.openshift.io/name: openshift-samples
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
rules:
- apiGroups:
- ""
Expand Down Expand Up @@ -37,9 +37,9 @@ apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: cluster-samples-operator
annotations:
capability.openshift.io/name: openshift-samples
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
rules:
- apiGroups:
- samples.operator.openshift.io
Expand All @@ -65,9 +65,9 @@ metadata:
rbac.authorization.k8s.io/aggregate-to-cluster-reader: "true"
name: system:openshift:cluster-samples-operator:cluster-reader
annotations:
capability.openshift.io/name: openshift-samples
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
rules:
- apiGroups:
- samples.operator.openshift.io
Expand All @@ -87,9 +87,9 @@ metadata:
name: cluster-samples-operator
namespace: openshift-cluster-samples-operator
annotations:
capability.openshift.io/name: openshift-samples
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
subjects:
- kind: ServiceAccount
name: cluster-samples-operator
Expand All @@ -105,9 +105,9 @@ apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: cluster-samples-operator
annotations:
capability.openshift.io/name: openshift-samples
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
subjects:
- kind: ServiceAccount
name: cluster-samples-operator
Expand Down
2 changes: 1 addition & 1 deletion manifests/04-openshift-rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ metadata:
name: cluster-samples-operator-openshift-edit
namespace: openshift
annotations:
capability.openshift.io/name: openshift-samples
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
subjects:
- kind: ServiceAccount
name: cluster-samples-operator
Expand Down
4 changes: 2 additions & 2 deletions manifests/05-kube-system-rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ metadata:
name: coreos-pull-secret-reader
namespace: openshift-config
annotations:
capability.openshift.io/name: openshift-samples
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
rules:
- apiGroups:
- ""
Expand All @@ -25,9 +25,9 @@ metadata:
name: cluster-samples-operator-openshift-config-secret-reader
namespace: openshift-config
annotations:
capability.openshift.io/name: openshift-samples
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
subjects:
- kind: ServiceAccount
name: cluster-samples-operator
Expand Down
2 changes: 1 addition & 1 deletion manifests/06-metricsservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ apiVersion: v1
kind: Service
metadata:
annotations:
capability.openshift.io/name: openshift-samples
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
service.beta.openshift.io/serving-cert-secret-name: samples-operator-tls
labels:
name: cluster-samples-operator
Expand Down
1 change: 1 addition & 0 deletions manifests/06-operator-ibm-cloud-managed.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
capability.openshift.io/name: openshift-samples
include.release.openshift.io/ibm-cloud-managed: "true"
name: cluster-samples-operator
namespace: openshift-cluster-samples-operator
Expand Down
2 changes: 1 addition & 1 deletion manifests/06-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ metadata:
name: cluster-samples-operator
namespace: openshift-cluster-samples-operator
annotations:
capability.openshift.io/name: openshift-samples
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
spec:
replicas: 1
selector:
Expand Down
2 changes: 1 addition & 1 deletion manifests/06-servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ metadata:
name: cluster-samples-operator
namespace: openshift-cluster-samples-operator
annotations:
capability.openshift.io/name: openshift-samples
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
spec:
endpoints:
- targetPort: 60000
Expand Down
2 changes: 1 addition & 1 deletion manifests/07-clusteroperator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ kind: ClusterOperator
metadata:
name: openshift-samples
annotations:
capability.openshift.io/name: openshift-samples
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
spec: {}
status:
relatedObjects:
Expand Down
9 changes: 0 additions & 9 deletions manifests/08-openshift-imagestreams.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
spec:
tags:
- name: latest
Expand All @@ -27,7 +26,6 @@ metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
spec:
tags:
- name: latest
Expand All @@ -45,7 +43,6 @@ metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
spec:
tags:
- name: latest
Expand All @@ -63,7 +60,6 @@ metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
spec:
tags:
- name: latest
Expand All @@ -81,7 +77,6 @@ metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
spec:
tags:
- name: latest
Expand All @@ -99,7 +94,6 @@ metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
spec:
tags:
- name: latest
Expand All @@ -117,7 +111,6 @@ metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
spec:
tags:
- name: latest
Expand All @@ -135,7 +128,6 @@ metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
spec:
tags:
- name: v4.4
Expand All @@ -156,7 +148,6 @@ metadata:
release.openshift.io/delete: "true"
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
spec:
lookupPolicy:
local: true
Expand Down
4 changes: 2 additions & 2 deletions manifests/09-servicemonitor-rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ metadata:
name: prometheus-k8s
namespace: openshift-cluster-samples-operator
annotations:
capability.openshift.io/name: openshift-samples
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
rules:
- apiGroups:
- ""
Expand All @@ -26,9 +26,9 @@ metadata:
name: prometheus-k8s
namespace: openshift-cluster-samples-operator
annotations:
capability.openshift.io/name: openshift-samples
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
Expand Down
9 changes: 5 additions & 4 deletions profile-patches/ibm-cloud-managed/06-operator.yaml-patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
- op: replace
path: /metadata/annotations
value:
include.release.openshift.io/ibm-cloud-managed: "true"
- op: remove
path: /metadata/annotations/include.release.openshift.io~1self-managed-high-availability
- op: add
path: /metadata/annotations/include.release.openshift.io~1ibm-cloud-managed
value: "true"
Copy link
Contributor

@dperaza4dustbit dperaza4dustbit Feb 10, 2022

Choose a reason for hiding this comment

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

Can you elaborate on what this is doing?

Copy link
Member Author

@wking wking Feb 10, 2022

Choose a reason for hiding this comment

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

From the 024493c commit message:

I'm also adjusting the JSON Patch file to remove [3] the
self-managed-high-availability annotation and add [4] the
ibm-cloud-managed annotation, instead of clobbering the whole
annotation set, to preserve additional annotations like the capability
name. '~1` is the JSON Pointer escape for '/' [5].
...
[3]: https://datatracker.ietf.org/doc/html/rfc6902#section-4.2
[4]: https://datatracker.ietf.org/doc/html/rfc6902#section-4.1
[5]: https://datatracker.ietf.org/doc/html/rfc6901#section-3

- op: remove
path: /spec/template/spec/nodeSelector