[camel-k] branch main updated: fix helm annotations and kamel_id

[ac...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git


The following commit(s) were added to refs/heads/main by this push:
     new 946be23a7 fix helm annotations and kamel_id
946be23a7 is described below

commit 946be23a77bf24f13e11cb35d4c3c20a9aae0e7b
Author: milan.kucera <mi...@gmail.com>
AuthorDate: Wed Oct 26 12:41:43 2022 +0200

    fix helm annotations and kamel_id
---
 helm/camel-k/templates/operator.yaml | 11 +++++++++++
 helm/camel-k/values.yaml             | 16 ++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/helm/camel-k/templates/operator.yaml b/helm/camel-k/templates/operator.yaml
index 585bea9f8..6b2b274a8 100644
--- a/helm/camel-k/templates/operator.yaml
+++ b/helm/camel-k/templates/operator.yaml
@@ -22,6 +22,10 @@ metadata:
     app: camel-k
     camel.apache.org/component: operator
     {{- include "camel-k.labels" . | nindent 4 }}
+  {{- with .Values.operator.annotations }}
+  annotations:
+    {{ toYaml . | nindent 4 }}
+  {{- end }}
   name: camel-k-operator
 spec:
   replicas: 1
@@ -37,6 +41,11 @@ spec:
         camel.apache.org/component: operator
         name: camel-k-operator
     spec:
+    {{- if .Values.operator.imagePullSecrets }}
+      imagePullSecrets:
+{{ toYaml .Values.operator.imagePullSecrets | indent 8 }}
+    {{- end }}
+
       containers:
         - command:
             - kamel
@@ -62,6 +71,8 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            - name: KAMEL_OPERATOR_ID
+              value: {{ .Values.operator.operatorId }}
           image: {{ .Values.operator.image }}
           imagePullPolicy: IfNotPresent
           livenessProbe:
diff --git a/helm/camel-k/values.yaml b/helm/camel-k/values.yaml
index e434bc76d..5ec69f135 100644
--- a/helm/camel-k/values.yaml
+++ b/helm/camel-k/values.yaml
@@ -29,7 +29,23 @@ operator:
   securityContext: {}
   tolerations: []
   logLevel: "info"
+  
+  ## Deployment annotations
+  annotations:
+  # prometheus.io/path: /metrics
+  # prometheus.io/port: '8080'
+  # prometheus.io/scrape: 'true' 
 
+  ## Optionally specify an array of imagePullSecrets.
+  ## Secrets must be manually created in the namespace.
+  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+  imagePullSecrets:
+  # - name: "image-pull-secret"
+  
+  # Default operator name 
+  operatorId: camel-k
+
+  
 platform:
   build:
     registry: {}