Skip to content

Commit

Permalink
Merge pull request kubernetes-sigs#452 from codenrhoden/gen-yaml-new-…
Browse files Browse the repository at this point in the history
…image

Update generate-yaml tools for new image location
  • Loading branch information
k8s-ci-robot authored Jul 24, 2019
2 parents 127436f + 86c4378 commit 9753c7b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion hack/generate-yaml.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ TPL_DIR=./cmd/clusterctl/examples/vsphere
OVERWRITE=
CLUSTER_NAME="${CLUSTER_NAME:-capv-mgmt-example}"
ENV_VAR_REQ=':?required'
CAPV_MANAGER_IMAGE="${CAPV_MANAGER_IMAGE:-gcr.io/cnx-cluster-api/vsphere-cluster-api-provider:latest}"
CAPV_MANAGER_IMAGE="${CAPV_MANAGER_IMAGE:-gcr.io/cluster-api-provider-vsphere/ci/manager:latest}"

usage() {
cat <<EOF
Expand Down
2 changes: 1 addition & 1 deletion hack/tools/generate-yaml/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ COPY ./cmd/clusterctl/examples/vsphere/*.template ./cmd/clusterctl/examples/vsph

# This build arg specifies the value of the -m flag for generate-yaml.sh, the
# CAPV manager image inserted into the generated provider components.
ARG CAPV_MANAGER_IMAGE=gcr.io/cnx-cluster-api/vsphere-cluster-api-provider:latest
ARG CAPV_MANAGER_IMAGE=gcr.io/cluster-api-provider-vsphere/ci/manager:latest
ENV CAPV_MANAGER_IMAGE=${CAPV_MANAGER_IMAGE}

# The YAML is always written to the /out directory. Mount the volumes there.
Expand Down

0 comments on commit 9753c7b

Please sign in to comment.