Skip to content

Commit cbab4ee

Browse files
committed
K8S-536 enable registry-creds addon
1 parent 5a963a9 commit cbab4ee

File tree

3 files changed

+56
-2
lines changed

3 files changed

+56
-2
lines changed

addons/registry-creds/registry-creds-system.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ apiVersion: apiextensions.k8s.io/v1
99
kind: CustomResourceDefinition
1010
metadata:
1111
annotations:
12-
controller-gen.kubebuilder.io/version: v0.2.5
12+
controller-gen.kubebuilder.io/version: v0.2.6
1313
creationTimestamp: null
1414
name: clusterpullsecrets.ops.alexellis.io
1515
spec:
@@ -48,6 +48,11 @@ spec:
4848
description: ClusterPullSecretSpec defines the desired state of ClusterPullSecret
4949
properties:
5050
secretRef:
51+
properties:
52+
name:
53+
type: string
54+
namespace:
55+
type: string
5156
type: object
5257
type: object
5358
status:

manifest.jps

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -899,6 +899,55 @@ addons:
899899

900900
Enter [Rancher dashboard](${env.url}), and set your login credentials there.
901901

902+
- id: regcreds-k8s-addon
903+
type: update
904+
permanent: true
905+
baseUrl: https://raw.githubusercontent.com/jelastic-jps/kubernetes/v1.20.6
906+
name: DockerHub Registry Credentials
907+
description: |
908+
Leverage DockerHub images pull rate limits: assign DockerHub user credentials to Kubernetes deployments cluster-wide
909+
logo: /images/k8s-regcreds.png
910+
settings:
911+
fields:
912+
- type: displayfield
913+
hideLabel: true
914+
markup: Please specify DockerHub user's valid credentials in the fields below. All previously stored DockerHub user credentials (if any) will be overwritten!
915+
- type: displayfield
916+
hideLabel: true
917+
- type: string
918+
required: true
919+
regex: "^((?!\\s).)*$"
920+
regexText: Incorrect username
921+
caption: Username
922+
name: creds_username
923+
- type: string
924+
required: true
925+
inputType: password
926+
caption: Password
927+
name: creds_password
928+
- type: string
929+
required: true
930+
vtype: email
931+
caption: E-mail
932+
name: creds_email
933+
buttons:
934+
- caption: DockerHub Credentials
935+
settings: regcreds
936+
action: addon-regcreds-config
937+
loadingText: Setting up...
938+
successText: DockerHub registry user credentials have been successfully set!
939+
940+
actions:
941+
addon-regcreds-config:
942+
- cmd[${nodes.k8sm.master.id}]: |-
943+
kubectl -n registry-creds-system delete pods -l control-plane=registry-creds-controller
944+
kubectl apply -f ${baseUrl}/addons/registry-creds/registry-creds-system.yaml
945+
wait-deployment.sh registry-creds-registry-creds-controller registry-creds-system 1 600
946+
kubectl delete -f ${baseUrl}/addons/registry-creds/dockerhub-secret.yaml
947+
kubectl -n kube-system delete secret dockerhub-credentials-secret
948+
kubectl -n kube-system create secret docker-registry dockerhub-credentials-secret --docker-username='${settings.creds_username}' --docker-password='${settings.creds_password}' --docker-email='${settings.creds_email}'
949+
kubectl apply -f ${baseUrl}/addons/registry-creds/dockerhub-secret.yaml
950+
902951
success: |
903952
${globals.default_success:}
904953
${globals.monitoring_success:}

scripts/beforeinstall.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ var resp = {
1313
scalingMode: "stateless",
1414
nodeGroup: "k8sm",
1515
isRedeploySupport: false,
16-
addons: ["conf-k8s-addon", "upgrade-k8s-addon", "monitor-k8s-addon", "certman-k8s-addon", "rancher-k8s-addon"],
16+
addons: ["conf-k8s-addon", "upgrade-k8s-addon", "monitor-k8s-addon", "certman-k8s-addon", "rancher-k8s-addon", "regcreds-k8s-addon"],
1717
displayName: "Control Plane",
1818
extip: false
1919
}, {

0 commit comments

Comments
 (0)