Skip to content

Commit 1c741da

Browse files
ankitathomasankitathomas
committed
remove cvo hypershift profile annotation from psm-operator manifests
1 parent 5d3de4a commit 1c741da

File tree

55 files changed

+79
-80
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+79
-80
lines changed

‎manifests/0000_50_olm_00-catalogsources.crd.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.15.0
66
include.release.openshift.io/ibm-cloud-managed: "true"
7-
include.release.openshift.io/hypershift: "true"
87
include.release.openshift.io/self-managed-high-availability: "true"
98
capability.openshift.io/name: "OperatorLifecycleManager"
9+
include.release.openshift.io/hypershift: "true"
1010
name: catalogsources.operators.coreos.com
1111
spec:
1212
group: operators.coreos.com

‎manifests/0000_50_olm_00-clusterserviceversions.crd.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.15.0
66
include.release.openshift.io/ibm-cloud-managed: "true"
7-
include.release.openshift.io/hypershift: "true"
87
include.release.openshift.io/self-managed-high-availability: "true"
98
capability.openshift.io/name: "OperatorLifecycleManager"
9+
include.release.openshift.io/hypershift: "true"
1010
name: clusterserviceversions.operators.coreos.com
1111
spec:
1212
group: operators.coreos.com

‎manifests/0000_50_olm_00-installplans.crd.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.15.0
66
include.release.openshift.io/ibm-cloud-managed: "true"
7-
include.release.openshift.io/hypershift: "true"
87
include.release.openshift.io/self-managed-high-availability: "true"
98
capability.openshift.io/name: "OperatorLifecycleManager"
9+
include.release.openshift.io/hypershift: "true"
1010
name: installplans.operators.coreos.com
1111
spec:
1212
group: operators.coreos.com

‎manifests/0000_50_olm_00-namespace.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ metadata:
1111
openshift.io/node-selector: ""
1212
workload.openshift.io/allowed: "management"
1313
include.release.openshift.io/ibm-cloud-managed: "true"
14-
include.release.openshift.io/hypershift: "true"
1514
include.release.openshift.io/self-managed-high-availability: "true"
1615
capability.openshift.io/name: "OperatorLifecycleManager"
16+
include.release.openshift.io/hypershift: "true"
1717
---
1818
apiVersion: v1
1919
kind: Namespace
@@ -27,6 +27,6 @@ metadata:
2727
openshift.io/node-selector: ""
2828
workload.openshift.io/allowed: "management"
2929
include.release.openshift.io/ibm-cloud-managed: "true"
30-
include.release.openshift.io/hypershift: "true"
3130
include.release.openshift.io/self-managed-high-availability: "true"
3231
capability.openshift.io/name: "OperatorLifecycleManager"
32+
include.release.openshift.io/hypershift: "true"

‎manifests/0000_50_olm_00-olmconfigs.crd.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.15.0
66
include.release.openshift.io/ibm-cloud-managed: "true"
7-
include.release.openshift.io/hypershift: "true"
87
include.release.openshift.io/self-managed-high-availability: "true"
98
capability.openshift.io/name: "OperatorLifecycleManager"
9+
include.release.openshift.io/hypershift: "true"
1010
name: olmconfigs.operators.coreos.com
1111
spec:
1212
group: operators.coreos.com

‎manifests/0000_50_olm_00-operatorconditions.crd.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.15.0
66
include.release.openshift.io/ibm-cloud-managed: "true"
7-
include.release.openshift.io/hypershift: "true"
87
include.release.openshift.io/self-managed-high-availability: "true"
98
capability.openshift.io/name: "OperatorLifecycleManager"
9+
include.release.openshift.io/hypershift: "true"
1010
name: operatorconditions.operators.coreos.com
1111
spec:
1212
group: operators.coreos.com

