Merge pull request #313 from jackgr/restore-290

Restore #290

cmd/dm/Makefile

@@ -14,21 +14,24 @@
 
 SHELL := /bin/bash
 
-GOLANG_CROSSPLATFORMS="darwin/386 darwin/amd64 freebsd/386 freebsd/amd64 freebsd/arm linux/386 linux/amd64 linux/arm windows/386 windows/amd64"
+GOLANG_CROSSPLATFORMS := darwin/386 darwin/amd64 freebsd/386 freebsd/amd64 freebsd/arm linux/386 linux/amd64 linux/arm windows/386 windows/amd64
 
 all: build binary
 
 build:
 	docker build -t dm .
 
-binary:
+binary: 
+	- docker rm -f dm
+	- rm -f dm-*
 	docker run --name dm dm
-	for platform in $$GOLANG_CROSSPLATFORMS; do \
+	for platform in ${GOLANG_CROSSPLATFORMS}; do \
 		echo $$platform; \
 		docker cp dm:/go/src/dm/dm-$${platform%/*}-$${platform##*/} .; \
 	done
 
 clean:
-	docker rm dm
-	docker rmi dm
-	rm dm-*
+	docker rm -f dm
+	docker rmi -f dm
+	rm -f dm-*
+	
\ No newline at end of file

cmd/dm/dm.go

