Update build scripts (v0.2)

Makefile

@@ -84,7 +84,7 @@ BASE_PATH      = $(ROOT:/src/github.com/kubernetes-sigs/service-catalog/=)
 ORIG_GOPATH   ?= $(shell go env GOPATH)
 export GOPATH  = $(BASE_PATH):$(ROOT)/vendor
 
-MUTABLE_TAG                      ?= canary
+MUTABLE_TAG                      ?= canary-v0.2
 SERVICE_CATALOG_IMAGE             = $(REGISTRY)service-catalog-$(ARCH):$(VERSION)
 SERVICE_CATALOG_MUTABLE_IMAGE     = $(REGISTRY)service-catalog-$(ARCH):$(MUTABLE_TAG)
 USER_BROKER_IMAGE                 = $(REGISTRY)user-broker-$(ARCH):$(VERSION)

charts/catalog/Chart.yaml → charts/catalog-v0.2/Chart.yaml

@@ -1,3 +1,3 @@
-name: catalog
+name: catalog-v0.2
 description: service-catalog API server and controller-manager helm chart
 version: 0.2.1

charts/catalog/README.md → charts/catalog-v0.2/README.md

@@ -12,7 +12,7 @@ For more information,
 ## Prerequisites
 
 - Kubernetes 1.7+ with Beta APIs enabled
-- `charts/catalog` already exists in your local machine
+- `charts/catalog-v0.2` already exists in your local machine
 
 ## Installing the Chart
 

charts/catalog/templates/_helpers.tpl → charts/catalog-v0.2/templates/_helpers.tpl

@@ -5,5 +5,5 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
 {{- define "fullname" -}}
-{{- printf "%s-%s" .Release.Name .Chart.Name | trunc 63 | trimSuffix "-" -}}
+{{- printf "%s-catalog-v0.2" .Release.Name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}

contrib/examples/prometheus/README.md

@@ -42,7 +42,7 @@ Prometheus.  [This YAML](prometheus.yml) creates a Prometheus instance
 preconfigured to gather Kubernetes platform and node metrics.  If you deploy the
 Service Catalog Controller Manager via Helm with the optional
 `enablePrometheusScrape` parameter set to true (either edit the parameter in
-[charts/catalog/values.yaml](../../../charts/catalog/values.yaml) or specify
+[charts/catalog-v0.2/values.yaml](../../../charts/catalog-v0.2/values.yaml) or specify
 "--set enablePrometheusScrape=true" when installing Catalog with helm), this configuration will direct Prometheus
 to automatically scrape custom metrics exposed from Service Catalog as well.
 Most any Prometheus configuration for Kubernetes (ie [Prometheus

contrib/hack/ci/publish-helm-chart.sh

@@ -53,10 +53,8 @@ mkdir -p ${SVC_CATALOG_REPO_DIR}
 pushd ${SVC_CATALOG_REPO_DIR}
 
   gsutil cp gs://${SVC_CATALOG_BUCKET}/index.yaml .
-  for dir in `ls ../charts`;do
-    helm dep build ../charts/${dir}
-    helm package ../charts/${dir}
-  done
+  helm dep build ../charts/catalog-v0.2
+  helm package ../charts/catalog-v0.2
   helm repo index --url ${SVC_CATALOG_REPO_URL} --merge ./index.yaml .
   gsutil -m rsync ./ gs://${SVC_CATALOG_BUCKET}/
 

contrib/hack/ci/publish-release.sh

@@ -30,10 +30,10 @@ docker login -u "${QUAY_USERNAME}" -p "${QUAY_PASSWORD}" quay.io
 pushd ${REPO_ROOT_DIR}
 
 if [[ "${TRAVIS_TAG}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+[a-z]*(-(r|R)(c|C)[0-9]+)*$ ]]; then
-    shout "Pushing images with tags '${TRAVIS_TAG}' and 'latest'."
-    TAG_VERSION="${TRAVIS_TAG}" VERSION="${TRAVIS_TAG}" MUTABLE_TAG="latest" make release-push svcat-publish
-elif [[ "${TRAVIS_BRANCH}" == "master" ]]; then
-    shout "Pushing images with default tags (git sha and 'canary')."
+    shout "Pushing images with tags '${TRAVIS_TAG}' and 'latest-v0.2'."
+    TAG_VERSION="${TRAVIS_TAG}" VERSION="${TRAVIS_TAG}" MUTABLE_TAG="latest-v0.2" make release-push svcat-publish
+elif [[ "${TRAVIS_BRANCH}" == "v0.2" ]]; then
+    shout "Pushing images with default tags (git sha and 'canary-v0.2')."
     make push svcat-publish
 else
     shout "Nothing to deploy"

contrib/hack/ci/run-e2e-tests.sh

@@ -53,7 +53,7 @@ install::cluster::service_catalog_latest() {
     kind::load_image service-catalog:canary
 
     shout "- Installing Service Catalog via helm chart from sources..."
-    helm install charts/catalog \
+    helm install charts/catalog-v0.2 \
         --set imagePullPolicy=IfNotPresent \
         --set image=service-catalog:canary \
         --namespace=${SC_NAMESPACE} \

contrib/hack/deploy-local-canary.sh

@@ -18,7 +18,7 @@ set -o errexit
 
 export REGISTRY=${REGISTRY:=$USER/}
 make service-catalog-image service-catalog-push
-helm upgrade --install catalog --namespace catalog charts/catalog \
+helm upgrade --install catalog --namespace catalog charts/catalog-v0.2 \
     --recreate-pods --force \
     --set image=${REGISTRY}service-catalog:canary \
     --set imagePullPolicy=Always \

docs/devguide.md

@@ -345,7 +345,7 @@ functionality or introduce instability.  See [FeatureGates](feature-gates.md)
 for more details.
 
 When adding a FeatureGate to Helm charts, define the variable
-`fooEnabled` with a value of `false` in [values.yaml](https://github.com/kubernetes-sigs/service-catalog/blob/master/charts/catalog/values.yaml).  In the [API Server](https://github.com/kubernetes-sigs/service-catalog/blob/master/charts/catalog/templates/apiserver-deployment.yaml) and [Controller](https://github.com/kubernetes-sigs/service-catalog/blob/master/charts/catalog/templates/controller-manager-deployment.yaml)
+`fooEnabled` with a value of `false` in [values.yaml](https://github.com/kubernetes-sigs/service-catalog/blob/master/charts/catalog-v0.2/values.yaml).  In the [API Server](https://github.com/kubernetes-sigs/service-catalog/blob/master/charts/catalog-v0.2/templates/apiserver-deployment.yaml) and [Controller](https://github.com/kubernetes-sigs/service-catalog/blob/master/charts/catalog-v0.2/templates/controller-manager-deployment.yaml)
 templates, add the new FeatureGate:
 {% raw %}
 ```yaml
@@ -456,7 +456,7 @@ If someone wants to install a unreleased version, they must build it locally.
 
 ## Deploying to Kubernetes
 
-Use the [`catalog` chart](../charts/catalog) to deploy the service
+Use the [`catalog` chart](../charts/catalog-v0.2) to deploy the service
 catalog into your cluster.  The easiest way to get started is to deploy into a
 cluster you regularly use and are familiar with.  One of the choices you can
 make when deploying the catalog is whether to make the API server store its
@@ -474,7 +474,7 @@ installed with the other standard installation options.
 From the root of this repository:
 
 ```
-helm install charts/catalog \
+helm install charts/catalog-v0.2 \
     --name catalog --namespace catalog \
     --set image=quay.io/kubernetes-service-catalog/service-catalog:canary
 ```