Merge branch 'release/0.0.5'

k8s-community · May 17, 2017 · f825f84 · f825f84
2 parents 0b46fd5 + 32cf37f
commit f825f84
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 20 deletions.
diff --git a/index.yaml b/index.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 entries:
  myapp:
- - created: 2017-05-16T23:43:48.373993053+07:00
+ - created: 2017-05-17T11:11:17.309870789+07:00
  description: A Helm chart template for Kubernetes charts repository
- digest: 466ac7f333a4e0306c18d41f37466cecf1f43da0903e85841a645bf73a76f188
+ digest: f18546f1b3708ed4b57c58662d0f220b2eead136b10a71019a345e9fbad0d7ba
  engine: gotpl
  home: https://k8s.community/
  maintainers:
@@ -13,6 +13,6 @@ entries:
  sources:
  - https://github.com/k8s-community/myapp
  urls:
- - https://k8s-community.github.io/mycharts/myapp-0.0.4.tgz
- version: 0.0.4
-generated: 2017-05-16T23:43:48.372922124+07:00
+ - https://k8s-community.github.io/mycharts/myapp-0.0.5.tgz
+ version: 0.0.5
+generated: 2017-05-17T11:11:17.308000297+07:00
diff --git a/myapp-0.0.4.tgz b/myapp-0.0.4.tgz
diff --git a/myapp-0.0.5.tgz b/myapp-0.0.5.tgz
diff --git a/myapp/Chart.yaml b/myapp/Chart.yaml
@@ -1,6 +1,6 @@
 name: myapp
 description: A Helm chart template for Kubernetes charts repository
-version: 0.0.4
+version: 0.0.5
 home: https://k8s.community/
 sources:
  - https://github.com/k8s-community/myapp

diff --git a/myapp/templates/ingress.yaml b/myapp/templates/ingress.yaml
@@ -3,7 +3,6 @@
 {{- $namespace := .Release.Namespace -}}
 {{- $serviceName := .Values.service.name -}}
 {{- $servicePort := .Values.service.externalPort -}}
-{{- $healthPort := .Values.service.healthPort -}}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
@@ -39,18 +38,6 @@ spec:
  {{- end }}
  serviceName: {{ printf "%s-%s" $serviceName "v0" | trunc 63 }}
  servicePort: {{ $servicePort }}
- {{- if $usePath }}
- {{- if eq $namespace "default" }}
- - path: /{{ $serviceName }}-info
- {{- else }}
- - path: /{{ $namespace }}/{{ $serviceName }}-info
- {{- end }}
- backend:
- {{- else }}
- - backend:
- {{- end }}
- serviceName: {{ printf "%s-%s" $serviceName "v0" | trunc 63 }}
- servicePort: {{ $healthPort }}
  {{- end -}}
  {{- if .Values.ingress.tls }}
  tls:

diff --git a/myapp/values.yaml b/myapp/values.yaml
@@ -27,7 +27,7 @@ image:
  ##
  registry: registry.k8s.community
  name: myapp
- tag: 0.0.4
+ tag: 0.0.5
 
  ## Docker Registry/Hub auth secret name, always use `registry-pull-secret` if registry inside if k8s
  ##