@@ -288,7 +288,7 @@ func callService(path, method, action string, reader io.ReadCloser) {
 	var URL *url.URL
 	URL, err := url.Parse(*service)
 	if err != nil {
-		panic(fmt.Errorf("cannot parse url (%s): %s\n", path, err))
+		panic(fmt.Errorf("cannot parse url (%s): %s\n", *service, err))
 	}
 
 	URL.Path = strings.TrimRight(URL.Path, "/") + "/" + strings.TrimLeft(path, "/")

cmd/expandybird/Makefile

@@ -19,7 +19,6 @@ include ../include.mk
 DOCKER_REGISTRY := gcr.io
 PREFIX := $(DOCKER_REGISTRY)/$(PROJECT)
 IMAGE := expandybird
-TAG := latest
 
 ROOT_DIR := $(abspath ./..)
 DIR = $(ROOT_DIR)

cmd/expandybird/test/ExpectedOutput.yaml

@@ -51,7 +51,7 @@ config:
           spec:
             containers:
             - env: []
-              image: gcr.io/dm-k8s-testing/expandybird
+              image: gcr.io/dm-k8s-prod/expandybird
               name: expandybird
               ports:
               - containerPort: 8080
@@ -63,7 +63,7 @@ layout:
     properties:
       container_port: 8080
       external_service: true
-      image: gcr.io/dm-k8s-testing/expandybird
+      image: gcr.io/dm-k8s-prod/expandybird
       labels:
         app: expandybird
       replicas: 3

cmd/expandybird/test/InvalidFileName.yaml

@@ -19,4 +19,4 @@ resources:
   properties:
     service_port: 8080
     target_port: 8080
-    image: gcr.io/dm-k8s-testing/expandybird
+    image: gcr.io/dm-k8s-prod/expandybird

cmd/expandybird/test/InvalidProperty.yaml

@@ -19,4 +19,4 @@ resources:
   properties:
     service_port: 8080
     target_port: 8080
-    invalidproperty: gcr.io/dm-k8s-testing/expandybird
+    invalidproperty: gcr.io/dm-k8s-prod/expandybird

cmd/expandybird/test/InvalidTypeName.yaml

@@ -19,4 +19,4 @@ resources:
   properties:
     service_port: 8080
     target_port: 8080
-    image: gcr.io/dm-k8s-testing/expandybird
+    image: gcr.io/dm-k8s-prod/expandybird

cmd/expandybird/test/MissingImports.yaml

@@ -18,4 +18,4 @@ resources:
   properties:
     service_port: 8080
     target_port: 8080
-    image: gcr.io/dm-k8s-testing/expandybird
+    image: gcr.io/dm-k8s-prod/expandybird

cmd/expandybird/test/MissingResourceName.yaml

@@ -18,4 +18,4 @@ resources:
   properties:
     service_port: 8080
     target_port: 8080
-    image: gcr.io/dm-k8s-testing/expandybird
+    image: gcr.io/dm-k8s-prod/expandybird

cmd/expandybird/test/MissingTypeName.yaml

@@ -18,4 +18,4 @@ resources:
   properties:
     service_port: 8080
     target_port: 8080
-    image: gcr.io/dm-k8s-testing/expandybird
+    image: gcr.io/dm-k8s-prod/expandybird

cmd/expandybird/test/ValidContent.yaml

@@ -22,6 +22,6 @@ resources:
     container_port: 8080
     external_service: true
     replicas: 3
-    image: gcr.io/dm-k8s-testing/expandybird
+    image: gcr.io/dm-k8s-prod/expandybird
     labels:
       app: expandybird
\ No newline at end of file

cmd/manager/Makefile

@@ -19,7 +19,6 @@ include ../include.mk
 DOCKER_REGISTRY := gcr.io
 PREFIX := $(DOCKER_REGISTRY)/$(PROJECT)
 IMAGE := manager
-TAG := latest
 
 ROOT_DIR := $(abspath ./..)
 DIR = $(ROOT_DIR)

cmd/resourcifier/Makefile

@@ -21,7 +21,6 @@ include ../include.mk
 DOCKER_REGISTRY := gcr.io
 PREFIX := $(DOCKER_REGISTRY)/$(PROJECT)
 IMAGE := resourcifier
-TAG := latest
 
 ROOT_DIR := $(abspath ./..)
 DIR = $(ROOT_DIR)

docs/pushing.md

@@ -6,7 +6,7 @@ This details the requirements and steps for doing a DM push.
 
 In order to build and push DM, you must:
 
-* be an editor or owner on the GCP project `dm-k8s-testing`
+* be an editor or owner on the GCP project `dm-k8s-prod`
 * have `docker` installed and runnable in your current environment
 * have `gcloud` installed
 * have `gsutil` installed
@@ -17,7 +17,7 @@ To build and push the service containers:
 
 ```
 $ cd ${GOPATH}/src/github.com/kubernetes/deployment-manager
-$ export PROJECT=dm-k8s-testing
+$ export PROJECT=dm-k8s-prod
 $ make push
 ```
 

examples/bootstrap/bootstrap.yaml

@@ -8,7 +8,7 @@ resources:
     container_port: 8080
     external_service: false
     replicas: 2
-    image: gcr.io/dm-k8s-testing/expandybird:latest
+    image: gcr.io/dm-k8s-prod/expandybird:latest
     labels:
       app: dm
 - name: resourcifier
@@ -20,7 +20,7 @@ resources:
     container_port: 8080
     external_service: false
     replicas: 2
-    image: gcr.io/dm-k8s-testing/resourcifier:latest
+    image: gcr.io/dm-k8s-prod/resourcifier:latest
     labels:
       app: dm
 - name: manager
@@ -32,6 +32,6 @@ resources:
     container_port: 8080
     external_service: false
     replicas: 1
-    image: gcr.io/dm-k8s-testing/manager:latest
+    image: gcr.io/dm-k8s-prod/manager:latest
     labels:
       app: dm

examples/wordpress/README.md

@@ -42,7 +42,7 @@ The template contains the following variables:
 
 ```
 {% set PROPERTIES = properties or {} %}
-{% set PROJECT = PROPERTIES['project'] or 'dm-k8s-testing' %}
+{% set PROJECT = PROPERTIES['project'] or 'dm-k8s-prod' %}
 {% set NFS_SERVER = PROPERTIES['nfs-server'] or {} %}
 {% set NFS_SERVER_IP = NFS_SERVER['ip'] or '10.0.253.247' %}
 {% set NFS_SERVER_PORT = NFS_SERVER['port'] or 2049 %}

examples/wordpress/wordpress.jinja

 {% set PROPERTIES = properties or {} %}
-{% set PROJECT = PROPERTIES['project'] or 'dm-k8s-testing' %}
+{% set PROJECT = PROPERTIES['project'] or 'dm-k8s-prod' %}
 {% set NFS_SERVER = PROPERTIES['nfs-server'] or {} %}
 {% set NFS_SERVER_IP = NFS_SERVER['ip'] or '10.0.253.247' %}
 {% set NFS_SERVER_PORT = NFS_SERVER['port'] or 2049 %}

examples/wordpress/wordpress.jinja.schema

@@ -8,7 +8,7 @@ info:
 properties:
   project:
     type: string
-    default: dm-k8s-testing
+    default: dm-k8s-prod
     description: Project location to load the images from.
   nfs-service:
     type: object

get-install.sh

@@ -15,11 +15,13 @@
 
 set -euo pipefail
 
-PLATFORM=$(uname | tr '[:upper:]' '[:lower:]')
-ARCH=$(uname -m)
+DEFAULT_TAG=v1.2
+DEFAULT_BINARY=${GOPATH}/bin/dm
+DEFAULT_PLATFORM=$(uname | tr '[:upper:]' '[:lower:]')
+DEFAULT_ARCH=$(uname -m)
 
 STORAGE_URL=http://get-dm.storage.googleapis.com
-ZIP=dm-latest-${PLATFORM}-${ARCH}.zip
+ZIP=dm-${TAG:-DEFAULT_TAG}-${PLATFORM:-DEFAULT_PLATFORM}-${ARCH:-DEFAULT_ARCH}.zip
 
 echo "Downloading ${ZIP}..."
 curl -Ls "${STORAGE_URL}/${ZIP}" -O