Merge pull request #22 from jetstack/add-cli-instructions

Add CLI instructions as required by the Marketplace

Author: jetstack-bot

Dockerfile

@@ -23,6 +23,5 @@ RUN cd /tmp/data-test \
         && tar -czvf /tmp/data-test/chart.tar.gz chart \
         && mv chart.tar.gz /data-test/chart/
 
-
 # If you wonder what magic is this, take a look at:
 # https://github.com/GoogleCloudPlatform/marketplace-k8s-app-tools/blob/4335f9/marketplace/deployer_helm_base/onbuild/Dockerfile#L16-L20

README.md

@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "google-cas-issuer.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "google-cas-issuer.labels" . | nindent 4 }}
 spec:

chart/jetstacksecure-mp/charts/google-cas-issuer/templates/deployment.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "google-cas-issuer.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "google-cas-issuer.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}

chart/jetstacksecure-mp/charts/google-cas-issuer/templates/serviceaccount.yaml

@@ -1,8 +1,8 @@
-{{ if not "disabled-for-now-due-to-missing-configmap" }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "preflight.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "preflight.labels" . | nindent 4 }}
 spec:
@@ -48,4 +48,3 @@ spec:
           readOnly: true
         resources:
           {{- toYaml .Values.resources | nindent 10 }}
-{{- end }}

chart/jetstacksecure-mp/charts/preflight/templates/deployment.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "preflight.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "preflight.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}

chart/jetstacksecure-mp/charts/preflight/templates/serviceaccount.yaml

@@ -5,7 +5,7 @@ image:
 
 serviceAccount:
   create: false
-  name: agent
+  # name: ""
   annotations: {}
 
 rbac:

chart/jetstacksecure-mp/charts/preflight/values.yaml

@@ -13,9 +13,13 @@ spec:
   descriptor:
     type: Jetstack Secure Platform
     version: "1.1.0-gcm.1" # Must be the same as in the schema.yaml file.
+    icons:
+      - src: https://platform.jetstack.io/logo_icon.png
+        size: 458x500
+        type: image/png
   selector:
     matchLabels:
-      app.kubernetes.io/name: "{{ .Release.Name }}"
+      app.kubernetes.io/instance: "{{ .Release.Name }}"
   addOwnerRef: true
   componentKinds:
     - group: ""

chart/jetstacksecure-mp/templates/application.yaml

@@ -2,10 +2,13 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: "ubbagent-config"
+  namespace: "{{ .Release.Namespace }}"
   labels:
     helm.sh/chart: "{{ .Chart.Name  }}"
     app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
     app.kubernetes.io/component: ubbagent
+    app.kubernetes.io/instance: "{{ .Release.Name | trunc 63 | trimSuffix "-" }}"
+
 data:
   config.yaml: |
     # The identity section contains authentication information used

chart/jetstacksecure-mp/templates/billing-agent-config.yml

@@ -2,10 +2,12 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ .Release.Name | trunc 63 | trimSuffix "-" }}-ubbagent
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     helm.sh/chart: {{ .Chart.Name  }}
     app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
     app.kubernetes.io/name: {{ .Release.Name | trunc 63 | trimSuffix "-" }}
+    app.kubernetes.io/instance: {{ .Release.Name | trunc 63 | trimSuffix "-" }}
     app.kubernetes.io/component: ubbagent
 spec:
   replicas: 1
@@ -30,12 +32,12 @@ spec:
             - name: AGENT_ENCODED_KEY
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.ubbagent.reportingSecretName }}
+                  name: {{ default (print (.Release.Name | trunc 63 | trimSuffix "-") "-license") .Values.ubbagent.reportingSecretName }}
                   key: reporting-key
             - name: AGENT_CONSUMER_ID
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.ubbagent.reportingSecretName }}
+                  name: {{ default (print (.Release.Name | trunc 63 | trimSuffix "-") "-license") .Values.ubbagent.reportingSecretName }}
                   key: consumer-id
           volumeMounts:
             - name: ubbagent-config