Merge pull request #5 from zmailloux/gcr

Gcr
zmailloux · Feb 19, 2019 · 953a472 · 953a472
2 parents 973d6f0 + 9de23e8
commit 953a472
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -3,7 +3,8 @@ pipeline {
     label "jenkins-gradle"
   }
   environment {
-    ORG = 'zebra'
+    DOCKER_REGISTRY = "gcr.io"
+    ORG = 'es-devops-d'
     APP_NAME = 'meta-project'
     CHARTMUSEUM_CREDS = credentials('jenkins-x-chartmuseum')
   }
@@ -13,7 +14,7 @@ pipeline {
         branch 'PR-*'
       }
       environment {
-        DOCKER_REGISTRY = "gcr.io/es-devops-d"
+        DOCKER_REGISTRY = "gcr.io"
         PREVIEW_VERSION = "0.0.0-SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER"
         PREVIEW_NAMESPACE = "$APP_NAME-$BRANCH_NAME".toLowerCase()
         HELM_RELEASE = "$PREVIEW_NAMESPACE".toLowerCase()
@@ -48,6 +49,8 @@ pipeline {
           sh "gradle clean build"
           sh "export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml"
           sh "jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION)"
+          // Also deloy it again as latest.
+          sh "jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:latest"
         }
       }
     }

diff --git a/charts/meta-project/Makefile b/charts/meta-project/Makefile
@@ -36,7 +36,7 @@ ifeq ($(OS),Darwin)
 	sed -i "" -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml
 else ifeq ($(OS),Linux)
 	sed -i -e "s/version:.*/version: $(RELEASE_VERSION)/" Chart.yaml
-	sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/zebra\/meta-project|" values.yaml
+	sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/es-devops-d\/meta-project|" values.yaml
 	sed -i -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml
 else
 	echo "platfrom $(OS) not supported to release from"

diff --git a/charts/meta-project/values.yaml b/charts/meta-project/values.yaml
@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: gcr.io/es-devops-d/zebra/meta-project
+  repository: gcr.io/es-devops-d/meta-project
   tag: latest
   pullPolicy: IfNotPresent
 
@@ -16,7 +16,7 @@ ingress:
     # kubernetes.io/tls-acme: "true"
   path: /
   hosts:
-    - meta-project.dev.zebra.engineering
+    - meta-project.zach.zebra.engineering
   tls: []
   #  - secretName: chart-example-tls
   #    hosts:

diff --git a/charts/preview/Makefile b/charts/preview/Makefile
@@ -8,7 +8,7 @@ ifeq ($(OS),Darwin)
 else ifeq ($(OS),Linux)
 	sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" Chart.yaml
 	sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" ../*/Chart.yaml
-	sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/zebra\/meta-project|" values.yaml
+	sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/es-devops-d\/meta-project|" values.yaml
 	sed -i -e "s/tag:.*/tag: $(PREVIEW_VERSION)/" values.yaml
 else
 	echo "platfrom $(OS) not supported to release from"

diff --git a/skaffold.yaml b/skaffold.yaml
@@ -7,7 +7,7 @@ build:
     docker: {}
   tagPolicy:
     envTemplate:
-      template: '{{.DOCKER_REGISTRY}}/zebra/meta-project:{{.VERSION}}'
+      template: '{{.DOCKER_REGISTRY}}/es-devops-d/meta-project:{{.VERSION}}'
   local: {}
 deploy:
   kubectl: {}
@@ -18,13 +18,13 @@ profiles:
     - docker: {}
     tagPolicy:
       envTemplate:
-        template: '{{.DOCKER_REGISTRY}}/zebra/meta-project:{{.DIGEST_HEX}}'
+        template: '{{.DOCKER_REGISTRY}}/es-devops-d/meta-project:{{.DIGEST_HEX}}'
     local: {}
   deploy:
     helm:
       releases:
       - name: meta-project
         chartPath: charts/meta-project
         setValueTemplates:
-          image.repository: '{{.DOCKER_REGISTRY}}/zebra/meta-project'
+          image.repository: '{{.DOCKER_REGISTRY}}/es-devops-d/meta-project'
           image.tag: '{{.DIGEST_HEX}}'