Apply the ubbagent patch

Signed-off-by: Richard Wall <[email protected]>

Author: wallrj

chart/jetstack-secure-gcm/charts/cert-manager/templates/deployment.yaml

@@ -63,10 +63,15 @@ spec:
         {{- toYaml .Values.securityContext | nindent 8 }}
         {{- end }}
       {{- end }}
-      {{- with .Values.volumes }}
       volumes:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
+        # GCM-specific volume added by Mael. DO NOT REMOVE when updating the
+        # Helm chart.
+        - name: ubbagent-config
+          configMap:
+            name: ubbagent-config
+        {{- if .Values.volumes }}
+{{ toYaml .Values.volumes | indent 8 }}
+        {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           {{- with .Values.image }}
@@ -146,6 +151,40 @@ spec:
           resources:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+
+        # GCM-specific container added by Mael. DO NOT REMOVE when updating the
+        # Helm chart.
+        - name: ubbagent
+          image: "{{ .Values.ubbagent.image.repository }}:{{ .Values.ubbagent.image.tag }}"
+          env:
+            - name: AGENT_CONFIG_FILE
+              value: "/etc/ubbagent/config.yaml"
+            - name: AGENT_LOCAL_PORT
+              value: "4567"
+            - name: AGENT_ENCODED_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: {{ default (print (.Release.Name | trunc 63 | trimSuffix "-") "-license") .Values.ubbagent.reportingSecretName }}
+                  key: reporting-key
+            - name: AGENT_CONSUMER_ID
+              valueFrom:
+                secretKeyRef:
+                  name: {{ default (print (.Release.Name | trunc 63 | trimSuffix "-") "-license") .Values.ubbagent.reportingSecretName }}
+                  key: consumer-id
+          volumeMounts:
+            - name: ubbagent-config
+              mountPath: /etc/ubbagent
+          resources:
+            limits:
+              cpu: 200m
+              memory: 100Mi
+            requests:
+              cpu: 10m
+              memory: 20Mi
+          securityContext:
+            runAsUser: 1001
+            runAsNonRoot: true
+
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

chart/jetstack-secure-gcm/charts/cert-manager/values.yaml

@@ -1,3 +1,14 @@
+# GCM-specific Helm values added by Mael. DO NOT REMOVE when updating the
+# Helm chart.
+ubbagent:
+  # By default, the reportingSecretName will be set to
+  #  ${helm-release}-license.
+  #
+  # reportingSecretName: chartname-license
+  image:
+    repository: gcr.io/cloud-marketplace-tools/metering/ubbagent
+    tag: latest
+
 # Default values for cert-manager.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.