Skip to content

Commit 7c6e822

Browse files
authored
Drop requirement for project ID field in cloud credentials (#464)
* Drop requirement for project_id field in cloud credentials * Remove project_id field in CI tests * Remove Tyler from CI code owners
1 parent 8639ddb commit 7c6e822

File tree

4 files changed

+0
-12
lines changed

4 files changed

+0
-12
lines changed

.github/values/arcus/base.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
clouds:
22
arcus:
3-
auth:
4-
project_id: f0dc9cb312144d0aa44037c9149d2513
53
verify: false
64

75
clusterNetworking:

.github/values/leafcloud/base.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
clouds:
22
leafcloud:
3-
auth:
4-
project_id: f39848421b2747148400ad8eeae8d536
53
verify: false
64

75
clusterNetworking:

charts/openstack-cluster/README.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,16 +108,11 @@ For ease of use, this chart is written so that a `clouds.yaml` file can be given
108108
to the chart as a configuration file. When an application credential is created in Horizon,
109109
the corresponding `clouds.yaml` file can be downloaded, and should look something like this:
110110

111-
> [!WARNING]
112-
> The Cluster API OpenStack provider currently requires that the `project_id` is present,
113-
> which you will need to add manually.
114-
115111
```yaml
116112
clouds:
117113
openstack:
118114
auth:
119115
auth_url: https://my.cloud:5000
120-
project_id: "<project id>"
121116
application_credential_id: "<app cred id>"
122117
application_credential_secret: "<app cred secret>"
123118
region_name: "RegionOne"

charts/openstack-cluster/templates/secret-cloud-config.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
{{- if not .Values.cloudCredentialsSecretName }}
22
{{- if .Values.clouds }}
33
{{- $cloud := index .Values.clouds .Values.cloudName }}
4-
{{- if not (dig "auth" "project_id" nil $cloud) }}
5-
{{- fail "clouds.yaml must contain the project ID" }}
6-
{{- end }}
74
---
85
apiVersion: v1
96
kind: Secret

0 commit comments

Comments
 (0)