diff --git a/cmd/expandybird/test/ExpectedOutput.yaml b/cmd/expandybird/test/ExpectedOutput.yaml index 13e510d3c..02bf868b8 100644 --- a/cmd/expandybird/test/ExpectedOutput.yaml +++ b/cmd/expandybird/test/ExpectedOutput.yaml @@ -51,7 +51,7 @@ config: spec: containers: - env: [] - image: gcr.io/dm-k8s-prod/expandybird + image: gcr.io/kubernetes-helm/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/kubernetes-helm/expandybird labels: app: expandybird replicas: 3 diff --git a/cmd/expandybird/test/InvalidFileName.yaml b/cmd/expandybird/test/InvalidFileName.yaml index fd3800466..fa29b84d2 100644 --- a/cmd/expandybird/test/InvalidFileName.yaml +++ b/cmd/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/kubernetes-helm/expandybird diff --git a/cmd/expandybird/test/InvalidProperty.yaml b/cmd/expandybird/test/InvalidProperty.yaml index fd3d5edeb..aab9b6341 100644 --- a/cmd/expandybird/test/InvalidProperty.yaml +++ b/cmd/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/kubernetes-helm/expandybird diff --git a/cmd/expandybird/test/InvalidTypeName.yaml b/cmd/expandybird/test/InvalidTypeName.yaml index e411c1b11..67b7050f0 100644 --- a/cmd/expandybird/test/InvalidTypeName.yaml +++ b/cmd/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/kubernetes-helm/expandybird diff --git a/cmd/expandybird/test/MissingImports.yaml b/cmd/expandybird/test/MissingImports.yaml index 6a6741f8a..91c11fe33 100644 --- a/cmd/expandybird/test/MissingImports.yaml +++ b/cmd/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/kubernetes-helm/expandybird diff --git a/cmd/expandybird/test/MissingResourceName.yaml b/cmd/expandybird/test/MissingResourceName.yaml index 32215e765..00f7e7d61 100644 --- a/cmd/expandybird/test/MissingResourceName.yaml +++ b/cmd/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/kubernetes-helm/expandybird diff --git a/cmd/expandybird/test/MissingTypeName.yaml b/cmd/expandybird/test/MissingTypeName.yaml index f246d99f8..4a867f86c 100644 --- a/cmd/expandybird/test/MissingTypeName.yaml +++ b/cmd/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/kubernetes-helm/expandybird diff --git a/cmd/expandybird/test/TestArchive.tar b/cmd/expandybird/test/TestArchive.tar index 585b4418d..9cb986b97 100644 Binary files a/cmd/expandybird/test/TestArchive.tar and b/cmd/expandybird/test/TestArchive.tar differ diff --git a/cmd/expandybird/test/ValidContent.yaml b/cmd/expandybird/test/ValidContent.yaml index 0c342201e..5798efec3 100644 --- a/cmd/expandybird/test/ValidContent.yaml +++ b/cmd/expandybird/test/ValidContent.yaml @@ -22,6 +22,6 @@ resources: container_port: 8080 external_service: true replicas: 3 - image: gcr.io/dm-k8s-prod/expandybird + image: gcr.io/kubernetes-helm/expandybird labels: app: expandybird \ No newline at end of file diff --git a/docs/pushing.md b/docs/pushing.md index 4b139c96d..3f614fcce 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 `kubernetes-helm` * have `docker` installed and runnable in your current environment * have `gcloud` installed * have `gsutil` installed @@ -17,7 +17,6 @@ To build and push the service containers: ``` $ cd ${GOPATH}/src/github.com/kubernetes/helm -$ export PROJECT=dm-k8s-prod $ make push ``` diff --git a/hack/dm-push.sh b/hack/dm-push.sh index 3c095568d..bf894612e 100755 --- a/hack/dm-push.sh +++ b/hack/dm-push.sh @@ -17,7 +17,7 @@ # Run this from helm 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-prod GCP project. +# Must have EDIT permissions on the kubernetes-helm GCP project. set -euo pipefail diff --git a/pkg/client/install.go b/pkg/client/install.go index 379dc6025..d255b686c 100644 --- a/pkg/client/install.go +++ b/pkg/client/install.go @@ -143,7 +143,7 @@ spec: spec: containers: - env: [] - image: {{default "gcr.io/dm-k8s-prod/expandybird:v1.2.1" .Expandybird.Image}} + image: {{default "gcr.io/kubernetes-helm/expandybird:v1.2.1" .Expandybird.Image}} name: expandybird ports: - containerPort: 8080 @@ -187,7 +187,7 @@ spec: spec: containers: - env: [] - image: {{ default "gcr.io/dm-k8s-prod/resourcifier:v1.2.1" .Resourcifier.Image }} + image: {{ default "gcr.io/kubernetes-helm/resourcifier:v1.2.1" .Resourcifier.Image }} name: resourcifier ports: - containerPort: 8080 @@ -231,7 +231,7 @@ spec: spec: containers: - env: [] - image: {{ default "gcr.io/dm-k8s-prod/manager:v1.2.1" .Manager.Image }} + image: {{ default "gcr.io/kubernetes-helm/manager:v1.2.1" .Manager.Image }} name: manager ports: - containerPort: 8080 diff --git a/pkg/util/templateutil_test.go b/pkg/util/templateutil_test.go index 36a99c73a..e6e66ac9f 100644 --- a/pkg/util/templateutil_test.go +++ b/pkg/util/templateutil_test.go @@ -39,7 +39,7 @@ target_port: 8080 container_port: 8080 external_service: true replicas: 3 -image: gcr.io/dm-k8s-prod/expandybird +image: gcr.io/kubernetes-helm/expandybird labels: app: expandybird `