msb-public
/
helm
mirror of https://github.com/helm/helm
1
0
Code Issues Projects Releases Wiki Activity

Merge pull request #313 from jackgr/restore-290

Browse Source 
Restore #290
pull/325/head
Jack Greenfield 9 years ago
parent 8961483cce 42a134f8f3
commit b829c0105b
24 changed files with 46 additions and 39 deletions
Show Stats Download Patch File Download Diff File

13
cmd/dm/Makefile
Unescape View File

@ -14,7 +14,7 @@
SHELL := /bin/bash 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 all: build binary
@ -22,13 +22,16 @@ build:
docker build -t dm . docker build -t dm .
binary: binary:
- docker rm -f dm
- rm -f dm-*
docker run --name dm dm docker run --name dm dm
for platform in $$GOLANG_CROSSPLATFORMS; do \ for platform in ${GOLANG_CROSSPLATFORMS}; do \
echo $$platform; \ echo $$platform; \
docker cp dm:/go/src/dm/dm-$${platform%/*}-$${platform##*/} .; \ docker cp dm:/go/src/dm/dm-$${platform%/*}-$${platform##*/} .; \
done done
clean: clean:
docker rm dm docker rm -f dm
docker rmi dm docker rmi -f dm
rm dm-* rm -f dm-*

2
cmd/dm/dm.go
Unescape View File

