Skip to content

Commit

Permalink
openshift/manifests: CloudCredential capability for CredentialsRequest
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
wking authored and openshift-cherrypick-robot committed Jan 4, 2024
1 parent b73ba5b commit 1e1c56c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
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
Expand Up @@ -2,6 +2,7 @@ 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"
release.openshift.io/feature-set: TechPreviewNoUpgrade
Expand Down

0 comments on commit 1e1c56c

Please sign in to comment.