Automatically set the Application icon during install

The manual installation instructions missed this step resulting in a
broken icon. The icon source and tools needed to render it are already
included in the installer image.

Issue: [ch6131]

Author: cbandy

installers/gcp-marketplace/Dockerfile

@@ -38,9 +38,7 @@ COPY installers/gcp-marketplace/test-pod.yaml \
      /data-test/manifest/
 
 ARG PGO_VERSION
-RUN env OPERATOR_ICON_BASE64="$(base64 --wrap=0 /opt/postgres-operator/favicon.png)" envsubst '$OPERATOR_ICON_BASE64' \
-    < /data/manifest/application.yaml > /tmp/sponge && mv /tmp/sponge /data/manifest/application.yaml \
- && for file in \
+RUN for file in \
       /data/schema.yaml \
       /data/manifest/application.yaml \
     ; do envsubst '$PGO_VERSION' < "$file" > /tmp/sponge && mv /tmp/sponge "$file" ; done

installers/gcp-marketplace/application.yaml

@@ -4,9 +4,6 @@ metadata:
   name: '${OPERATOR_NAME}'
   labels:
     app.kubernetes.io/name: '${OPERATOR_NAME}'
-  annotations:
-    kubernetes-engine.cloud.google.com/icon: >-
-      data:image/png;base64,${OPERATOR_ICON_BASE64}
 spec:
   selector:
     matchLabels:

installers/gcp-marketplace/install-hook.sh

@@ -4,8 +4,8 @@ set -eu
 
 kc() { kubectl --namespace="$NAMESPACE" "$@"; }
 
-application_metadata="$( kc get "applications.app.k8s.io/$NAME" --output=json )"
-application_metadata="$( jq <<< "$application_metadata" '{ metadata: {
+application_ownership="$( kc get "applications.app.k8s.io/$NAME" --output=json )"
+application_ownership="$( jq <<< "$application_ownership" '{ metadata: {
 	labels: { "app.kubernetes.io/name": .metadata.name },
 	ownerReferences: [{
 		apiVersion, kind, name: .metadata.name, uid: .metadata.uid
@@ -23,18 +23,18 @@ installer="$( /bin/config_env.py envsubst < /opt/postgres-operator/install-job.y
 inventory="$( /bin/config_env.py envsubst < /opt/postgres-operator/inventory.ini )"
 
 kc create --filename=/dev/stdin <<< "$installer"
-kc patch job/install-postgres-operator --type=strategic --patch="$application_metadata"
+kc patch job/install-postgres-operator --type=strategic --patch="$application_ownership"
 
-job_metadata="$( kc get job/install-postgres-operator --output=json )"
-job_metadata="$( jq <<< "$job_metadata" '{ metadata: {
+job_ownership="$( kc get job/install-postgres-operator --output=json )"
+job_ownership="$( jq <<< "$job_ownership" '{ metadata: {
 	labels: { "app.kubernetes.io/name": .metadata.labels["app.kubernetes.io/name"] },
 	ownerReferences: [{
 		apiVersion, kind, name: .metadata.name, uid: .metadata.uid
 	}]
 } }' )"
 
 kc create secret generic install-postgres-operator --from-file=inventory=/dev/stdin <<< "$inventory"
-kc patch secret/install-postgres-operator --type=strategic --patch="$job_metadata"
+kc patch secret/install-postgres-operator --type=strategic --patch="$job_ownership"
 
 # Wait for either status condition then terminate the other.
 kc wait --for=condition=complete --timeout=5m job/install-postgres-operator &

installers/gcp-marketplace/install.sh

@@ -4,8 +4,8 @@ set -eu
 
 kc() { kubectl --namespace="$NAMESPACE" "$@"; }
 
-application_metadata="$( kc get "applications.app.k8s.io/$NAME" --output=json )"
-application_metadata="$( jq <<< "$application_metadata" '{ metadata: {
+application_ownership="$( kc get "applications.app.k8s.io/$NAME" --output=json )"
+application_ownership="$( jq <<< "$application_ownership" '{ metadata: {
 	labels: { "app.kubernetes.io/name": .metadata.name },
 	ownerReferences: [{
 		apiVersion, kind, name: .metadata.name, uid: .metadata.uid
@@ -19,6 +19,13 @@ if [ -n "$existing" ]; then
 	exit 1
 fi
 
+application_icon="$( base64 --wrap=0 /opt/postgres-operator/favicon.png )"
+application_metadata="$( jq <<< '{}' --arg icon "$application_icon" '{ metadata: {
+	annotations: { "kubernetes-engine.cloud.google.com/icon": "data:image/png;base64,\($icon)" }
+} }' )"
+
+kc patch "applications.app.k8s.io/$NAME" --type=merge --patch="$application_metadata"
+
 /usr/bin/ansible-playbook --tags=install /opt/postgres-operator/ansible/main.yml
 
 resources=(
@@ -37,5 +44,5 @@ resources=(
 )
 
 for resource in "${resources[@]}"; do
-	kc patch "$resource" --type=strategic --patch="$application_metadata"
+	kc patch "$resource" --type=strategic --patch="$application_ownership"
 done