diff --git a/stable/sensu/Chart.yaml b/stable/sensu/Chart.yaml index d1626c77152d..59971f96bd4f 100755 --- a/stable/sensu/Chart.yaml +++ b/stable/sensu/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: sensu -version: 0.1.3 +version: 0.2.0 description: Sensu monitoring framework backed by the Redis transport keywords: - sensu diff --git a/stable/sensu/templates/NOTES.txt b/stable/sensu/templates/NOTES.txt index e08070912be9..731f685a3663 100644 --- a/stable/sensu/templates/NOTES.txt +++ b/stable/sensu/templates/NOTES.txt @@ -3,18 +3,18 @@ Getting Started: 1. Get the Sensu API URL to visit by running these commands in the same shell: {{- if contains "NodePort" .Values.serviceType }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "fullname" . }}) + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "sensu.fullname" . }}) export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") echo http://$NODE_IP:$NODE_PORT {{- else if contains "LoadBalancer" .Values.serviceType }} **** NOTE: It may take a few minutes for the LoadBalancer IP to be available. **** -**** You can watch the status of by running 'kubectl get svc -w {{ template "fullname" . }}' **** - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') +**** You can watch the status of by running 'kubectl get svc -w {{ template "sensu.fullname" . }}' **** + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "sensu.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') echo http://$SERVICE_IP:{{ .Values.httpPort }}/login {{- else if contains "ClusterIP" .Values.serviceType }} echo 'API endpoints docs at https://sensuapp.org/docs/0.24/api/health-and-info-api.html' - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "fullname" . }}" -o jsonpath="{.items[0].metadata.name}") + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "sensu.fullname" . }}" -o jsonpath="{.items[0].metadata.name}") echo http://127.0.0.1:4567/info kubectl port-forward $POD_NAME 4567:4567 {{- end }} diff --git a/stable/sensu/templates/_helpers.tpl b/stable/sensu/templates/_helpers.tpl index 352f2fc6471f..46bf4bc468e2 100644 --- a/stable/sensu/templates/_helpers.tpl +++ b/stable/sensu/templates/_helpers.tpl @@ -2,7 +2,7 @@ {{/* Expand the name of the chart. */}} -{{- define "name" -}} +{{- define "sensu.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} @@ -10,7 +10,7 @@ Expand the name of the chart. Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} -{{- define "redis.fullname" -}} +{{- define "sensu.redis.fullname" -}} {{- printf "%s-%s" .Release.Name "redis" | trunc 63 | trimSuffix "-" -}} {{- end -}} @@ -18,7 +18,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} -{{- define "fullname" -}} +{{- define "sensu.fullname" -}} {{- $name := default .Chart.Name .Values.nameOverride -}} {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} {{- end -}} diff --git a/stable/sensu/templates/deployment.yaml b/stable/sensu/templates/deployment.yaml index db5c0619efad..7be9f97465fc 100644 --- a/stable/sensu/templates/deployment.yaml +++ b/stable/sensu/templates/deployment.yaml @@ -1,7 +1,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: {{ template "fullname" . }} + name: {{ template "sensu.fullname" . }} labels: heritage: {{ .Release.Service | quote }} release: {{ .Release.Name | quote }} @@ -11,7 +11,7 @@ spec: template: metadata: labels: - app: {{ template "fullname" . }} + app: {{ template "sensu.fullname" . }} release: {{ .Release.Name | quote }} spec: containers: @@ -28,11 +28,11 @@ spec: - name: API_PORT value: '4567' - name: REDIS_HOST - value: {{ template "redis.fullname" . }} + value: {{ template "sensu.redis.fullname" . }} - name: REDIS_PASSWORD valueFrom: secretKeyRef: - name: {{ template "redis.fullname" . }} + name: {{ template "sensu.redis.fullname" . }} key: redis-password - name: REDIS_DB value: {{ .Values.REDIS_DB | quote }} @@ -51,11 +51,11 @@ spec: {{ toYaml .Values.api.resources | indent 10 }} env: - name: REDIS_HOST - value: {{ template "redis.fullname" . }} + value: {{ template "sensu.redis.fullname" . }} - name: REDIS_PASSWORD valueFrom: secretKeyRef: - name: {{ template "redis.fullname" . }} + name: {{ template "sensu.redis.fullname" . }} key: redis-password - name: REDIS_DB value: {{ .Values.REDIS_DB | quote }} diff --git a/stable/sensu/templates/svc.yaml b/stable/sensu/templates/svc.yaml index ca1498899993..69106e33d031 100644 --- a/stable/sensu/templates/svc.yaml +++ b/stable/sensu/templates/svc.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "fullname" . }} + name: {{ template "sensu.fullname" . }} labels: heritage: {{ .Release.Service | quote }} release: {{ .Release.Name | quote }} @@ -17,4 +17,4 @@ spec: - port: {{ .Values.httpPort }} targetPort: 4567 selector: - app: {{ template "fullname" . }} + app: {{ template "sensu.fullname" . }}