Merge pull request #27 from rimusz/update-charts

remove hardcoded namespace for contour, update gcloud-sqlproxy readme
rimusz · Dec 14, 2018 · 4a0d4e7 · 4a0d4e7
2 parents e888e63 + 6c125fc
commit 4a0d4e7
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 22 deletions.
diff --git a/stable/contour/Chart.yaml b/stable/contour/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 name: contour
 description: A Helm chart for Heptio Contour
-version: 0.2.3
+version: 0.2.4
 # Note that we use appVersion to get images tag, so make sure this is correct.
-appVersion: v0.8.0
+appVersion: v0.8.1
 source: https://github.com/rimusz/charts/blob/master/stable/contour
 home: https://github.com/heptio/contour
 keywords:

diff --git a/stable/contour/templates/NOTES.txt b/stable/contour/templates/NOTES.txt
@@ -2,28 +2,28 @@
 
 To verify that {{ template "contour.fullname" . }} has started, run:
 
-  kubectl --namespace={{ .Values.namespace }} get pods -l "app={{ template "contour.name" . }}"
+  kubectl --namespace={{ .Release.Namespace }} get pods -l "app={{ template "contour.name" . }}"
 
 2. Get your contour service URL:
 
 {{- if contains "LoadBalancer" .Values.service.type }}
 
   NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-        Watch the status with: 'kubectl get svc --namespace {{ .Values.namespace }} -w {{ template "contour.name" . }}'
+        Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "contour.name" . }}'
 
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Values.namespace }}  {{ template "contour.name" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }}  {{ template "contour.name" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   echo http://$SERVICE_IP
 
 {{- else if contains "ClusterIP"  .Values.service.type }}
 
-  export POD_NAME=$(kubectl get pods --namespace {{ .Values.namespace }}  -l "app={{ template "contour.name" . }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }}  -l "app={{ template "contour.name" . }}" -o jsonpath="{.items[0].metadata.name}")
   echo http://127.0.0.1:{{ .Values.service.externalPort }}
-  kubectl port-forward --namespace {{ .Values.namespace }} $POD_NAME {{ .Values.service.externalPort }}:{{ .Values.service.externalPort }}
+  kubectl port-forward --namespace {{ .Release.Namespace }} $POD_NAME {{ .Values.service.externalPort }}:{{ .Values.service.externalPort }}
 
 {{- else if contains "NodePort" .Values.service.type }}
 
-  export NODE_PORT=$(kubectl get --namespace {{ .Values.namespace }}  -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "contour.name" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Values.namespace }}  -o jsonpath="{.items[0].status.addresses[0].address}")
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }}  -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "contour.name" . }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }}  -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT/
 
 {{- end }}
diff --git a/stable/contour/templates/clusterrolebinding.yaml b/stable/contour/templates/clusterrolebinding.yaml
@@ -10,5 +10,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ template "contour.name" . }}
-    namespace: {{ .Values.namespace }}
+    namespace: {{ .Release.Namespace }}
 {{ end }}
diff --git a/stable/contour/templates/deployment.yaml b/stable/contour/templates/deployment.yaml
@@ -2,7 +2,6 @@ apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: {{ template "contour.fullname" . }}
-  namespace: {{ .Values.namespace }}
   labels:
     app: {{ template "contour.name" . }}
     chart: {{ template "contour.chart" . }}

diff --git a/stable/contour/templates/namespace.yaml b/stable/contour/templates/namespace.yaml
diff --git a/stable/contour/templates/service.yaml b/stable/contour/templates/service.yaml
@@ -3,7 +3,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "contour.fullname" . }}
-  namespace: {{ .Values.namespace }}
   labels:
     app: {{ template "contour.name" . }}
     chart: {{ template "contour.chart" . }}

diff --git a/stable/contour/templates/serviceaccount.yaml b/stable/contour/templates/serviceaccount.yaml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ template "contour.fullname" . }}
-  namespace: {{ .Values.namespace }}
   labels:
     app: {{ template "contour.name" . }}
     chart: {{ template "contour.chart" . }}

diff --git a/stable/contour/values.yaml b/stable/contour/values.yaml
@@ -51,9 +51,6 @@ resources: {}
   #  cpu: 100m
   #  memory: 128Mi
 
-# Default namespace
-namespace: heptio-contour
-
 # RBAC manifests management
 rbac:
   enabled: true

diff --git a/stable/gcloud-sqlproxy/Chart.yaml b/stable/gcloud-sqlproxy/Chart.yaml
@@ -15,4 +15,4 @@ maintainers:
 name: gcloud-sqlproxy
 sources:
 - https://github.com/rimusz/charts
-version: 0.6.3
+version: 0.6.4
diff --git a/stable/gcloud-sqlproxy/README.md b/stable/gcloud-sqlproxy/README.md
@@ -17,7 +17,7 @@ You need to enable Cloud SQL Administration API and create a service account for
 - Kubernetes cluster on Google Container Engine (GKE)
 - Kubernetes cluster on Google Compute Engine (GCE)
 - Cloud SQL Administration API enabled
-- GCP Service account for the proxy.
+- GCP Service account for the proxy with `Cloud SQL Admin` role, and `Cloud SQL Admin API` enabled. 
 
 ## Installing the Chart