‎manifests/0000_50_olm_00-operatorgroups.crd.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.15.0
66
include.release.openshift.io/ibm-cloud-managed: "true"
7-
include.release.openshift.io/hypershift: "true"
87
include.release.openshift.io/self-managed-high-availability: "true"
98
capability.openshift.io/name: "OperatorLifecycleManager"
9+
include.release.openshift.io/hypershift: "true"
1010
name: operatorgroups.operators.coreos.com
1111
spec:
1212
group: operators.coreos.com

‎manifests/0000_50_olm_00-operators.crd.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.15.0
66
include.release.openshift.io/ibm-cloud-managed: "true"
7-
include.release.openshift.io/hypershift: "true"
87
include.release.openshift.io/self-managed-high-availability: "true"
98
capability.openshift.io/name: "OperatorLifecycleManager"
9+
include.release.openshift.io/hypershift: "true"
1010
name: operators.operators.coreos.com
1111
spec:
1212
group: operators.coreos.com

‎manifests/0000_50_olm_00-packageserver.pdb.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ metadata:
55
namespace: openshift-operator-lifecycle-manager
66
annotations:
77
include.release.openshift.io/ibm-cloud-managed: "true"
8-
include.release.openshift.io/hypershift: "true"
98
include.release.openshift.io/self-managed-high-availability: "true"
109
capability.openshift.io/name: "OperatorLifecycleManager"
10+
include.release.openshift.io/hypershift: "true"
1111
spec:
1212
maxUnavailable: 1
1313
selector:

‎manifests/0000_50_olm_00-subscriptions.crd.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.15.0
66
include.release.openshift.io/ibm-cloud-managed: "true"
7-
include.release.openshift.io/hypershift: "true"
87
include.release.openshift.io/self-managed-high-availability: "true"
98
capability.openshift.io/name: "OperatorLifecycleManager"
9+
include.release.openshift.io/hypershift: "true"
1010
name: subscriptions.operators.coreos.com
1111
spec:
1212
group: operators.coreos.com

‎manifests/0000_50_olm_01-olm-operator.serviceaccount.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@ metadata:
55
namespace: openshift-operator-lifecycle-manager
66
annotations:
77
include.release.openshift.io/ibm-cloud-managed: "true"
8-
include.release.openshift.io/hypershift: "true"
98
include.release.openshift.io/self-managed-high-availability: "true"
109
capability.openshift.io/name: "OperatorLifecycleManager"
10+
include.release.openshift.io/hypershift: "true"
1111
---
1212
apiVersion: rbac.authorization.k8s.io/v1
1313
kind: ClusterRole
1414
metadata:
1515
name: system:controller:operator-lifecycle-manager
1616
annotations:
1717
include.release.openshift.io/ibm-cloud-managed: "true"
18-
include.release.openshift.io/hypershift: "true"
1918
include.release.openshift.io/self-managed-high-availability: "true"
2019
capability.openshift.io/name: "OperatorLifecycleManager"
20+
include.release.openshift.io/hypershift: "true"
2121
rules:
2222
- apiGroups: ["*"]
2323
resources: ["*"]
@@ -40,9 +40,9 @@ metadata:
4040
name: olm-operator-binding-openshift-operator-lifecycle-manager
4141
annotations:
4242
include.release.openshift.io/ibm-cloud-managed: "true"
43-
include.release.openshift.io/hypershift: "true"
4443
include.release.openshift.io/self-managed-high-availability: "true"
4544
capability.openshift.io/name: "OperatorLifecycleManager"
45+
include.release.openshift.io/hypershift: "true"
4646
roleRef:
4747
apiGroup: rbac.authorization.k8s.io
4848
kind: ClusterRole

‎manifests/0000_50_olm_02-olmconfig.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ metadata:
55
annotations:
66
release.openshift.io/create-only: "true"
77
include.release.openshift.io/ibm-cloud-managed: "true"
8-
include.release.openshift.io/hypershift: "true"
98
include.release.openshift.io/self-managed-high-availability: "true"
109
capability.openshift.io/name: "OperatorLifecycleManager"
10+
include.release.openshift.io/hypershift: "true"

