Fix google-cas-issuer tag (was v0.1.0 but expected 0.1.0)

Signed-off-by: Maël Valais <[email protected]>

Author: maelvls

README.md

@@ -1,6 +1,5 @@
 
 # jsp-gcm
-=======
 
 # deployer
 
@@ -15,23 +14,28 @@ helm repo add jetstack https://charts.jetstack.io
 helm dependency build chart/jetstacksecure-mp
 ```
 
-=======
 ## Test
 
+Note: although cert-manager's tags are of the form "v1.1.0", we chose to
+use tags of the form "1.1.0" for the Google Marketplace for the sake of
+consistency.
+
 ```sh
 export REGISTRY=gcr.io/$(gcloud config get-value project | tr ':' '/')
 export APP_NAME=jetstack-secure
 
 docker pull quay.io/jetstack/cert-manager-controller:v1.1.0
 docker pull quay.io/jetstack/cert-manager-cainjector:v1.1.0
 docker pull quay.io/jetstack/cert-manager-webhook:v1.1.0
-docker tag quay.io/jetstack/cert-manager-controller:v1.1.0 $REGISTRY/$APP_NAME/cert-manager-controller:v1.1.0
-docker tag quay.io/jetstack/cert-manager-cainjector:v1.1.0 $REGISTRY/$APP_NAME/cert-manager-cainjector:v1.1.0
-docker tag quay.io/jetstack/cert-manager-webhook:v1.1.0 $REGISTRY/$APP_NAME/cert-manager-webhook:v1.1.0
-docker push $REGISTRY/$APP_NAME/cert-manager-controller:v1.1.0
-docker push $REGISTRY/$APP_NAME/cert-manager-cainjector:v1.1.0
-docker push $REGISTRY/$APP_NAME/cert-manager-webhook:v1.1.0
-
+docker pull quay.io/jetstack/cert-manager-google-cas-issuer:0.1.0
+docker tag quay.io/jetstack/cert-manager-controller:v1.1.0 $REGISTRY/$APP_NAME/cert-manager-controller:1.1.0
+docker tag quay.io/jetstack/cert-manager-cainjector:v1.1.0 $REGISTRY/$APP_NAME/cert-manager-cainjector:1.1.0
+docker tag quay.io/jetstack/cert-manager-webhook:v1.1.0 $REGISTRY/$APP_NAME/cert-manager-webhook:1.1.0
+docker tag quay.io/jetstack/cert-manager-google-cas-issuer:latest $REGISTRY/$APP_NAME/cert-manager-google-cas-issuer:0.1.0
+docker push $REGISTRY/$APP_NAME/cert-manager-controller:1.1.0
+docker push $REGISTRY/$APP_NAME/cert-manager-cainjector:1.1.0
+docker push $REGISTRY/$APP_NAME/cert-manager-webhook:1.1.0
+docker push $REGISTRY/$APP_NAME/cert-manager-google-cas-issuer:0.1.0
 
 # Install mpdev:
 docker run gcr.io/cloud-marketplace-tools/k8s/dev cat /scripts/dev > /tmp/mpdev && install /tmp/mpdev ~/bin

chart/jetstacksecure-mp/Chart.yaml

@@ -5,6 +5,8 @@ version: 1.1.0
 dependencies:
   - name: cert-manager
     version: 1.1.0
+    appVersion: v1.1.0
     repository: https://charts.jetstack.io
   - name: google-cas-issuer
+    appVersion: 0.1.0
     repository: ./charts/google-cas-issuer

chart/jetstacksecure-mp/charts/google-cas-issuer/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
 engine: gotpl
 name: google-cas-issuer
-version: 1.1.0
-appVersion: v0.1.0
+version: 0.1.0
+appVersion: 0.1.0

chart/jetstacksecure-mp/templates/application.yaml

@@ -8,7 +8,7 @@ metadata:
   labels:
     app.kubernetes.io/name: "{{ .Release.Name }}"
   annotations:
-    marketplace.cloud.google.com/deploy-info: '{"partner_id": "partner", "product_id": "jetstack-secure-platform", "partner_name": "Jetstack"}'
+    marketplace.cloud.google.com/deploy-info: '{"partner_id": "partner", "product_id": "jetstack-secure", "partner_name": "Jetstack"}'
 spec:
   descriptor:
     type: Jetstack Secure Platform

schema.yaml

@@ -42,6 +42,11 @@ x-google-marketplace:
         type: REPO_WITH_REGISTRY
       cert-manager.cainjector.image.tag:
         type: TAG
+    cert-manager-google-cas-issuer:
+      google-cas-issuer.image.repository:
+        type: REPO_WITH_REGISTRY
+      google-cas-issuer.image.tag:
+        type: TAG
 
   # Allow the deployer to create CRDs and webhook configurations
   # See https://github.com/GoogleCloudPlatform/marketplace-k8s-app-tools/blob/master/docs/schema.md#deployerserviceaccount