@ -288,7 +288,7 @@ func callService(path, method, action string, reader io.ReadCloser) {
var URL *url.URL var URL *url.URL
URL, err := url.Parse(*service) URL, err := url.Parse(*service)
if err != nil { 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, "/")

1
cmd/expandybird/Makefile
Unescape View File

@ -19,7 +19,6 @@ include ../include.mk
DOCKER_REGISTRY := gcr.io DOCKER_REGISTRY := gcr.io
PREFIX := $(DOCKER_REGISTRY)/$(PROJECT) PREFIX := $(DOCKER_REGISTRY)/$(PROJECT)
IMAGE := expandybird IMAGE := expandybird
TAG := latest
ROOT_DIR := $(abspath ./..) ROOT_DIR := $(abspath ./..)
DIR = $(ROOT_DIR) DIR = $(ROOT_DIR)

4
cmd/expandybird/test/ExpectedOutput.yaml
Unescape View File

@ -51,7 +51,7 @@ config:
spec: spec:
containers: containers:
- env: [] - env: []
image: gcr.io/dm-k8s-testing/expandybird image: gcr.io/dm-k8s-prod/expandybird
name: expandybird name: expandybird
ports: ports:
- containerPort: 8080 - containerPort: 8080
@ -63,7 +63,7 @@ layout:
properties: properties:
container_port: 8080 container_port: 8080
external_service: true external_service: true
image: gcr.io/dm-k8s-testing/expandybird image: gcr.io/dm-k8s-prod/expandybird
labels: labels:
app: expandybird app: expandybird
replicas: 3 replicas: 3

2
cmd/expandybird/test/InvalidFileName.yaml
Unescape View File

@ -19,4 +19,4 @@ resources:
properties: properties:
service_port: 8080 service_port: 8080
target_port: 8080 target_port: 8080
image: gcr.io/dm-k8s-testing/expandybird image: gcr.io/dm-k8s-prod/expandybird

2
cmd/expandybird/test/InvalidProperty.yaml
Unescape View File

@ -19,4 +19,4 @@ resources:
properties: properties:
service_port: 8080 service_port: 8080
target_port: 8080 target_port: 8080
invalidproperty: gcr.io/dm-k8s-testing/expandybird invalidproperty: gcr.io/dm-k8s-prod/expandybird

2
cmd/expandybird/test/InvalidTypeName.yaml
Unescape View File

@ -19,4 +19,4 @@ resources:
properties: properties:
service_port: 8080 service_port: 8080
target_port: 8080 target_port: 8080
image: gcr.io/dm-k8s-testing/expandybird image: gcr.io/dm-k8s-prod/expandybird

2
cmd/expandybird/test/MissingImports.yaml
Unescape View File

@ -18,4 +18,4 @@ resources:
properties: properties:
service_port: 8080 service_port: 8080
target_port: 8080 target_port: 8080
image: gcr.io/dm-k8s-testing/expandybird image: gcr.io/dm-k8s-prod/expandybird

2
cmd/expandybird/test/MissingResourceName.yaml
Unescape View File

@ -18,4 +18,4 @@ resources:
properties: properties:
service_port: 8080 service_port: 8080
target_port: 8080 target_port: 8080
image: gcr.io/dm-k8s-testing/expandybird image: gcr.io/dm-k8s-prod/expandybird

2
cmd/expandybird/test/MissingTypeName.yaml
Unescape View File

@ -18,4 +18,4 @@ resources:
properties: properties:
service_port: 8080 service_port: 8080
target_port: 8080 target_port: 8080
image: gcr.io/dm-k8s-testing/expandybird image: gcr.io/dm-k8s-prod/expandybird

BIN
cmd/expandybird/test/TestArchive.tar
View File

Binary file not shown.

2
cmd/expandybird/test/ValidContent.yaml
Unescape View File

@ -22,6 +22,6 @@ resources:
container_port: 8080 container_port: 8080
external_service: true external_service: true
replicas: 3 replicas: 3
image: gcr.io/dm-k8s-testing/expandybird image: gcr.io/dm-k8s-prod/expandybird
labels: labels:
app: expandybird app: expandybird

1
cmd/manager/Makefile
Unescape View File

@ -19,7 +19,6 @@ include ../include.mk
DOCKER_REGISTRY := gcr.io DOCKER_REGISTRY := gcr.io
PREFIX := $(DOCKER_REGISTRY)/$(PROJECT) PREFIX := $(DOCKER_REGISTRY)/$(PROJECT)
IMAGE := manager IMAGE := manager
TAG := latest
ROOT_DIR := $(abspath ./..) ROOT_DIR := $(abspath ./..)
DIR = $(ROOT_DIR) DIR = $(ROOT_DIR)

1
cmd/resourcifier/Makefile
Unescape View File

@ -21,7 +21,6 @@ include ../include.mk
DOCKER_REGISTRY := gcr.io DOCKER_REGISTRY := gcr.io
PREFIX := $(DOCKER_REGISTRY)/$(PROJECT) PREFIX := $(DOCKER_REGISTRY)/$(PROJECT)
IMAGE := resourcifier IMAGE := resourcifier
TAG := latest
ROOT_DIR := $(abspath ./..) ROOT_DIR := $(abspath ./..)
DIR = $(ROOT_DIR) DIR = $(ROOT_DIR)

4
docs/pushing.md
Unescape View File

@ -6,7 +6,7 @@ This details the requirements and steps for doing a DM push.
In order to build and push DM, you must: 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 `docker` installed and runnable in your current environment
* have `gcloud` installed * have `gcloud` installed
* have `gsutil` installed * have `gsutil` installed
@ -17,7 +17,7 @@ To build and push the service containers:
``` ```
$ cd ${GOPATH}/src/github.com/kubernetes/deployment-manager $ cd ${GOPATH}/src/github.com/kubernetes/deployment-manager
$ export PROJECT=dm-k8s-testing $ export PROJECT=dm-k8s-prod
$ make push $ make push
``` ```

6
examples/bootstrap/bootstrap.yaml
Unescape View File

@ -8,7 +8,7 @@ resources:
container_port: 8080 container_port: 8080
external_service: false external_service: false
replicas: 2 replicas: 2
image: gcr.io/dm-k8s-testing/expandybird:latest image: gcr.io/dm-k8s-prod/expandybird:latest
labels: labels:
app: dm app: dm
- name: resourcifier - name: resourcifier
@ -20,7 +20,7 @@ resources:
container_port: 8080 container_port: 8080
external_service: false external_service: false
replicas: 2 replicas: 2
image: gcr.io/dm-k8s-testing/resourcifier:latest image: gcr.io/dm-k8s-prod/resourcifier:latest
labels: labels:
app: dm app: dm
- name: manager - name: manager
@ -32,6 +32,6 @@ resources:
container_port: 8080 container_port: 8080
external_service: false external_service: false
replicas: 1 replicas: 1
image: gcr.io/dm-k8s-testing/manager:latest image: gcr.io/dm-k8s-prod/manager:latest
labels: labels:
app: dm app: dm

2
examples/wordpress/README.md
Unescape View File

@ -42,7 +42,7 @@ The template contains the following variables:
``` ```
{% set PROPERTIES = properties or {} %} {% 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 = PROPERTIES['nfs-server'] or {} %}
{% set NFS_SERVER_IP = NFS_SERVER['ip'] or '10.0.253.247' %} {% set NFS_SERVER_IP = NFS_SERVER['ip'] or '10.0.253.247' %}
{% set NFS_SERVER_PORT = NFS_SERVER['port'] or 2049 %} {% set NFS_SERVER_PORT = NFS_SERVER['port'] or 2049 %}

2
examples/wordpress/wordpress.jinja
Unescape View File

@ -1,5 +1,5 @@
{% set PROPERTIES = properties or {} %} {% 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 = PROPERTIES['nfs-server'] or {} %}
{% set NFS_SERVER_IP = NFS_SERVER['ip'] or '10.0.253.247' %} {% set NFS_SERVER_IP = NFS_SERVER['ip'] or '10.0.253.247' %}
{% set NFS_SERVER_PORT = NFS_SERVER['port'] or 2049 %} {% set NFS_SERVER_PORT = NFS_SERVER['port'] or 2049 %}

2
examples/wordpress/wordpress.jinja.schema
Unescape View File

@ -8,7 +8,7 @@ info:
properties: properties:
project: project:
type: string type: string
default: dm-k8s-testing default: dm-k8s-prod
description: Project location to load the images from. description: Project location to load the images from.
nfs-service: nfs-service:
type: object type: object

8
get-install.sh
Unescape View File

@ -15,11 +15,13 @@
set -euo pipefail set -euo pipefail
PLATFORM=$(uname | tr '[:upper:]' '[:lower:]') DEFAULT_TAG=v1.2
ARCH=$(uname -m) DEFAULT_BINARY=${GOPATH}/bin/dm
DEFAULT_PLATFORM=$(uname | tr '[:upper:]' '[:lower:]')
DEFAULT_ARCH=$(uname -m)
STORAGE_URL=http://get-dm.storage.googleapis.com 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}..." echo "Downloading ${ZIP}..."
curl -Ls "${STORAGE_URL}/${ZIP}" -O curl -Ls "${STORAGE_URL}/${ZIP}" -O

12
hack/dm-push.sh
Unescape View File

@ -17,21 +17,23 @@
# Run this from deployment-manager root to build and push the dm client plus # 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. # 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 set -euo pipefail
PLATFORM=$(uname | tr '[:upper:]' '[:lower:]') DEFAULT_TAG=v1.2
ARCH=$(uname -m) DEFAULT_BINARY=${GOPATH}/bin/dm
DEFAULT_PLATFORM=$(uname | tr '[:upper:]' '[:lower:]')
DEFAULT_ARCH=$(uname -m)
STORAGE_BUCKET=gs://get-dm 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..." echo "Building..."
make make
echo "Zipping ${ZIP}..." 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}..." echo "Uploading ${ZIP} to ${STORAGE_BUCKET}..."
gsutil cp ${ZIP} ${STORAGE_BUCKET} gsutil cp ${ZIP} ${STORAGE_BUCKET}