‎manifests/0000_50_olm_02-services.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ metadata:
66
annotations:
77
service.alpha.openshift.io/serving-cert-secret-name: olm-operator-serving-cert
88
include.release.openshift.io/ibm-cloud-managed: "true"
9-
include.release.openshift.io/hypershift: "true"
109
include.release.openshift.io/self-managed-high-availability: "true"
1110
capability.openshift.io/name: "OperatorLifecycleManager"
11+
include.release.openshift.io/hypershift: "true"
1212
labels:
1313
app: olm-operator
1414
spec:
@@ -29,9 +29,9 @@ metadata:
2929
annotations:
3030
service.alpha.openshift.io/serving-cert-secret-name: catalog-operator-serving-cert
3131
include.release.openshift.io/ibm-cloud-managed: "true"
32-
include.release.openshift.io/hypershift: "true"
3332
include.release.openshift.io/self-managed-high-availability: "true"
3433
capability.openshift.io/name: "OperatorLifecycleManager"
34+
include.release.openshift.io/hypershift: "true"
3535
labels:
3636
app: catalog-operator
3737
spec:

‎manifests/0000_50_olm_06-psm-operator.deployment.ibm-cloud-managed.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ metadata:
77
app: package-server-manager
88
annotations:
99
include.release.openshift.io/ibm-cloud-managed: "true"
10-
include.release.openshift.io/hypershift: "true"
1110
capability.openshift.io/name: "OperatorLifecycleManager"
1211
spec:
1312
strategy:

‎manifests/0000_50_olm_06-psm-operator.service.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ metadata:
55
include.release.openshift.io/self-managed-high-availability: "true"
66
service.alpha.openshift.io/serving-cert-secret-name: package-server-manager-serving-cert
77
include.release.openshift.io/ibm-cloud-managed: "true"
8-
include.release.openshift.io/hypershift: "true"
98
capability.openshift.io/name: "OperatorLifecycleManager"
109
name: package-server-manager-metrics
1110
namespace: openshift-operator-lifecycle-manager

‎manifests/0000_50_olm_06-psm-operator.servicemonitor.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ metadata:
66
annotations:
77
include.release.openshift.io/self-managed-high-availability: "true"
88
include.release.openshift.io/ibm-cloud-managed: "true"
9-
include.release.openshift.io/hypershift: "true"
109
capability.openshift.io/name: "OperatorLifecycleManager"
1110
spec:
1211
endpoints:

‎manifests/0000_50_olm_07-olm-operator.deployment.ibm-cloud-managed.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ metadata:
77
app: olm-operator
88
annotations:
99
include.release.openshift.io/ibm-cloud-managed: "true"
10-
include.release.openshift.io/hypershift: "true"
1110
capability.openshift.io/name: "OperatorLifecycleManager"
11+
include.release.openshift.io/hypershift: "true"
1212
spec:
1313
strategy:
1414
type: Recreate

‎manifests/0000_50_olm_08-catalog-operator.deployment.ibm-cloud-managed.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ metadata:
77
app: catalog-operator
88
annotations:
99
include.release.openshift.io/ibm-cloud-managed: "true"
10-
include.release.openshift.io/hypershift: "true"
1110
capability.openshift.io/name: "OperatorLifecycleManager"
11+
include.release.openshift.io/hypershift: "true"
1212
spec:
1313
strategy:
1414
type: Recreate

‎manifests/0000_50_olm_09-aggregated.clusterrole.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ metadata:
88
rbac.authorization.k8s.io/aggregate-to-edit: "true"
99
annotations:
1010
include.release.openshift.io/ibm-cloud-managed: "true"
11-
include.release.openshift.io/hypershift: "true"
1211
include.release.openshift.io/self-managed-high-availability: "true"
1312
capability.openshift.io/name: "OperatorLifecycleManager"
13+
include.release.openshift.io/hypershift: "true"
1414
rules:
1515
- apiGroups: ["operators.coreos.com"]
1616
resources: ["subscriptions"]
@@ -30,9 +30,9 @@ metadata:
3030
rbac.authorization.k8s.io/aggregate-to-view: "true"
3131
annotations:
3232
include.release.openshift.io/ibm-cloud-managed: "true"
33-
include.release.openshift.io/hypershift: "true"
3433
include.release.openshift.io/self-managed-high-availability: "true"
3534
capability.openshift.io/name: "OperatorLifecycleManager"
35+
include.release.openshift.io/hypershift: "true"
3636
rules:
3737
- apiGroups: ["operators.coreos.com"]
3838
resources: ["clusterserviceversions", "catalogsources", "installplans", "subscriptions", "operatorgroups"]

‎manifests/0000_50_olm_11-olm-operators.configmap.removed.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ metadata:
66
annotations:
77
release.openshift.io/delete: "true"
88
include.release.openshift.io/ibm-cloud-managed: "true"
9-
include.release.openshift.io/hypershift: "true"
109
include.release.openshift.io/self-managed-high-availability: "true"
1110
capability.openshift.io/name: "OperatorLifecycleManager"
11+
include.release.openshift.io/hypershift: "true"

‎manifests/0000_50_olm_12-olm-operators.catalogsource.removed.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ metadata:
66
annotations:
77
release.openshift.io/delete: "true"
88
include.release.openshift.io/ibm-cloud-managed: "true"
9-
include.release.openshift.io/hypershift: "true"
109
include.release.openshift.io/self-managed-high-availability: "true"
1110
capability.openshift.io/name: "OperatorLifecycleManager"
11+
include.release.openshift.io/hypershift: "true"

‎manifests/0000_50_olm_13-operatorgroup-default.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ metadata:
55
namespace: openshift-operators
66
annotations:
77
include.release.openshift.io/ibm-cloud-managed: "true"
8-
include.release.openshift.io/hypershift: "true"
98
include.release.openshift.io/self-managed-high-availability: "true"
109
capability.openshift.io/name: "OperatorLifecycleManager"
10+
include.release.openshift.io/hypershift: "true"
1111
---
1212
apiVersion: operators.coreos.com/v1
1313
kind: OperatorGroup
@@ -16,9 +16,9 @@ metadata:
1616
namespace: openshift-operator-lifecycle-manager
1717
annotations:
1818
include.release.openshift.io/ibm-cloud-managed: "true"
19-
include.release.openshift.io/hypershift: "true"
2019
include.release.openshift.io/self-managed-high-availability: "true"
2120
capability.openshift.io/name: "OperatorLifecycleManager"
21+
include.release.openshift.io/hypershift: "true"
2222
spec:
2323
targetNamespaces:
2424
- openshift-operator-lifecycle-manager

‎manifests/0000_50_olm_14-packageserver.subscription.removed.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ metadata:
66
annotations:
77
release.openshift.io/delete: "true"
88
include.release.openshift.io/ibm-cloud-managed: "true"
9-
include.release.openshift.io/hypershift: "true"
109
include.release.openshift.io/self-managed-high-availability: "true"
1110
capability.openshift.io/name: "OperatorLifecycleManager"
11+
include.release.openshift.io/hypershift: "true"

‎manifests/0000_50_olm_15-csv-viewer.rbac.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ metadata:
44
annotations:
55
rbac.authorization.kubernetes.io/autoupdate: "true"
66
include.release.openshift.io/ibm-cloud-managed: "true"
7-
include.release.openshift.io/hypershift: "true"
87
include.release.openshift.io/self-managed-high-availability: "true"
98
capability.openshift.io/name: "OperatorLifecycleManager"
9+
include.release.openshift.io/hypershift: "true"
1010
name: copied-csv-viewer
1111
namespace: openshift
1212
rules:
@@ -25,9 +25,9 @@ metadata:
2525
annotations:
2626
rbac.authorization.kubernetes.io/autoupdate: "true"
2727
include.release.openshift.io/ibm-cloud-managed: "true"
28-
include.release.openshift.io/hypershift: "true"
2928
include.release.openshift.io/self-managed-high-availability: "true"
3029
capability.openshift.io/name: "OperatorLifecycleManager"
30+
include.release.openshift.io/hypershift: "true"
3131
name: copied-csv-viewers
3232
namespace: openshift
3333
roleRef:

