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

Revert "Merge pull request #290 from jackgr/release-prep"

Browse Source 
This reverts commit c3ee20302f, reversing
changes made to 69f3b1d9b2.
pull/291/head
Adam Reese 9 years ago
parent c3ee20302f
commit 8e3034cde0
25 changed files with 41 additions and 47 deletions
Show Stats Download Patch File Download Diff File

2
chart/testdata/frobnitz/templates/wordpress.jinja vendored
Unescape View File

@ -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 %}

2
chart/testdata/frobnitz/templates/wordpress.jinja.schema vendored
Unescape View File

@ -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

2
chart/testdata/ill/templates/wordpress.jinja vendored
Unescape View File

@ -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 %}

2
chart/testdata/ill/templates/wordpress.jinja.schema vendored
Unescape View File

@ -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

12
dm/Makefile
Unescape View File

@ -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-*

4
dm/dm.go
Unescape View File

@ -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 {

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:
* 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
```

6
examples/bootstrap/bootstrap.yaml
Unescape View File

@ -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

2
examples/wordpress/README.md
Unescape View File

@ -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 %}

2
examples/wordpress/wordpress.jinja
Unescape View File

@ -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 %}

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

@ -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

4
expandybird/test/ExpectedOutput.yaml
Unescape View File

@ -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

2
expandybird/test/InvalidFileName.yaml
Unescape View File

@ -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

2
expandybird/test/InvalidProperty.yaml
Unescape View File

@ -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

2
expandybird/test/InvalidTypeName.yaml
Unescape View File

@ -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

2
expandybird/test/MissingImports.yaml
Unescape View File

@ -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

2
expandybird/test/MissingResourceName.yaml
Unescape View File

@ -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

2
expandybird/test/MissingTypeName.yaml
Unescape View File

@ -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

BIN
expandybird/test/TestArchive.tar
View File

Binary file not shown.

2
expandybird/test/ValidContent.yaml
Unescape View File

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

8
get-install.sh
Unescape View File

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

12
hack/dm-push.sh
Unescape View File

@ -17,23 +17,21 @@
# 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.
#
# Must have EDIT permissions on the dm-k8s-prod GCP project.
# Must have EDIT permissions on the dm-k8s-testing GCP project.
set -euo pipefail
DEFAULT_TAG=v1.2
DEFAULT_BINARY=${GOPATH}/bin/dm
DEFAULT_PLATFORM=$(uname | tr '[:upper:]' '[:lower:]')
DEFAULT_ARCH=$(uname -m)
PLATFORM=$(uname | tr '[:upper:]' '[:lower:]')
ARCH=$(uname -m)
STORAGE_BUCKET=gs://get-dm
ZIP=dm-${TAG:-DEFAULT_TAG}-${PLATFORM:-DEFAULT_PLATFORM}-${ARCH:-DEFAULT_ARCH}.zip
ZIP=dm-latest-${PLATFORM}-${ARCH}.zip
echo "Building..."
make
echo "Zipping ${ZIP}..."
zip -j ${ZIP} ${BINARY:-DEFAULT_BINARY} install.yaml
zip -j ${ZIP} ${GOPATH}/bin/dm install.yaml
echo "Uploading ${ZIP} to ${STORAGE_BUCKET}..."
gsutil cp ${ZIP} ${STORAGE_BUCKET}

2
include.mk
Unescape View File

@ -5,7 +5,7 @@ info:
@echo "Project: ${PROJECT}"
@echo "Image: ${IMAGE}"
TAG ?= $(shell echo `date +"%s"`_`date +"%N"`)
TAG := $(shell echo `date +"%s"`_`date +"%N"`)
.PHONY: test-unit
test-unit:

6
install.yaml
Unescape View File

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

2
util/templateutil_test.go
Unescape View File

@ -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/dm-k8s-testing/expandybird
labels:
app: expandybird
`

Write Preview
Loading…
Cancel
Save