Skip to content

Commit bf4801b

Browse files
Revert "Remove dockerhub credential secret"
This reverts commit 27f84fd.
1 parent abb19e5 commit bf4801b

File tree

6 files changed

+51
-3
lines changed

6 files changed

+51
-3
lines changed

examples/capi-quick-start/nutanix-cluster-calico-crs.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
apiVersion: v1
22
kind: Secret
3+
metadata:
4+
labels:
5+
cluster.x-k8s.io/provider: nutanix
6+
name: ${CLUSTER_NAME}-dockerhub-credentials
7+
stringData:
8+
password: ${DOCKER_HUB_PASSWORD}
9+
username: ${DOCKER_HUB_USERNAME}
10+
type: Opaque
11+
---
12+
apiVersion: v1
13+
kind: Secret
314
metadata:
415
labels:
516
cluster.x-k8s.io/provider: nutanix

examples/capi-quick-start/nutanix-cluster-calico-helm-addon.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
apiVersion: v1
22
kind: Secret
3+
metadata:
4+
labels:
5+
cluster.x-k8s.io/provider: nutanix
6+
name: ${CLUSTER_NAME}-dockerhub-credentials
7+
stringData:
8+
password: ${DOCKER_HUB_PASSWORD}
9+
username: ${DOCKER_HUB_USERNAME}
10+
type: Opaque
11+
---
12+
apiVersion: v1
13+
kind: Secret
314
metadata:
415
labels:
516
cluster.x-k8s.io/provider: nutanix

examples/capi-quick-start/nutanix-cluster-cilium-crs.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
apiVersion: v1
22
kind: Secret
3+
metadata:
4+
labels:
5+
cluster.x-k8s.io/provider: nutanix
6+
name: ${CLUSTER_NAME}-dockerhub-credentials
7+
stringData:
8+
password: ${DOCKER_HUB_PASSWORD}
9+
username: ${DOCKER_HUB_USERNAME}
10+
type: Opaque
11+
---
12+
apiVersion: v1
13+
kind: Secret
314
metadata:
415
labels:
516
cluster.x-k8s.io/provider: nutanix

examples/capi-quick-start/nutanix-cluster-cilium-helm-addon.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
apiVersion: v1
22
kind: Secret
3+
metadata:
4+
labels:
5+
cluster.x-k8s.io/provider: nutanix
6+
name: ${CLUSTER_NAME}-dockerhub-credentials
7+
stringData:
8+
password: ${DOCKER_HUB_PASSWORD}
9+
username: ${DOCKER_HUB_USERNAME}
10+
type: Opaque
11+
---
12+
apiVersion: v1
13+
kind: Secret
314
metadata:
415
labels:
516
cluster.x-k8s.io/provider: nutanix

hack/examples/bases/nutanix/cluster/kustomization.yaml.tmpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
55
kind: Kustomization
66

77
resources:
8+
- ../../../additional-resources/dockerhub-secret.yaml
89
- ../../../additional-resources/nutanix/csi-secret.yaml
910
- https://github.com/nutanix-cloud-native/cluster-api-provider-nutanix/releases/download/${CAPX_VERSION}/cluster-template-topology.yaml
1011

test/e2e/config/caren.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,15 +188,15 @@ variables:
188188
# IP/FQDN of Prism Central.
189189
# NOTE: This has to be overridden by specifying the env var NUTANIX_ENDPOINT when running the e2e tests. It is
190190
# set as empty here to enable running the e2e tests for non-nutanix providers locally without setting the env var.
191-
# NUTANIX_ENDPOINT: ""
191+
NUTANIX_ENDPOINT: ""
192192
# # Port of Prism Central. Default: 9440
193193
# NUTANIX_PORT: 9440
194194
# # Disable Prism Central certificate checking. Default: false
195195
# NUTANIX_INSECURE: false
196196
# # Prism Central user
197-
# NUTANIX_USER: ""
197+
NUTANIX_USER: ""
198198
# # Prism Central password
199-
# NUTANIX_PASSWORD: ""
199+
NUTANIX_PASSWORD: ""
200200
# # Host IP to be assigned to the CAPX Kubernetes cluster.
201201
# CONTROL_PLANE_ENDPOINT_IP: ""
202202
# # Port of the CAPX Kubernetes cluster. Default: 6443
@@ -209,6 +209,9 @@ variables:
209209
# NUTANIX_SUBNET_NAME: ""
210210
# # Name of the storage container to CSI driver
211211
# NUTANIX_STORAGE_CONTAINER_NAME: ""
212+
# # Username/Password of dockerhub account to avoid download rate limiting
213+
# DOCKER_HUB_USERNAME: ""
214+
# DOCKER_HUB_PASSWORD: ""
212215

213216
intervals:
214217
default/wait-controllers: ["3m", "10s"]

0 commit comments

Comments
 (0)