Merge pull request #64 from galal-hussein/official_images

Change helper images to official rancher images
rancher · Nov 29, 2017 · c3d3bb8 · c3d3bb8
2 parents 5876560 + 39ef2e9
commit c3d3bb8
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 358 deletions.
diff --git a/package/certdownloader/Dockerfile → package/certs-deployer/Dockerfile b/package/certdownloader/Dockerfile → package/certs-deployer/Dockerfile
diff --git a/package/certs-deployer/build-and-push.sh b/package/certs-deployer/build-and-push.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+ACCT=${ACCT:-rancher}
+
+docker build -t $ACCT/rke-cert-deployer:0.1.0 .
+docker push $ACCT/rke-cert-deployer:0.1.0
diff --git a/package/certdownloader/entrypoint.sh → package/certs-deployer/entrypoint.sh b/package/certdownloader/entrypoint.sh → package/certs-deployer/entrypoint.sh
diff --git a/package/kubectl/Dockerfile b/package/kubectl/Dockerfile
diff --git a/package/kubectl/addons/kubedns.yaml b/package/kubectl/addons/kubedns.yaml
diff --git a/package/kubectl/entrypoint.sh b/package/kubectl/entrypoint.sh
diff --git a/package/kubectl/network/flannel.yaml b/package/kubectl/network/flannel.yaml
diff --git a/package/nginx-proxy/build-and-push.sh b/package/nginx-proxy/build-and-push.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+ACCT=${ACCT:-rancher}
+
+docker build -t $ACCT/rke-nginx-proxy:0.1.0 .
+docker push $ACCT/rke-nginx-proxy:0.1.0
diff --git a/pki/constants.go b/pki/constants.go
@@ -1,7 +1,7 @@
 package pki
 
 const (
-	CrtDownloaderImage     = "husseingalal/crt-downloader:latest"
+	CrtDownloaderImage     = "rancher/rke-cert-deployer:0.1.0"
 	CrtDownloaderContainer = "cert-deployer"
 	CertificatesSecretName = "k8s-certs"
 

diff --git a/services/proxy.go b/services/proxy.go
@@ -9,7 +9,7 @@ import (
 )
 
 const (
-	NginxProxyImage   = "husseingalal/nginx-nodeporxy:dev"
+	NginxProxyImage   = "rancher/rke-nginx-proxy:0.1.0"
 	NginxProxyEnvName = "CP_HOSTS"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ import ( @@
     )
     const (
-    	NginxProxyImage   = "husseingalal/nginx-nodeporxy:dev"
+    	NginxProxyImage   = "rancher/rke-nginx-proxy:0.1.0"
     	NginxProxyEnvName = "CP_HOSTS"
     )
@@ Expand Down @@