Skip to content

Commit 4e7fd29

Browse files
wkingmdbooth
authored andcommitted
openshift/manifests: CloudCredential capability for CredentialsRequest
openshift/machine-api-operator@9c20871740 (annotate cloud credentials request, 2023-11-14, openshift/machine-api-operator#1174) added this capability to the machine-API analog of this manifest. And openshift/cluster-capi-operator@e305541274 (annotate credentials request manifests, 2023-11-13, openshift/cluster-capi-operator#143) annotated some cluster-API CredentialsRequests used for other providers. This commit catches cluster-API OpenStack up with those other changes. There is a risk that tech-preview clusters updating into this change will have the CloudCredential capability implicitly enabled. But because TechPreviewNoUpgrade blocks minor updates, and we don't intend to backport this to 4.14.z, that exposure is confined to unsuported prerelease clusters.
1 parent e6d3cb9 commit 4e7fd29

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

openshift/kustomize/credentials-request/credentials-request.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ kind: CredentialsRequest
33
metadata:
44
name: openshift-cluster-api-openstack
55
namespace: openshift-cloud-credential-operator
6+
annotations:
7+
capability.openshift.io/name: CloudCredential
68
spec:
79
providerSpec:
810
apiVersion: cloudcredential.openshift.io/v1

openshift/manifests/0000_30_cluster-api-provider-openstack_00_credentials-request.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: cloudcredential.openshift.io/v1
22
kind: CredentialsRequest
33
metadata:
44
annotations:
5+
capability.openshift.io/name: CloudCredential
56
exclude.release.openshift.io/internal-openshift-hosted: "true"
67
include.release.openshift.io/self-managed-high-availability: "true"
78
release.openshift.io/feature-set: TechPreviewNoUpgrade

0 commit comments

Comments
 (0)