diff --git a/chart/testdata/frobnitz/templates/wordpress.jinja b/chart/testdata/frobnitz/templates/wordpress.jinja index f34e4fec9..62269a899 100644 --- a/chart/testdata/frobnitz/templates/wordpress.jinja +++ b/chart/testdata/frobnitz/templates/wordpress.jinja @@ -1,6 +1,6 @@ #helm:generate dm_template {% 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 %} diff --git a/chart/testdata/frobnitz/templates/wordpress.jinja.schema b/chart/testdata/frobnitz/templates/wordpress.jinja.schema index 215b47e1e..5b4a8bc21 100644 --- a/chart/testdata/frobnitz/templates/wordpress.jinja.schema +++ b/chart/testdata/frobnitz/templates/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 diff --git a/chart/testdata/ill/templates/wordpress.jinja b/chart/testdata/ill/templates/wordpress.jinja index f34e4fec9..62269a899 100644 --- a/chart/testdata/ill/templates/wordpress.jinja +++ b/chart/testdata/ill/templates/wordpress.jinja @@ -1,6 +1,6 @@ #helm:generate dm_template {% 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 %} diff --git a/chart/testdata/ill/templates/wordpress.jinja.schema b/chart/testdata/ill/templates/wordpress.jinja.schema index 215b47e1e..5b4a8bc21 100644 --- a/chart/testdata/ill/templates/wordpress.jinja.schema +++ b/chart/testdata/ill/templates/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 diff --git a/dm/Makefile b/dm/Makefile index 7ae51e886..aa771203b 100644 --- a/dm/Makefile +++ b/dm/Makefile @@ -14,7 +14,7 @@ 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 @@ -22,13 +22,15 @@ build: docker build -t dm . binary: + - docker stop dm + - docker rm 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 dm + - docker rmi dm + rm -f dm-* diff --git a/dm/dm.go b/dm/dm.go index 03ee06dbb..b348605fd 100644 --- a/dm/dm.go +++ b/dm/dm.go @@ -272,10 +272,10 @@ 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, "/") + URL.Path = strings.TrimRight(URL.Path, "/") + "/" + strings.TrimLeft(path, "/") resp := callHTTP(URL.String(), method, action, reader) var j interface{} if err := json.Unmarshal([]byte(resp), &j); err != nil { diff --git a/docs/pushing.md b/docs/pushing.md index 06c4faf37..381e7a28b 100644 --- a/docs/pushing.md +++ b/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 ``` diff --git a/examples/bootstrap/bootstrap.yaml b/examples/bootstrap/bootstrap.yaml index c36d38103..4deabeb45 100644 --- a/examples/bootstrap/bootstrap.yaml +++ b/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 diff --git a/examples/wordpress/README.md b/examples/wordpress/README.md index 12573ba0e..177ff47c7 100644 --- a/examples/wordpress/README.md +++ b/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 %} diff --git a/examples/wordpress/wordpress.jinja b/examples/wordpress/wordpress.jinja index c3789b555..5855b2e8c 100644 --- a/examples/wordpress/wordpress.jinja +++ b/examples/wordpress/wordpress.jinja @@ -1,5 +1,5 @@ {% 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 %} diff --git a/examples/wordpress/wordpress.jinja.schema b/examples/wordpress/wordpress.jinja.schema index 215b47e1e..5b4a8bc21 100644 --- a/examples/wordpress/wordpress.jinja.schema +++ b/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 diff --git a/expandybird/test/ExpectedOutput.yaml b/expandybird/test/ExpectedOutput.yaml index 24bd519a3..13e510d3c 100644 --- a/expandybird/test/ExpectedOutput.yaml +++ b/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 diff --git a/expandybird/test/InvalidFileName.yaml b/expandybird/test/InvalidFileName.yaml index 712426be2..fd3800466 100644 --- a/expandybird/test/InvalidFileName.yaml +++ b/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 diff --git a/expandybird/test/InvalidProperty.yaml b/expandybird/test/InvalidProperty.yaml index 7eeb78538..fd3d5edeb 100644 --- a/expandybird/test/InvalidProperty.yaml +++ b/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 diff --git a/expandybird/test/InvalidTypeName.yaml b/expandybird/test/InvalidTypeName.yaml index 387e4a172..e411c1b11 100644 --- a/expandybird/test/InvalidTypeName.yaml +++ b/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 diff --git a/expandybird/test/MissingImports.yaml b/expandybird/test/MissingImports.yaml index e6a24e6f6..6a6741f8a 100644 --- a/expandybird/test/MissingImports.yaml +++ b/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 diff --git a/expandybird/test/MissingResourceName.yaml b/expandybird/test/MissingResourceName.yaml index 8ae93dace..32215e765 100644 --- a/expandybird/test/MissingResourceName.yaml +++ b/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 diff --git a/expandybird/test/MissingTypeName.yaml b/expandybird/test/MissingTypeName.yaml index 65bd433a4..f246d99f8 100644 --- a/expandybird/test/MissingTypeName.yaml +++ b/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 diff --git a/expandybird/test/TestArchive.tar b/expandybird/test/TestArchive.tar index 2c364b000..3b4e30e84 100644 Binary files a/expandybird/test/TestArchive.tar and b/expandybird/test/TestArchive.tar differ diff --git a/expandybird/test/ValidContent.yaml b/expandybird/test/ValidContent.yaml index 37a32e153..0c342201e 100644 --- a/expandybird/test/ValidContent.yaml +++ b/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 diff --git a/get-install.sh b/get-install.sh index be8f34d14..df53665ef 100755 --- a/get-install.sh +++ b/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 diff --git a/hack/dm-push.sh b/hack/dm-push.sh index 00d4a8b1c..8484f7fe0 100755 --- a/hack/dm-push.sh +++ b/hack/dm-push.sh @@ -17,21 +17,23 @@ # Run this from deployment-manager root to build and push the dm client plus # kubernetes install config into the publicly readable GCS bucket gs://get-dm. # -# Must have EDIT permissions on the dm-k8s-testing GCP project. +# Must have EDIT permissions on the dm-k8s-prod GCP project. 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_BUCKET=gs://get-dm -ZIP=dm-latest-${PLATFORM}-${ARCH}.zip +ZIP=dm-${TAG:-DEFAULT_TAG}-${PLATFORM:-DEFAULT_PLATFORM}-${ARCH:-DEFAULT_ARCH}.zip echo "Building..." make echo "Zipping ${ZIP}..." -zip -j ${ZIP} ${GOPATH}/bin/dm install.yaml +zip -j ${ZIP} ${BINARY:-DEFAULT_BINARY} install.yaml echo "Uploading ${ZIP} to ${STORAGE_BUCKET}..." gsutil cp ${ZIP} ${STORAGE_BUCKET} diff --git a/include.mk b/include.mk index 28b957e61..fca436983 100644 --- a/include.mk +++ b/include.mk @@ -5,7 +5,7 @@ info: @echo "Project: ${PROJECT}" @echo "Image: ${IMAGE}" -TAG := $(shell echo `date +"%s"`_`date +"%N"`) +TAG ?= $(shell echo `date +"%s"`_`date +"%N"`) .PHONY: test-unit test-unit: diff --git a/install.yaml b/install.yaml index 3d8dc042a..69a21a54e 100644 --- a/install.yaml +++ b/install.yaml @@ -58,7 +58,7 @@ spec: spec: containers: - env: [] - image: gcr.io/dm-k8s-testing/expandybird:latest + image: gcr.io/dm-k8s-prod/expandybird:v1.2 name: expandybird ports: - containerPort: 8080 @@ -102,7 +102,7 @@ spec: spec: containers: - env: [] - image: gcr.io/dm-k8s-testing/resourcifier:latest + image: gcr.io/dm-k8s-prod/resourcifier:v1.2 imagePullPolicy: Always livenessProbe: httpGet: @@ -153,7 +153,7 @@ spec: spec: containers: - env: [] - image: gcr.io/dm-k8s-testing/manager:latest + image: gcr.io/dm-k8s-prod/manager:v1.2 imagePullPolicy: Always livenessProbe: httpGet: diff --git a/util/templateutil_test.go b/util/templateutil_test.go index 1c5a8784f..36a99c73a 100644 --- a/util/templateutil_test.go +++ b/util/templateutil_test.go @@ -39,7 +39,7 @@ target_port: 8080 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 `