3
include.mk
Unescape View File

@ -4,3 +4,6 @@ info:
@echo "Registry: ${DOCKER_REGISTRY}" @echo "Registry: ${DOCKER_REGISTRY}"
@echo "Project: ${PROJECT}" @echo "Project: ${PROJECT}"
@echo "Image: ${IMAGE}" @echo "Image: ${IMAGE}"
TAG ?= $(shell echo `date +"%s"`_`date +"%N"`)

6
install.yaml
Unescape View File

@ -58,7 +58,7 @@ spec:
spec: spec:
containers: containers:
- env: [] - env: []
image: gcr.io/dm-k8s-testing/expandybird:latest image: gcr.io/dm-k8s-prod/expandybird:v1.2
name: expandybird name: expandybird
ports: ports:
- containerPort: 8080 - containerPort: 8080
@ -102,7 +102,7 @@ spec:
spec: spec:
containers: containers:
- env: [] - env: []
image: gcr.io/dm-k8s-testing/resourcifier:latest image: gcr.io/dm-k8s-prod/resourcifier:v1.2
imagePullPolicy: Always imagePullPolicy: Always
livenessProbe: livenessProbe:
httpGet: httpGet:
@ -153,7 +153,7 @@ spec:
spec: spec:
containers: containers:
- env: [] - env: []
image: gcr.io/dm-k8s-testing/manager:latest image: gcr.io/dm-k8s-prod/manager:v1.2
imagePullPolicy: Always imagePullPolicy: Always
livenessProbe: livenessProbe:
httpGet: httpGet:

2
pkg/util/templateutil_test.go
Unescape View File

@ -39,7 +39,7 @@ target_port: 8080
container_port: 8080 container_port: 8080
external_service: true external_service: true
replicas: 3 replicas: 3
image: gcr.io/dm-k8s-testing/expandybird image: gcr.io/dm-k8s-prod/expandybird
labels: labels:
app: expandybird app: expandybird
` `

Write Preview
Loading…
Cancel
Save