[CI] Update docker secrets for carvel. [skip ci]

Author: Corneil du Plessis

spring-cloud-dataflow-docs/src/main/asciidoc/configuration-carvel.adoc

@@ -53,7 +53,7 @@ These scripts assume you are connected to a Kubernetes cluster and `kubectl` is
 
 | carvel-import-secret.sh
 | <secret-name> <namespace> [secret-namespace] [--import|--placeholder]
-| [--plarholder] Creates place holder secret in namespace. [--import] Creates `SecretImport` for secretgen-controller.
+| [--placeholder] Creates place holder secret in namespace. [--import] Creates `SecretImport` for secretgen-controller.
 
 | setup-scdf-repo.sh
 | [scdf-type] (oss, pro)
@@ -186,7 +186,7 @@ Login to docker and optionally registry.tanzu.vmware.com for Spring Cloud Data F
 # When deploying SCDF Pro.
 export TANZU_DOCKER_USERNAME="<tanzu-net-username>"
 export TANZU_DOCKER_PASSWORD="<tanzu-net-password>"
-docker login --username $TANZU_DOCKER_USERNAME --password $TANZU_DOCKER_PASSWORD registry.tanzu.vmware.com
+docker login --username $TANZU_DOCKER_USERNAME --password $TANZU_DOCKER_PASSWORD registry.packages.broadcom.com
 
 # Always required to ensure you don't experience rate limiting with Docker HUB
 export DOCKER_HUB_USERNAME="<docker-hub-username>"

src/deploy/carvel/carvel-prepare-namespaces.sh

@@ -42,12 +42,15 @@ kubectl create serviceaccount "$SA" --namespace $NS
 $SCDIR/carvel-add-registry-secret.sh scdfmetadata docker.io "$DOCKER_HUB_USERNAME" "$DOCKER_HUB_PASSWORD"
 $SCDIR/carvel-add-registry-secret.sh reg-creds-dockerhub docker.io "$DOCKER_HUB_USERNAME" "$DOCKER_HUB_PASSWORD"
 
+patch_serviceaccount '{"imagePullSecrets": [{"name": "reg-creds-dockerhub"},{"name":"scdfmetadata"}]}'
 
 if [ "$SCDF_TYPE" = "pro" ]; then
-    check_env TANZU_DOCKER_USERNAME
-    check_env TANZU_DOCKER_PASSWORD
-    $SCDIR/carvel-add-registry-secret.sh reg-creds-dev-registry dev.registry.tanzu.vmware.com "$TANZU_DOCKER_USERNAME" "$TANZU_DOCKER_PASSWORD"
-    patch_serviceaccount '{"imagePullSecrets": [{"name": "reg-creds-dockerhub"},{"name": "reg-creds-dev-registry"}]}'
-else
-    patch_serviceaccount '{"imagePullSecrets": [{"name": "reg-creds-dockerhub"}]}'
+    if [ "$TANZU_DOCKER_USERNAME" = "" ]; then
+        echo "Cannot find TANZU_DOCKER_USERNAME"
+    else
+        check_env TANZU_DOCKER_PASSWORD
+        $SCDIR/carvel-add-registry-secret.sh reg-creds-dev-registry registry.packages.broadcom.com "$TANZU_DOCKER_USERNAME" "$TANZU_DOCKER_PASSWORD"
+        $SCDIR/carvel-add-registry-secret.sh reg-creds-dev-registry spring-scdf-docker-virtual.usw1.packages.broadcom.com "$TANZU_DOCKER_USERNAME" "$TANZU_DOCKER_PASSWORD"
+        patch_serviceaccount '{"imagePullSecrets": [{"name": "reg-creds-dev-registry"}]}'
+    fi
 fi

src/deploy/carvel/prepare-local-namespace.sh

@@ -38,13 +38,15 @@ kubectl create serviceaccount "$SA" --namespace $NS
 
 $SCDIR/add-local-registry-secret.sh scdfmetadata docker.io "$DOCKER_HUB_USERNAME" "$DOCKER_HUB_PASSWORD"
 $SCDIR/add-local-registry-secret.sh reg-creds-dockerhub docker.io "$DOCKER_HUB_USERNAME" "$DOCKER_HUB_PASSWORD"
-
+patch_serviceaccount '{"imagePullSecrets": [{"name": "reg-creds-dockerhub"},{"name":"scdfmetadata"}]}'
 
 if [ "$SCDF_TYPE" = "pro" ]; then
-    check_env TANZU_DOCKER_USERNAME
-    check_env TANZU_DOCKER_PASSWORD
-    $SCDIR/add-local-registry-secret.sh reg-creds-dev-registry dev.registry.tanzu.vmware.com "$TANZU_DOCKER_USERNAME" "$TANZU_DOCKER_PASSWORD"
-    patch_serviceaccount '{"imagePullSecrets": [{"name": "reg-creds-dockerhub"},{"name": "reg-creds-dev-registry"}]}'
-else
-    patch_serviceaccount '{"imagePullSecrets": [{"name": "reg-creds-dockerhub"}]}'
+    if [ "$TANZU_DOCKER_USERNAME" = "" ]; then
+        echo "Cannot find TANZU_DOCKER_USERNAME"
+    else
+        check_env TANZU_DOCKER_PASSWORD
+        $SCDIR/carvel-add-registry-secret.sh reg-creds-dev-registry registry.packages.broadcom.com "$TANZU_DOCKER_USERNAME" "$TANZU_DOCKER_PASSWORD"
+        $SCDIR/carvel-add-registry-secret.sh reg-creds-dev-registry spring-scdf-docker-virtual.usw1.packages.broadcom.com "$TANZU_DOCKER_USERNAME" "$TANZU_DOCKER_PASSWORD"
+        patch_serviceaccount '{"imagePullSecrets": [{"name": "reg-creds-dev-registry"}]}'
+    fi
 fi