From 4f018e11f7ea976dbfee0cfe17ef2d054d429564 Mon Sep 17 00:00:00 2001 From: jackgr Date: Thu, 25 Feb 2016 16:23:27 -0800 Subject: [PATCH 1/5] Set image tag to timestamp. --- expandybird/Makefile | 1 - include.mk | 2 ++ manager/Makefile | 1 - resourcifier/Makefile | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/expandybird/Makefile b/expandybird/Makefile index df97481fd..16f0c7882 100644 --- a/expandybird/Makefile +++ b/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) diff --git a/include.mk b/include.mk index fba7d5f4e..28b957e61 100644 --- a/include.mk +++ b/include.mk @@ -5,6 +5,8 @@ info: @echo "Project: ${PROJECT}" @echo "Image: ${IMAGE}" +TAG := $(shell echo `date +"%s"`_`date +"%N"`) + .PHONY: test-unit test-unit: @echo Running tests... diff --git a/manager/Makefile b/manager/Makefile index 2e3a2ad55..209c874f2 100644 --- a/manager/Makefile +++ b/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) diff --git a/resourcifier/Makefile b/resourcifier/Makefile index 1b80a7dca..9d6eebe1a 100644 --- a/resourcifier/Makefile +++ b/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) From 6e1821c4bb1c0b927fb99fa5ac1325bf41267db7 Mon Sep 17 00:00:00 2001 From: jackgr Date: Mon, 29 Feb 2016 11:40:34 -0800 Subject: [PATCH 2/5] Fix error message --- dm/dm.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 { From 3ee17fe02cba66e1f6bcea35c7cd51b6d6cf1bea Mon Sep 17 00:00:00 2001 From: jackgr Date: Mon, 29 Feb 2016 11:45:37 -0800 Subject: [PATCH 3/5] Change to dm-k8s-prod --- .../frobnitz/templates/wordpress.jinja | 2 +- .../frobnitz/templates/wordpress.jinja.schema | 2 +- chart/testdata/ill/templates/wordpress.jinja | 2 +- .../ill/templates/wordpress.jinja.schema | 2 +- dm/Makefile | 12 +++++++----- docs/pushing.md | 4 ++-- examples/bootstrap/bootstrap.yaml | 6 +++--- examples/wordpress/README.md | 2 +- examples/wordpress/wordpress.jinja | 2 +- examples/wordpress/wordpress.jinja.schema | 2 +- expandybird/test/ExpectedOutput.yaml | 4 ++-- expandybird/test/InvalidFileName.yaml | 2 +- expandybird/test/InvalidProperty.yaml | 2 +- expandybird/test/InvalidTypeName.yaml | 2 +- expandybird/test/MissingImports.yaml | 2 +- expandybird/test/MissingResourceName.yaml | 2 +- expandybird/test/MissingTypeName.yaml | 2 +- expandybird/test/TestArchive.tar | Bin 9728 -> 9728 bytes expandybird/test/ValidContent.yaml | 2 +- get-install.sh | 8 +++++--- hack/dm-push.sh | 12 +++++++----- include.mk | 2 +- install.yaml | 6 +++--- util/templateutil_test.go | 2 +- 24 files changed, 45 insertions(+), 39 deletions(-) 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/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 2c364b00004513f120872ea7dfa10c6f4dd8daf0..3b4e30e84dd0518737822fcf195bcb61183775db 100644 GIT binary patch delta 82 zcmZqhY4DlQDq&=*U}$7!W@>0;WMFKhU|?u$ZfwAyU@$q6F=aC&<3kpff};GC%`aKS enI`{b?-MdJGB-3gFg63KG%+ Date: Tue, 1 Mar 2016 10:25:11 -0800 Subject: [PATCH 4/5] Revert "Merge pull request #290 from jackgr/release-prep" This reverts commit c3ee20302f0500014232aa35de3f360cf728d108, reversing changes made to 69f3b1d9b27477b3fce4afc9317017fe7d7f03b5. --- .../frobnitz/templates/wordpress.jinja | 2 +- .../frobnitz/templates/wordpress.jinja.schema | 2 +- chart/testdata/ill/templates/wordpress.jinja | 2 +- .../ill/templates/wordpress.jinja.schema | 2 +- dm/Makefile | 12 +++++------- dm/dm.go | 4 ++-- docs/pushing.md | 4 ++-- examples/bootstrap/bootstrap.yaml | 6 +++--- examples/wordpress/README.md | 2 +- examples/wordpress/wordpress.jinja | 2 +- examples/wordpress/wordpress.jinja.schema | 2 +- expandybird/test/ExpectedOutput.yaml | 4 ++-- expandybird/test/InvalidFileName.yaml | 2 +- expandybird/test/InvalidProperty.yaml | 2 +- expandybird/test/InvalidTypeName.yaml | 2 +- expandybird/test/MissingImports.yaml | 2 +- expandybird/test/MissingResourceName.yaml | 2 +- expandybird/test/MissingTypeName.yaml | 2 +- expandybird/test/TestArchive.tar | Bin 9728 -> 9728 bytes expandybird/test/ValidContent.yaml | 2 +- get-install.sh | 8 +++----- hack/dm-push.sh | 12 +++++------- include.mk | 2 +- install.yaml | 6 +++--- util/templateutil_test.go | 2 +- 25 files changed, 41 insertions(+), 47 deletions(-) diff --git a/chart/testdata/frobnitz/templates/wordpress.jinja b/chart/testdata/frobnitz/templates/wordpress.jinja index 62269a899..f34e4fec9 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-prod' %} +{% set PROJECT = PROPERTIES['project'] or 'dm-k8s-testing' %} {% 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 5b4a8bc21..215b47e1e 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-prod + default: dm-k8s-testing 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 62269a899..f34e4fec9 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-prod' %} +{% set PROJECT = PROPERTIES['project'] or 'dm-k8s-testing' %} {% 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 5b4a8bc21..215b47e1e 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-prod + default: dm-k8s-testing description: Project location to load the images from. nfs-service: type: object diff --git a/dm/Makefile b/dm/Makefile index aa771203b..7ae51e886 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,15 +22,13 @@ 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 -f dm-* + docker rm dm + docker rmi dm + rm dm-* diff --git a/dm/dm.go b/dm/dm.go index b348605fd..03ee06dbb 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", *service, err)) + panic(fmt.Errorf("cannot parse url (%s): %s\n", path, 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 381e7a28b..06c4faf37 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-prod` +* be an editor or owner on the GCP project `dm-k8s-testing` * 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-prod +$ export PROJECT=dm-k8s-testing $ make push ``` diff --git a/examples/bootstrap/bootstrap.yaml b/examples/bootstrap/bootstrap.yaml index 4deabeb45..c36d38103 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-prod/expandybird:latest + image: gcr.io/dm-k8s-testing/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-prod/resourcifier:latest + image: gcr.io/dm-k8s-testing/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-prod/manager:latest + image: gcr.io/dm-k8s-testing/manager:latest labels: app: dm diff --git a/examples/wordpress/README.md b/examples/wordpress/README.md index 177ff47c7..12573ba0e 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-prod' %} +{% set PROJECT = PROPERTIES['project'] or 'dm-k8s-testing' %} {% 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 5855b2e8c..c3789b555 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-prod' %} +{% set PROJECT = PROPERTIES['project'] or 'dm-k8s-testing' %} {% 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 5b4a8bc21..215b47e1e 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-prod + default: dm-k8s-testing 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 13e510d3c..24bd519a3 100644 --- a/expandybird/test/ExpectedOutput.yaml +++ b/expandybird/test/ExpectedOutput.yaml @@ -51,7 +51,7 @@ config: spec: containers: - env: [] - image: gcr.io/dm-k8s-prod/expandybird + image: gcr.io/dm-k8s-testing/expandybird name: expandybird ports: - containerPort: 8080 @@ -63,7 +63,7 @@ layout: properties: container_port: 8080 external_service: true - image: gcr.io/dm-k8s-prod/expandybird + image: gcr.io/dm-k8s-testing/expandybird labels: app: expandybird replicas: 3 diff --git a/expandybird/test/InvalidFileName.yaml b/expandybird/test/InvalidFileName.yaml index fd3800466..712426be2 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-prod/expandybird + image: gcr.io/dm-k8s-testing/expandybird diff --git a/expandybird/test/InvalidProperty.yaml b/expandybird/test/InvalidProperty.yaml index fd3d5edeb..7eeb78538 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-prod/expandybird + invalidproperty: gcr.io/dm-k8s-testing/expandybird diff --git a/expandybird/test/InvalidTypeName.yaml b/expandybird/test/InvalidTypeName.yaml index e411c1b11..387e4a172 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-prod/expandybird + image: gcr.io/dm-k8s-testing/expandybird diff --git a/expandybird/test/MissingImports.yaml b/expandybird/test/MissingImports.yaml index 6a6741f8a..e6a24e6f6 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-prod/expandybird + image: gcr.io/dm-k8s-testing/expandybird diff --git a/expandybird/test/MissingResourceName.yaml b/expandybird/test/MissingResourceName.yaml index 32215e765..8ae93dace 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-prod/expandybird + image: gcr.io/dm-k8s-testing/expandybird diff --git a/expandybird/test/MissingTypeName.yaml b/expandybird/test/MissingTypeName.yaml index f246d99f8..65bd433a4 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-prod/expandybird + image: gcr.io/dm-k8s-testing/expandybird diff --git a/expandybird/test/TestArchive.tar b/expandybird/test/TestArchive.tar index 3b4e30e84dd0518737822fcf195bcb61183775db..2c364b00004513f120872ea7dfa10c6f4dd8daf0 100644 GIT binary patch delta 84 zcmZqhY4DlQDq(D(U}$7!Y-nh1W?*QjU|?u$Ze+}$U@$q6F=aC&<3kqqlGNgo%)Io? d&sfEoCUJBN0o9tB0TEEGiK(#(TrKB+834E97Hj|j delta 82 zcmZqhY4DlQDq&=*U}$7!W@>0;WMFKhU|?u$ZfwAyU@$q6F=aC&<3kpff};GC%`aKS enI`{b?-MdJGB-3gFg63KG%+ Date: Tue, 1 Mar 2016 10:31:38 -0800 Subject: [PATCH 5/5] Revert "Merge pull request #280 from jackgr/image-tags" This reverts commit 69f3b1d9b27477b3fce4afc9317017fe7d7f03b5, reversing changes made to e1c35b2e9d2755c94ec19dbb1b23e2759cd85789. --- expandybird/Makefile | 1 + include.mk | 2 -- manager/Makefile | 1 + resourcifier/Makefile | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/expandybird/Makefile b/expandybird/Makefile index 16f0c7882..df97481fd 100644 --- a/expandybird/Makefile +++ b/expandybird/Makefile @@ -19,6 +19,7 @@ include ../include.mk DOCKER_REGISTRY := gcr.io PREFIX := $(DOCKER_REGISTRY)/$(PROJECT) IMAGE := expandybird +TAG := latest ROOT_DIR := $(abspath ./..) DIR = $(ROOT_DIR) diff --git a/include.mk b/include.mk index 28b957e61..fba7d5f4e 100644 --- a/include.mk +++ b/include.mk @@ -5,8 +5,6 @@ info: @echo "Project: ${PROJECT}" @echo "Image: ${IMAGE}" -TAG := $(shell echo `date +"%s"`_`date +"%N"`) - .PHONY: test-unit test-unit: @echo Running tests... diff --git a/manager/Makefile b/manager/Makefile index 209c874f2..2e3a2ad55 100644 --- a/manager/Makefile +++ b/manager/Makefile @@ -19,6 +19,7 @@ include ../include.mk DOCKER_REGISTRY := gcr.io PREFIX := $(DOCKER_REGISTRY)/$(PROJECT) IMAGE := manager +TAG := latest ROOT_DIR := $(abspath ./..) DIR = $(ROOT_DIR) diff --git a/resourcifier/Makefile b/resourcifier/Makefile index 9d6eebe1a..1b80a7dca 100644 --- a/resourcifier/Makefile +++ b/resourcifier/Makefile @@ -21,6 +21,7 @@ include ../include.mk DOCKER_REGISTRY := gcr.io PREFIX := $(DOCKER_REGISTRY)/$(PROJECT) IMAGE := resourcifier +TAG := latest ROOT_DIR := $(abspath ./..) DIR = $(ROOT_DIR)