Skip to content
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

Jump to bottom

OCPBUGS-26027: openshift/manifests: CloudCredential capability for CredentialsRequest #294

Merged
merged 2 commits into from
Jan 4, 2024
Merged

OCPBUGS-26027: openshift/manifests: CloudCredential capability for CredentialsRequest #294

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
ae99eef
openshift/manifests: Drop single-node-developer profile
wking Jan 3, 2024
d5a54c1
openshift/manifests: CloudCredential capability for CredentialsRequest
wking Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion openshift/kustomize/components/common/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ resources:
commonAnnotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"

patches:
# Common configuration for CAPI controller workloads
Expand Down
2 changes: 2 additions & 0 deletions openshift/kustomize/credentials-request/credentials-request.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ kind: CredentialsRequest
metadata:
name: openshift-cluster-api-openstack
namespace: openshift-cloud-credential-operator
annotations:
capability.openshift.io/name: CloudCredential
spec:
providerSpec:
apiVersion: cloudcredential.openshift.io/v1
Expand Down
2 changes: 1 addition & 1 deletion openshift/manifests/0000_30_cluster-api-provider-openstack_00_credentials-request.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ apiVersion: cloudcredential.openshift.io/v1
kind: CredentialsRequest
metadata:
annotations:
capability.openshift.io/name: CloudCredential
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
name: openshift-cluster-api-openstack
namespace: openshift-cloud-credential-operator
Expand Down
25 changes: 0 additions & 25 deletions openshift/manifests/0000_30_cluster-api-provider-openstack_04_infrastructure-components.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ data:
controller-gen.kubebuilder.io/version: v0.13.0
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
service.beta.openshift.io/inject-cabundle: "true"
labels:
Expand Down Expand Up @@ -4724,7 +4723,6 @@ data:
controller-gen.kubebuilder.io/version: v0.13.0
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
service.beta.openshift.io/inject-cabundle: "true"
labels:
Expand Down Expand Up @@ -6977,7 +6975,6 @@ data:
controller-gen.kubebuilder.io/version: v0.13.0
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
service.beta.openshift.io/inject-cabundle: "true"
labels:
Expand Down Expand Up @@ -8610,7 +8607,6 @@ data:
controller-gen.kubebuilder.io/version: v0.13.0
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
service.beta.openshift.io/inject-cabundle: "true"
labels:
Expand Down Expand Up @@ -9965,7 +9961,6 @@ data:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
labels:
cluster.x-k8s.io/provider: infrastructure-openstack
Expand All @@ -9978,7 +9973,6 @@ data:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
labels:
cluster.x-k8s.io/provider: infrastructure-openstack
Expand All @@ -9991,7 +9985,6 @@ data:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
labels:
cluster.x-k8s.io/provider: infrastructure-openstack
Expand Down Expand Up @@ -10033,7 +10026,6 @@ data:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
labels:
cluster.x-k8s.io/provider: infrastructure-openstack
Expand Down Expand Up @@ -10085,7 +10077,6 @@ data:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
labels:
cluster.x-k8s.io/provider: infrastructure-openstack
Expand All @@ -10107,7 +10098,6 @@ data:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
labels:
cluster.x-k8s.io/provider: infrastructure-openstack
Expand Down Expand Up @@ -10151,7 +10141,6 @@ data:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
labels:
cluster.x-k8s.io/provider: infrastructure-openstack
Expand Down Expand Up @@ -10241,7 +10230,6 @@ data:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
labels:
cluster.x-k8s.io/provider: infrastructure-openstack
Expand All @@ -10262,7 +10250,6 @@ data:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
labels:
cluster.x-k8s.io/provider: infrastructure-openstack
Expand All @@ -10283,7 +10270,6 @@ data:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
labels:
cluster.x-k8s.io/provider: infrastructure-openstack
Expand All @@ -10304,7 +10290,6 @@ data:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
labels:
cluster.x-k8s.io/provider: infrastructure-openstack
Expand All @@ -10325,7 +10310,6 @@ data:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
labels:
cluster.x-k8s.io/provider: infrastructure-openstack
Expand All @@ -10345,7 +10329,6 @@ data:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
labels:
cluster.x-k8s.io/provider: infrastructure-openstack
Expand All @@ -10365,7 +10348,6 @@ data:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
service.beta.openshift.io/serving-cert-secret-name: capo-webhook-service-cert
labels:
Expand All @@ -10385,7 +10367,6 @@ data:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
labels:
cluster.x-k8s.io/provider: infrastructure-openstack
Expand All @@ -10403,7 +10384,6 @@ data:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
labels:
Expand Down Expand Up @@ -10475,7 +10455,6 @@ data:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
labels:
cluster.x-k8s.io/provider: infrastructure-openstack
Expand All @@ -10493,7 +10472,6 @@ data:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
labels:
Expand Down Expand Up @@ -10553,7 +10531,6 @@ data:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
service.beta.openshift.io/inject-cabundle: "true"
labels:
Expand Down Expand Up @@ -10630,7 +10607,6 @@ data:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
service.beta.openshift.io/inject-cabundle: "true"
labels:
Expand Down Expand Up @@ -10726,7 +10702,6 @@ metadata:
annotations:
exclude.release.openshift.io/internal-openshift-hosted: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
release.openshift.io/feature-set: TechPreviewNoUpgrade
labels:
provider.cluster.x-k8s.io/name: openstack
Expand Down