Skip to content

config,manifests: Update the annotations used in the CVO manifests #54

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
Sep 9, 2022
Merged

config,manifests: Update the annotations used in the CVO manifests #54

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
7 changes: 2 additions & 5 deletions config/aggregatedclusteroperator/aggregated_clusteroperator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@ apiVersion: config.openshift.io/v1
kind: ClusterOperator
metadata:
name: aggregated
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
spec: {}
status:
versions:
- name: operator
version: "0.0.1-snapshot"
- name: operator
version: "0.0.1-snapshot"
3 changes: 2 additions & 1 deletion config/default/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ namePrefix: platform-operators-

# Annotations to add to all resources.
commonAnnotations:
release.openshift.io/feature-set: TechPreviewNoUpgrade
release.openshift.io/feature-set: "TechPreviewNoUpgrade"
include.release.openshift.io/self-managed-high-availability: "true"
exclude.release.openshift.io/internal-openshift-hosted: "true"

images:
- name: quay.io/brancz/kube-rbac-proxy
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_50_cluster-platform-operator-manager_00-namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: v1
kind: Namespace
metadata:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
Copy link
Contributor

@tylerslaton tylerslaton Sep 9, 2022

Choose a reason for hiding this comment

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

Should these have quotes around them now that you added it to the common annotations?

Copy link
Contributor Author

@timflannagan timflannagan Sep 9, 2022

Choose a reason for hiding this comment

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

Oh that's weird that it didn't propagate to the generated manifests. I think we're fine here though given it's a no-op and we've seen successfully CI runs in #23.

labels:
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_50_cluster-platform-operator-manager_00-rukpak-bundledeployments.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.9.0
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
creationTimestamp: null
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_50_cluster-platform-operator-manager_00-rukpak-bundles.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.9.0
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
creationTimestamp: null
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_50_cluster-platform-operator-manager_01-core-ca.cm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ data: {}
kind: ConfigMap
metadata:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
service.beta.openshift.io/inject-cabundle: "true"
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_50_cluster-platform-operator-manager_01-rukpak-core-admin.sa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: v1
kind: ServiceAccount
metadata:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
name: platform-operators-rukpak-core-admin
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_50_cluster-platform-operator-manager_01-rukpak-webhooks-admin.sa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: v1
kind: ServiceAccount
metadata:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
name: platform-operators-rukpak-webhooks-admin
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_50_cluster-platform-operator-manager_01-serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: v1
kind: ServiceAccount
metadata:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
name: platform-operators-controller-manager
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_50_cluster-platform-operator-manager_01-webhook-ca.cm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ data: {}
kind: ConfigMap
metadata:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
service.beta.openshift.io/inject-cabundle: "true"
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_50_cluster-platform-operator-manager_02-metricsservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: v1
kind: Service
metadata:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
labels:
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_50_cluster-platform-operator-manager_02-rukpak-core.service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: v1
kind: Service
metadata:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
service.beta.openshift.io/serving-cert-secret-name: platform-operators-rukpak-core-tls
Expand Down
1 change: 1 addition & 0 deletions manifests/0000_50_cluster-platform-operator-manager_02-rukpak-webhook.service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: v1
kind: Service
metadata:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
service.beta.openshift.io/serving-cert-secret-name: platform-operators-rukpak-webhook-tls
Expand Down
11 changes: 11 additions & 0 deletions manifests/0000_50_cluster-platform-operator-manager_03_rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
creationTimestamp: null
Expand Down Expand Up @@ -85,6 +86,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
name: platform-operators-metrics-reader
Expand All @@ -98,6 +100,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
name: platform-operators-proxy-role
Expand All @@ -119,6 +122,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
name: platform-operators-manager-rolebinding
Expand All @@ -135,6 +139,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
name: platform-operators-proxy-rolebinding
Expand All @@ -151,6 +156,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
name: platform-operators-leader-election-role
Expand Down Expand Up @@ -192,6 +198,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
name: platform-operators-leader-election-rolebinding
Expand All @@ -209,6 +216,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
name: platform-operators-rukpak-bundle-reader
Expand All @@ -222,6 +230,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
name: platform-operators-rukpak-bundle-uploader
Expand All @@ -235,6 +244,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
creationTimestamp: null
Expand Down Expand Up @@ -328,6 +338,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
name: platform-operators-rukpak-core-admin
Expand Down
2 changes: 2 additions & 0 deletions manifests/0000_50_cluster-platform-operator-manager_04-rukpak-core.deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
labels:
Expand All @@ -16,6 +17,7 @@ spec:
template:
metadata:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
kubectl.kubernetes.io/default-container: manager
release.openshift.io/feature-set: TechPreviewNoUpgrade
Expand Down
2 changes: 2 additions & 0 deletions manifests/0000_50_cluster-platform-operator-manager_04-rukpak-webhooks.deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
labels:
Expand All @@ -19,6 +20,7 @@ spec:
template:
metadata:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
labels:
Expand Down
1 change: 1 addition & 0 deletions ...0000_50_cluster-platform-operator-manager_05-rukpak.validating-webhook-configuration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: admissionregistration.k8s.io/v1
kind: ValidatingWebhookConfiguration
metadata:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
service.beta.openshift.io/inject-cabundle: "true"
Expand Down
2 changes: 2 additions & 0 deletions manifests/0000_50_cluster-platform-operator-manager_06-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
labels:
Expand All @@ -16,6 +17,7 @@ spec:
template:
metadata:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
kubectl.kubernetes.io/default-container: manager
release.openshift.io/feature-set: TechPreviewNoUpgrade
Expand Down
2 changes: 1 addition & 1 deletion manifests/0000_50_cluster-platform-operator-manager_07-aggregated-clusteroperator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: config.openshift.io/v1
kind: ClusterOperator
metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
name: platform-operators-aggregated
Expand Down