Skip to content

update to release.openshift.io/feature-set to match OCP 4.12 #45

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

update to release.openshift.io/feature-set to match OCP 4.12 #45

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
1589db4
update to release.openshift.io/feature-set to match OCP 4.12
deads2k Sep 8, 2022
e4a9959
update the openshift/api dependency for updated annotation names
deads2k Sep 8, 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 config/default/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namePrefix: platform-operators-

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

images:
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/blang/semver/v4 v4.0.0
github.com/onsi/ginkgo/v2 v2.1.4
github.com/onsi/gomega v1.19.0
github.com/openshift/api v0.0.0-20220831185921-0ee1471bcabb
github.com/openshift/api v0.0.0-20220908185739-e518ece6c293
github.com/operator-framework/api v0.15.0
github.com/operator-framework/operator-registry v1.22.1
github.com/operator-framework/rukpak v0.9.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,8 +412,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw=
github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
github.com/openshift/api v0.0.0-20220831185921-0ee1471bcabb h1:/tun/ZD0MtypwIYvZMxwupWQwVyYgQhFi1FKeZf85ms=
github.com/openshift/api v0.0.0-20220831185921-0ee1471bcabb/go.mod h1:9JWn+H7X8wEPPc9D63krigXl8r3F1Mt6/lC98brUyhQ=
github.com/openshift/api v0.0.0-20220908185739-e518ece6c293 h1:oqCGwpNsLTz5gXnjWK2COXkCxI5HdRwY/Aiq+P0RVdk=
github.com/openshift/api v0.0.0-20220908185739-e518ece6c293/go.mod h1:9JWn+H7X8wEPPc9D63krigXl8r3F1Mt6/lC98brUyhQ=
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
github.com/operator-framework/api v0.15.0 h1:4f9i0drtqHj7ykLoHxv92GR43S7MmQHhmFQkfm5YaGI=
github.com/operator-framework/api v0.15.0/go.mod h1:scnY9xqSeCsOdtJtNoHIXd7OtHZ14gj1hkDA4+DlgLY=
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -3,7 +3,7 @@ kind: Namespace
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-gate: TechPreviewNoUpgrade
release.openshift.io/feature-set: TechPreviewNoUpgrade
labels:
control-plane: controller-manager
pod-security.kubernetes.io/enforce: baseline
Expand Down
4 changes: 2 additions & 2 deletions manifests/0000_50_cluster-platform-operator-manager_00-platformoperator.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
release.openshift.io/feature-gate: TechPreviewNoUpgrade
release.openshift.io/feature-set: TechPreviewNoUpgrade
api-approved.openshift.io: https://github.com/openshift/api/pull/1234
include.release.openshift.io/self-managed-high-availability: "true"
creationTimestamp: null
Expand Down Expand Up @@ -66,7 +66,7 @@ spec:
description: conditions represent the latest available observations of a platform operator's current state.
type: array
items:
description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, \n \ttype FooStatus struct{ \t // Represents the observations of a foo's current state. \t // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" \t // +patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map \t // +listMapKey=type \t Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields \t}"
description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, \n type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
type: object
required:
- lastTransitionTime
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -4,7 +4,7 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.9.0
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-gate: TechPreviewNoUpgrade
release.openshift.io/feature-set: TechPreviewNoUpgrade
creationTimestamp: null
name: bundledeployments.core.rukpak.io
spec:
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -4,7 +4,7 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.9.0
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-gate: TechPreviewNoUpgrade
release.openshift.io/feature-set: TechPreviewNoUpgrade
creationTimestamp: null
name: bundles.core.rukpak.io
spec:
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -4,7 +4,7 @@ kind: ConfigMap
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-gate: TechPreviewNoUpgrade
release.openshift.io/feature-set: TechPreviewNoUpgrade
service.beta.openshift.io/inject-cabundle: "true"
name: platform-operators-rukpak-core-tls
namespace: openshift-platform-operators
2 changes: 1 addition & 1 deletion 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 @@ -3,6 +3,6 @@ kind: ServiceAccount
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-gate: TechPreviewNoUpgrade
release.openshift.io/feature-set: TechPreviewNoUpgrade
name: platform-operators-rukpak-core-admin
namespace: openshift-platform-operators
2 changes: 1 addition & 1 deletion 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 @@ -3,6 +3,6 @@ kind: ServiceAccount
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-gate: TechPreviewNoUpgrade
release.openshift.io/feature-set: TechPreviewNoUpgrade
name: platform-operators-rukpak-webhooks-admin
namespace: openshift-platform-operators
2 changes: 1 addition & 1 deletion 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 @@ -3,6 +3,6 @@ kind: ServiceAccount
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-gate: TechPreviewNoUpgrade
release.openshift.io/feature-set: TechPreviewNoUpgrade
name: platform-operators-controller-manager
namespace: openshift-platform-operators
2 changes: 1 addition & 1 deletion 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 @@ -4,7 +4,7 @@ kind: ConfigMap
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-gate: TechPreviewNoUpgrade
release.openshift.io/feature-set: TechPreviewNoUpgrade
service.beta.openshift.io/inject-cabundle: "true"
name: platform-operators-rukpak-webhook-tls
namespace: openshift-platform-operators
2 changes: 1 addition & 1 deletion 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 @@ -3,7 +3,7 @@ kind: Service
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-gate: TechPreviewNoUpgrade
release.openshift.io/feature-set: TechPreviewNoUpgrade
labels:
control-plane: controller-manager
name: platform-operators-controller-manager-metrics-service
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -3,7 +3,7 @@ kind: Service
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-gate: TechPreviewNoUpgrade
release.openshift.io/feature-set: TechPreviewNoUpgrade
service.beta.openshift.io/serving-cert-secret-name: platform-operators-rukpak-core-tls
name: platform-operators-rukpak-core
namespace: openshift-platform-operators
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -3,7 +3,7 @@ kind: Service
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-gate: TechPreviewNoUpgrade
release.openshift.io/feature-set: TechPreviewNoUpgrade
service.beta.openshift.io/serving-cert-secret-name: platform-operators-rukpak-webhook-tls
name: platform-operators-rukpak-webhook-service
namespace: openshift-platform-operators
Expand Down
22 changes: 11 additions & 11 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 @@ -3,7 +3,7 @@ kind: ClusterRole
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-gate: TechPreviewNoUpgrade
release.openshift.io/feature-set: TechPreviewNoUpgrade
creationTimestamp: null
name: platform-operators-manager-role
rules:
Expand Down Expand Up @@ -86,7 +86,7 @@ kind: ClusterRole
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-gate: TechPreviewNoUpgrade
release.openshift.io/feature-set: TechPreviewNoUpgrade
name: platform-operators-metrics-reader
rules:
- nonResourceURLs:
Expand All @@ -99,7 +99,7 @@ kind: ClusterRole
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-gate: TechPreviewNoUpgrade
release.openshift.io/feature-set: TechPreviewNoUpgrade
name: platform-operators-proxy-role
rules:
- apiGroups:
Expand All @@ -120,7 +120,7 @@ kind: ClusterRoleBinding
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-gate: TechPreviewNoUpgrade
release.openshift.io/feature-set: TechPreviewNoUpgrade
name: platform-operators-manager-rolebinding
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand All @@ -136,7 +136,7 @@ kind: ClusterRoleBinding
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-gate: TechPreviewNoUpgrade
release.openshift.io/feature-set: TechPreviewNoUpgrade
name: platform-operators-proxy-rolebinding
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand All @@ -152,7 +152,7 @@ kind: Role
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-gate: TechPreviewNoUpgrade
release.openshift.io/feature-set: TechPreviewNoUpgrade
name: platform-operators-leader-election-role
namespace: openshift-platform-operators
rules:
Expand Down Expand Up @@ -193,7 +193,7 @@ kind: RoleBinding
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-gate: TechPreviewNoUpgrade
release.openshift.io/feature-set: TechPreviewNoUpgrade
name: platform-operators-leader-election-rolebinding
namespace: openshift-platform-operators
roleRef:
Expand All @@ -210,7 +210,7 @@ kind: ClusterRole
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-gate: TechPreviewNoUpgrade
release.openshift.io/feature-set: TechPreviewNoUpgrade
name: platform-operators-rukpak-bundle-reader
rules:
- nonResourceURLs:
Expand All @@ -223,7 +223,7 @@ kind: ClusterRole
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-gate: TechPreviewNoUpgrade
release.openshift.io/feature-set: TechPreviewNoUpgrade
name: platform-operators-rukpak-bundle-uploader
rules:
- nonResourceURLs:
Expand All @@ -236,7 +236,7 @@ kind: ClusterRole
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-gate: TechPreviewNoUpgrade
release.openshift.io/feature-set: TechPreviewNoUpgrade
creationTimestamp: null
name: platform-operators-rukpak-core-admin
rules:
Expand Down Expand Up @@ -329,7 +329,7 @@ kind: ClusterRoleBinding
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-gate: TechPreviewNoUpgrade
release.openshift.io/feature-set: TechPreviewNoUpgrade
name: platform-operators-rukpak-core-admin
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
4 changes: 2 additions & 2 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 @@ -3,7 +3,7 @@ kind: Deployment
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-gate: TechPreviewNoUpgrade
release.openshift.io/feature-set: TechPreviewNoUpgrade
labels:
app: core
name: platform-operators-rukpak-core
Expand All @@ -18,7 +18,7 @@ spec:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
kubectl.kubernetes.io/default-container: manager
release.openshift.io/feature-gate: TechPreviewNoUpgrade
release.openshift.io/feature-set: TechPreviewNoUpgrade
labels:
app: core
spec:
Expand Down
4 changes: 2 additions & 2 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 @@ -3,7 +3,7 @@ kind: Deployment
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-gate: TechPreviewNoUpgrade
release.openshift.io/feature-set: TechPreviewNoUpgrade
labels:
app: webhooks
name: platform-operators-rukpak-webhooks
Expand All @@ -20,7 +20,7 @@ spec:
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-gate: TechPreviewNoUpgrade
release.openshift.io/feature-set: TechPreviewNoUpgrade
labels:
app: webhooks
spec:
Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -3,7 +3,7 @@ kind: ValidatingWebhookConfiguration
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-gate: TechPreviewNoUpgrade
release.openshift.io/feature-set: TechPreviewNoUpgrade
service.beta.openshift.io/inject-cabundle: "true"
name: platform-operators-rukpak-validating-webhook-configuration
webhooks:
Expand Down
4 changes: 2 additions & 2 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 @@ -3,7 +3,7 @@ kind: Deployment
metadata:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-gate: TechPreviewNoUpgrade
release.openshift.io/feature-set: TechPreviewNoUpgrade
labels:
control-plane: controller-manager
name: platform-operators-controller-manager
Expand All @@ -18,7 +18,7 @@ spec:
annotations:
include.release.openshift.io/self-managed-high-availability: "true"
kubectl.kubernetes.io/default-container: manager
release.openshift.io/feature-gate: TechPreviewNoUpgrade
release.openshift.io/feature-set: TechPreviewNoUpgrade
labels:
control-plane: controller-manager
spec:
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 @@ -4,7 +4,7 @@ metadata:
annotations:
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
release.openshift.io/feature-gate: TechPreviewNoUpgrade
release.openshift.io/feature-set: TechPreviewNoUpgrade
name: platform-operators-aggregated
namespace: openshift-platform-operators
Copy link
Member

@wking wking Sep 9, 2022

Choose a reason for hiding this comment

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

ClusterOperator are cluster-scoped resources, so this line is not necessary.

spec: {}
Expand Down
2 changes: 1 addition & 1 deletion ...b.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/openshift/api/config/v1/0000_03_config-operator_01_proxy.crd.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading