[CI] Rename dev.registry.tanzu.vmware.com -> spring-scdf-docker-dev-l…

…ocal.usw1.packages.broadcom.com [skip-ci]
spring-cloud · Jun 18, 2024 · 5c11464 · 5c11464
1 parent 2836b64
commit 5c11464
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 14 deletions.
diff --git a/src/deploy/carvel/load-images.sh b/src/deploy/carvel/load-images.sh
@@ -61,7 +61,7 @@ sh "$K8S/load-image.sh" "springcloud/spring-cloud-skipper-server" "$DATAFLOW_VER
 
 if [ "$SCDF_TYPE" = "pro" ]; then
     if [ "$SCDF_PRO_VERSION" != "" ]; then
-        sh "$K8S/load-image.sh" "dev.registry.tanzu.vmware.com/p-scdf-for-kubernetes/scdf-pro-server" "$SCDF_PRO_VERSION" true
+        sh "$K8S/load-image.sh" "spring-scdf-docker-dev-local.usw1.packages.broadcom.com/p-scdf-for-kubernetes/scdf-pro-server" "$SCDF_PRO_VERSION" true
     fi
 else
     sh "$K8S/load-image.sh" "springcloud/spring-cloud-dataflow-server" "$DATAFLOW_VERSION" true

diff --git a/src/deploy/carvel/scdf-pro-values.yml b/src/deploy/carvel/scdf-pro-values.yml
@@ -3,7 +3,7 @@ scdf:
     type: rabbit
   server:
     image:
-      repository: dev.registry.tanzu.vmware.com/p-scdf-for-kubernetes/scdf-pro-server
+      repository: spring-scdf-docker-dev-local.usw1.packages.broadcom.com/p-scdf-for-kubernetes/scdf-pro-server
       tag: 1.6.0
     service:
       type: LoadBalancer

diff --git a/src/deploy/carvel/setup-scdf-repo.sh b/src/deploy/carvel/setup-scdf-repo.sh
@@ -33,7 +33,7 @@ case $SCDF_TYPE in
 "pro")
     PACKAGE_NAME=scdf-pro.tanzu.vmware.com
     if [ "$PACKAGE_REPO" = "" ]; then
-        PACKAGE_REPO="dev.registry.tanzu.vmware.com/p-scdf-for-kubernetes"
+        PACKAGE_REPO="spring-scdf-docker-dev-local.usw1.packages.broadcom.com/p-scdf-for-kubernetes"
     fi
     if [ "$REPO_NAME" = "" ]; then
         REPO_NAME="scdf-pro-repo"

diff --git a/src/deploy/images/pull-scdf-pro.sh b/src/deploy/images/pull-scdf-pro.sh
@@ -2,4 +2,4 @@
 if [ "$DATAFLOW_PRO_VERSION" = "" ]; then
   DATAFLOW_PRO_VERSION=1.6.1-SNAPSHOT
 fi
-docker pull "dev.registry.tanzu.vmware.com/p-scdf-for-kubernetes/scdf-pro-server:$DATAFLOW_PRO_VERSION"
+docker pull "spring-scdf-docker-dev-local.usw1.packages.broadcom.com/p-scdf-for-kubernetes/scdf-pro-server:$DATAFLOW_PRO_VERSION"
diff --git a/src/deploy/images/pull-skipper-pro.sh b/src/deploy/images/pull-skipper-pro.sh
@@ -2,4 +2,4 @@
 if [ "$DATAFLOW_PRO_VERSION" = "" ]; then
   DATAFLOW_PRO_VERSION=1.6.1-SNAPSHOT
 fi
-docker pull "dev.registry.tanzu.vmware.com/p-scdf-for-kubernetes/scdf-pro-skipper:$DATAFLOW_PRO_VERSION"
+docker pull "spring-scdf-docker-dev-local.usw1.packages.broadcom.com/p-scdf-for-kubernetes/scdf-pro-skipper:$DATAFLOW_PRO_VERSION"
diff --git a/src/deploy/k8s/deploy-scdf.sh b/src/deploy/k8s/deploy-scdf.sh
@@ -136,9 +136,9 @@ if [ "$K8S_DRIVER" != "tmc" ] && [ "$K8S_DRIVER" != "gke" ]; then
 
 
     if [ "$USE_PRO" = "true" ]; then
-        sh "$SCDIR/load-image.sh" "dev.registry.tanzu.vmware.com/p-scdf-for-kubernetes/scdf-pro-server:$DATAFLOW_PRO_VERSION" true
+        sh "$SCDIR/load-image.sh" "spring-scdf-docker-dev-local.usw1.packages.broadcom.com/p-scdf-for-kubernetes/scdf-pro-server:$DATAFLOW_PRO_VERSION" true
 #        if [[ "$DATAFLOW_PRO_VERSION" == *"1.6"* ]]; then
-#            sh "$SCDIR/load-image.sh" "dev.registry.tanzu.vmware.com/p-scdf-for-kubernetes/scdf-pro-skipper:$DATAFLOW_PRO_VERSION" true
+#            sh "$SCDIR/load-image.sh" "spring-scdf-docker-dev-local.usw1.packages.broadcom.com/p-scdf-for-kubernetes/scdf-pro-skipper:$DATAFLOW_PRO_VERSION" true
 #
 #        else
             sh "$SCDIR/load-image.sh" "springcloud/spring-cloud-skipper-server:$SKIPPER_VERSION" true

diff --git a/src/deploy/k8s/update-scdf.sh b/src/deploy/k8s/update-scdf.sh
@@ -86,8 +86,8 @@ if [ "$K8S_DRIVER" != "tmc" ] && [ "$K8S_DRIVER" != "gke" ]; then
     sh "$SCDIR/load-image.sh" "springcloud/spring-cloud-dataflow-composed-task-runner:$DATAFLOW_VERSION" true
 
     if [ "$USE_PRO" = "true" ]; then
-        sh "$SCDIR/load-image.sh" "dev.registry.tanzu.vmware.com/p-scdf-for-kubernetes/scdf-pro-server:$DATAFLOW_PRO_VERSION" true
-        sh "$SCDIR/load-image.sh" "dev.registry.tanzu.vmware.com/p-scdf-for-kubernetes/scdf-pro-skipper:$DATAFLOW_PRO_VERSION" true
+        sh "$SCDIR/load-image.sh" "spring-scdf-docker-dev-local.usw1.packages.broadcom.com/p-scdf-for-kubernetes/scdf-pro-server:$DATAFLOW_PRO_VERSION" true
+        sh "$SCDIR/load-image.sh" "spring-scdf-docker-dev-local.usw1.packages.broadcom.com/p-scdf-for-kubernetes/scdf-pro-skipper:$DATAFLOW_PRO_VERSION" true
     else
         sh "$SCDIR/load-image.sh" "springcloud/spring-cloud-skipper-server:$SKIPPER_VERSION" true
         sh "$SCDIR/load-image.sh" "springcloud/spring-cloud-dataflow-server:$DATAFLOW_VERSION" true
@@ -111,8 +111,8 @@ kubectl --namespace "$NS" set image deployments/scdf-server scdf-server=$SCDF_SE
 
 if [ "$USE_PRO" = "true" ]; then
     echo "Deploying Data Flow Server Pro $DATAFLOW_PRO_VERSION for $BROKER and $DATABASE"
-    SCDF_SERVER_IMAGE="dev.registry.tanzu.vmware.com/p-scdf-for-kubernetes/scdf-pro-server:$DATAFLOW_PRO_VERSION"
-#    SCDF_SKIPPER_IMAGE="dev.registry.tanzu.vmware.com/p-scdf-for-kubernetes/scdf-pro-skipper:$DATAFLOW_PRO_VERSION"
+    SCDF_SERVER_IMAGE="spring-scdf-docker-dev-local.usw1.packages.broadcom.com/p-scdf-for-kubernetes/scdf-pro-server:$DATAFLOW_PRO_VERSION"
+#    SCDF_SKIPPER_IMAGE="spring-scdf-docker-dev-local.usw1.packages.broadcom.com/p-scdf-for-kubernetes/scdf-pro-skipper:$DATAFLOW_PRO_VERSION"
 #    cat "$YAML_PATH/server-deployment-pro.yaml" | envsubst '$DATAFLOW_VERSION,$DATAFLOW_PRO_VERSION,$DATABASE' | kubectl apply --namespace "$NS" -f -
     cat "$YAML_PATH/server-deployment-pro.yaml" | envsubst '$DATAFLOW_VERSION,$DATAFLOW_PRO_VERSION,$DATABASE' | kubectl apply --namespace "$NS" -f -
     kubectl --namespace "$NS" set image deployments/scdf-server scdf-server=$SCDF_SERVER_IMAGE

diff --git a/src/deploy/k8s/yaml/server-deployment-pro.yaml b/src/deploy/k8s/yaml/server-deployment-pro.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: scdf-server
-          image: dev.registry.tanzu.vmware.com/p-scdf-for-kubernetes/scdf-pro-server:${DATAFLOW_PRO_VERSION}
+          image: spring-scdf-docker-dev-local.usw1.packages.broadcom.com/p-scdf-for-kubernetes/scdf-pro-server:${DATAFLOW_PRO_VERSION}
           imagePullPolicy: IfNotPresent
           volumeMounts:
             - name: config

diff --git a/src/deploy/k8s/yaml/skipper-deployment-pro.yaml b/src/deploy/k8s/yaml/skipper-deployment-pro.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
       - name: skipper
-        image: dev.registry.tanzu.vmware.com/p-scdf-for-kubernetes/scdf-pro-skipper:${DATAFLOW_PRO_VERSION}
+        image: spring-scdf-docker-dev-local.usw1.packages.broadcom.com/p-scdf-for-kubernetes/scdf-pro-skipper:${DATAFLOW_PRO_VERSION}
         imagePullPolicy: IfNotPresent
         volumeMounts:
           - name: config

diff --git a/src/scripts/create-carvel-package.sh b/src/scripts/create-carvel-package.sh
@@ -28,7 +28,7 @@ if [ "$TARGET_DIR" != "" ]; then
 fi
 export SERVER_VERSION=$DATAFLOW_VERSION
 if [ "$SCDF_TYPE" = "pro" ]; then
-    export SERVER_REPOSITORY="dev.registry.tanzu.vmware.com/p-scdf-for-kubernetes/scdf-pro-server"
+    export SERVER_REPOSITORY="spring-scdf-docker-dev-local.usw1.packages.broadcom.com/p-scdf-for-kubernetes/scdf-pro-server"
 else
     export SERVER_REPOSITORY="springcloud/spring-cloud-dataflow-server"
 fi