Add CLI instructions as required by the Marketplace

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

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

@@ -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/serviceaccount.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/preflight/templates/deployment.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/serviceaccount.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/values.yaml

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

chart/jetstacksecure-mp/templates/application.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/billing-agent-config.yml

@@ -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-deployment.yaml

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

chart/jetstacksecure-mp/values.yaml

@@ -11,27 +11,52 @@ cert-manager:
       create: false # see note (1)
   serviceAccount:
     create: false # see note (1)
+  image:
+    repository: marketplace.gcr.io/jetstack-public/jetstack-secure-for-cert-manager
+    tag: 1.1.0-gcm.1
+
+  acmesolver:
+    image:
+      repository: marketplace.gcr.io/jetstack-public/jetstack-secure-for-cert-manager/cert-manager-acmesolver
+      tag: 1.1.0-gcm.1
+
   webhook:
     serviceAccount:
       create: false # see note (1)
+    image:
+      repository: marketplace.gcr.io/jetstack-public/jetstack-secure-for-cert-manager/cert-manager-webhook
+      tag: 1.1.0-gcm.1
+
   cainjector:
     serviceAccount:
       create: false # see note (1)
+    image:
+      repository: marketplace.gcr.io/jetstack-public/jetstack-secure-for-cert-manager/cert-manager-cainjector
+      tag: 1.1.0-gcm.1
 
 google-cas-issuer:
   installCRDs: true
   serviceAccount:
     create: false # see note (1)
+  image:
+    repository: marketplace.gcr.io/jetstack-public/jetstack-secure-for-cert-manager/cert-manager-google-cas-issuer
+    tag: 1.1.0-gcm.1
 
 preflight:
   serviceAccount:
+    # name: foo
     create: false # see note (1)
   rbac:
     create: false # see note (1)
+  image:
+    repository: marketplace.gcr.io/jetstack-public/jetstack-secure-for-cert-manager/preflight
+    tag: 1.1.0-gcm.1
 
 ubbagent:
-  # reportingSecretName: "some-secret-name"
+  # By default, the reportingSecretName will be set to
+  #  ${helm-release}-license.
+  #
+  # reportingSecretName: chartname-license
   image:
-    {}
-    # tag: 1.1.0
-    # repository: gcr.io/jetstack-public/ubbagent
+    repository: marketplace.gcr.io/jetstack-public/jetstack-secure-for-cert-manager/ubbagent
+    tag: 1.1.0-gcm.1

cloudbuild.yaml

@@ -267,7 +267,7 @@ steps:
         done
         pod=$(kubectl -n "$ns" get pods -oname | grep "apptest-.*-deployer" | cut -d/ -f2)
 
-        kubectl wait -n "$ns" --for=condition=ready pod $pod
+        kubectl wait -n "$ns" --for=condition=ready --timeout=5m pod $pod
         kubectl logs -n "$ns" $pod -f --tail=-1
     waitFor:
       - check-cloud-marketplace-tools
@@ -292,13 +292,12 @@ steps:
         ns=$(kubectl get ns -oname  | grep apptest- | cut -d/ -f2)
 
         while : ; do
-          kubectl -n "$ns" get pods -oname | grep "apptest-.*-smoke-test-pod" && break
+          kubectl -n "$ns" get pods -oname | grep "smoke-test-pod" && break
           sleep 10
           done
-        pod=$(kubectl -n "$ns" get pods -oname | grep "apptest-.*-smoke-test-pod" | cut -d/ -f2)
 
-        kubectl wait -n "$ns" --for=condition=ready pod $pod
-        kubectl logs -n "$ns" $pod -f --tail=-1
+        kubectl wait -n "$ns" --for=condition=ready --timeout=5m pod smoke-test-pod
+        kubectl logs -n "$ns" smoke-test-pod -f --tail=-1
     waitFor:
       - check-cloud-marketplace-tools
       - push-deployer

data-test/schema.yaml

@@ -14,3 +14,11 @@ properties:
     default: $IMAGE
     x-google-property:
       type: IMAGE
+
+  # We had to disable preflight so that `mpdev verify` would not fail. It
+  # fails due to the fact that the preflight deployment never becomes
+  # "ready" since the secret "agent-credentials" and the configmap
+  # "agent-config" are absent from the cluster.
+  preflight.replicaCount:
+    type: integer
+    default: 0