‎manifests/0000_50_olm_99-operatorstatus.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ metadata:
44
name: operator-lifecycle-manager
55
annotations:
66
include.release.openshift.io/ibm-cloud-managed: "true"
7-
include.release.openshift.io/hypershift: "true"
87
include.release.openshift.io/self-managed-high-availability: "true"
98
capability.openshift.io/name: "OperatorLifecycleManager"
9+
include.release.openshift.io/hypershift: "true"
1010
status:
1111
versions:
1212
- name: operator
@@ -23,9 +23,9 @@ metadata:
2323
name: operator-lifecycle-manager-catalog
2424
annotations:
2525
include.release.openshift.io/ibm-cloud-managed: "true"
26-
include.release.openshift.io/hypershift: "true"
2726
include.release.openshift.io/self-managed-high-availability: "true"
2827
capability.openshift.io/name: "OperatorLifecycleManager"
28+
include.release.openshift.io/hypershift: "true"
2929
status:
3030
versions:
3131
- name: operator
@@ -41,9 +41,9 @@ metadata:
4141
name: operator-lifecycle-manager-packageserver
4242
annotations:
4343
include.release.openshift.io/ibm-cloud-managed: "true"
44-
include.release.openshift.io/hypershift: "true"
4544
include.release.openshift.io/self-managed-high-availability: "true"
4645
capability.openshift.io/name: "OperatorLifecycleManager"
46+
include.release.openshift.io/hypershift: "true"
4747
status:
4848
versions:
4949
- name: operator

‎manifests/0000_90_olm_00-service-monitor.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ metadata:
55
namespace: openshift-operator-lifecycle-manager
66
annotations:
77
include.release.openshift.io/ibm-cloud-managed: "true"
8-
include.release.openshift.io/hypershift: "true"
98
include.release.openshift.io/self-managed-high-availability: "true"
109
capability.openshift.io/name: "OperatorLifecycleManager"
10+
include.release.openshift.io/hypershift: "true"
1111
rules:
1212
- apiGroups:
1313
- ""
@@ -27,9 +27,9 @@ metadata:
2727
namespace: openshift-operator-lifecycle-manager
2828
annotations:
2929
include.release.openshift.io/ibm-cloud-managed: "true"
30-
include.release.openshift.io/hypershift: "true"
3130
include.release.openshift.io/self-managed-high-availability: "true"
3231
capability.openshift.io/name: "OperatorLifecycleManager"
32+
include.release.openshift.io/hypershift: "true"
3333
roleRef:
3434
apiGroup: rbac.authorization.k8s.io
3535
kind: Role
@@ -48,9 +48,9 @@ metadata:
4848
app: olm-operator
4949
annotations:
5050
include.release.openshift.io/ibm-cloud-managed: "true"
51-
include.release.openshift.io/hypershift: "true"
5251
include.release.openshift.io/self-managed-high-availability: "true"
5352
capability.openshift.io/name: "OperatorLifecycleManager"
53+
include.release.openshift.io/hypershift: "true"
5454
spec:
5555
endpoints:
5656
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
@@ -82,9 +82,9 @@ metadata:
8282
app: catalog-operator
8383
annotations:
8484
include.release.openshift.io/ibm-cloud-managed: "true"
85-
include.release.openshift.io/hypershift: "true"
8685
include.release.openshift.io/self-managed-high-availability: "true"
8786
capability.openshift.io/name: "OperatorLifecycleManager"
87+
include.release.openshift.io/hypershift: "true"
8888
spec:
8989
endpoints:
9090
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token

0 commit comments

Comments
 (0)