feat: Add additional labels + configmap hash to annotation

vrenaville · Jul 22, 2021 · 4b8fc34 · 4b8fc34
1 parent 5306f08
commit 4b8fc34
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 22 deletions.
diff --git a/index.yaml b/index.yaml
@@ -2,7 +2,16 @@ apiVersion: v1
 entries:
   odoo:
   - apiVersion: v2
-    created: "2021-06-22T16:59:11.806954205+02:00"
+    created: "2021-07-22T10:01:09.150001917+02:00"
+    description: A Helm chart to deploy Odoo on CampToCamp own platform
+    digest: 73e2b2b17406d16e408e52de3f11bea19c19c0a893b68395420522e8f9833781
+    name: odoo
+    type: application
+    urls:
+    - odoo-0.1.17.tgz
+    version: 0.1.17
+  - apiVersion: v2
+    created: "2021-07-22T10:01:09.149354974+02:00"
     description: A Helm chart to deploy Odoo on CampToCamp own platform
     digest: ef55df3dbbfa404141a0bf5805cb168ad518078fe2b1f47e8ed4385334548d1f
     name: odoo
@@ -11,7 +20,7 @@ entries:
     - odoo-0.1.16.tgz
     version: 0.1.16
   - apiVersion: v2
-    created: "2021-06-22T16:59:11.806374971+02:00"
+    created: "2021-07-22T10:01:09.148686166+02:00"
     description: A Helm chart to deploy Odoo on CampToCamp own platform
     digest: c2d08c081747bbb41cbf1a721363af3376e3f2ecb18c83c8edd77217f66de936
     name: odoo
@@ -20,7 +29,7 @@ entries:
     - odoo-0.1.15.tgz
     version: 0.1.15
   - apiVersion: v2
-    created: "2021-06-22T16:59:11.805790718+02:00"
+    created: "2021-07-22T10:01:09.14801091+02:00"
     description: A Helm chart to deploy Odoo on CampToCamp own platform
     digest: 5520f56544cd612978a9744f64b83ced596d28385ef789f1d6287671e241f695
     name: odoo
@@ -29,7 +38,7 @@ entries:
     - odoo-0.1.14.tgz
     version: 0.1.14
   - apiVersion: v2
-    created: "2021-06-22T16:59:11.805218413+02:00"
+    created: "2021-07-22T10:01:09.147308364+02:00"
     description: A Helm chart to deploy Odoo on CampToCamp own platform
     digest: c8fa7b1a5dce96f76d5f623dc4da9c05f5c17089903e0a01c0b6f53e4a27bc5d
     name: odoo
@@ -38,7 +47,7 @@ entries:
     - odoo-0.1.13.tgz
     version: 0.1.13
   - apiVersion: v2
-    created: "2021-06-22T16:59:11.804474818+02:00"
+    created: "2021-07-22T10:01:09.146686964+02:00"
     description: A Helm chart to deploy Odoo on CampToCamp own platform
     digest: 2fdac3fe4bbaaf5d6b53cea67dfbb419ae61fd498e74afdfc9fa117d5822a4e9
     name: odoo
@@ -47,7 +56,7 @@ entries:
     - odoo-0.1.12.tgz
     version: 0.1.12
   - apiVersion: v2
-    created: "2021-06-22T16:59:11.803559279+02:00"
+    created: "2021-07-22T10:01:09.146077254+02:00"
     description: A Helm chart to deploy Odoo on CampToCamp own platform
     digest: 961df501778f391db9139f65a61c078b4b321caf0f1491e6d43b620a6213cb6b
     name: odoo
@@ -56,7 +65,7 @@ entries:
     - odoo-0.1.11.tgz
     version: 0.1.11
   - apiVersion: v2
-    created: "2021-06-22T16:59:11.802894515+02:00"
+    created: "2021-07-22T10:01:09.1455161+02:00"
     description: A Helm chart to deploy Odoo on CampToCamp own platform
     digest: a3a0be3af149491d5e01f24f4132599bbea452c489d8e52e672168c84184e0ce
     name: odoo
@@ -65,7 +74,7 @@ entries:
     - odoo-0.1.10.tgz
     version: 0.1.10
   - apiVersion: v2
-    created: "2021-06-22T16:59:11.813664534+02:00"
+    created: "2021-07-22T10:01:09.154447125+02:00"
     description: A Helm chart to deploy Odoo on CampToCamp own platform
     digest: a0292027c9e6f8cf18dbdffa9a9ebb9e82fbcc3a0510cf6f3ac0a9196a9d055e
     name: odoo
@@ -74,7 +83,7 @@ entries:
     - odoo-0.1.9.tgz
     version: 0.1.9
   - apiVersion: v2
-    created: "2021-06-22T16:59:11.813125818+02:00"
+    created: "2021-07-22T10:01:09.153908154+02:00"
     description: A Helm chart to deploy Odoo on CampToCamp own platform
     digest: 4715fd1c39ddd3fb2fc4dfbb6a24072d4d40735956652060518936411c0c5f88
     name: odoo
@@ -83,7 +92,7 @@ entries:
     - odoo-0.1.8.tgz
     version: 0.1.8
   - apiVersion: v2
-    created: "2021-06-22T16:59:11.812602278+02:00"
+    created: "2021-07-22T10:01:09.153328978+02:00"
     description: A Helm chart to deploy Odoo on CampToCamp own platform
     digest: 1a17252a2bd6244975291a72ed4c014e64c580498735031ed41ac5b62c417a49
     name: odoo
@@ -92,7 +101,7 @@ entries:
     - odoo-0.1.7.tgz
     version: 0.1.7
   - apiVersion: v2
-    created: "2021-06-22T16:59:11.812051036+02:00"
+    created: "2021-07-22T10:01:09.15276973+02:00"
     description: A Helm chart to deploy Odoo on CampToCamp own platform
     digest: d73ce283c8e8072ab1299f3cd9f0175966186faa7129a587b3934cf42f7e7388
     name: odoo
@@ -101,7 +110,7 @@ entries:
     - odoo-0.1.6.tgz
     version: 0.1.6
   - apiVersion: v2
-    created: "2021-06-22T16:59:11.811453966+02:00"
+    created: "2021-07-22T10:01:09.152234242+02:00"
     description: A Helm chart to deploy Odoo on CampToCamp own platform
     digest: c09f449866444d86bcad7d0b0e9c1afa2899baf7ea9ad5c32b378b3c7f33c473
     name: odoo
@@ -111,7 +120,7 @@ entries:
     version: 0.1.5
   - apiVersion: v2
     appVersion: 1.16.0
-    created: "2021-06-22T16:59:11.809249057+02:00"
+    created: "2021-07-22T10:01:09.151686389+02:00"
     description: A Helm chart to deploy Odoo on CampToCamp own platform
     digest: 14583843d2af28dff05d4ad001d2f501efe03b9f235028576c38ec4b784dc45b
     name: odoo
@@ -121,7 +130,7 @@ entries:
     version: 0.1.4
   - apiVersion: v2
     appVersion: 1.16.0
-    created: "2021-06-22T16:59:11.808396637+02:00"
+    created: "2021-07-22T10:01:09.151118751+02:00"
     description: A Helm chart to deploy Odoo on CampToCamp own platform
     digest: cab7c5252872d8fbb534ca81d10ec2080139ffd259473636cdff4cbddd0126e8
     name: odoo
@@ -131,7 +140,7 @@ entries:
     version: 0.1.3
   - apiVersion: v2
     appVersion: 1.16.0
-    created: "2021-06-22T16:59:11.807451841+02:00"
+    created: "2021-07-22T10:01:09.150561879+02:00"
     description: A Helm chart to deploy Odoo on CampToCamp own platform
     digest: fda4a995b38ec11c0b7efb6eec4d44159628f80cf486edee19447919411e5620
     name: odoo
@@ -141,7 +150,7 @@ entries:
     version: 0.1.2
   - apiVersion: v2
     appVersion: 1.16.0
-    created: "2021-06-22T16:59:11.80219746+02:00"
+    created: "2021-07-22T10:01:09.144935562+02:00"
     description: A Helm chart to deploy Odoo on CampToCamp own platform
     digest: 45d785866dfcae93764ace54ae0c1e77ab6f80a685d85ccf7ce3d51fe7db025b
     name: odoo
@@ -151,12 +160,12 @@ entries:
     version: 0.1.1
   - apiVersion: v2
     appVersion: 1.16.0
-    created: "2021-06-22T16:59:11.801673579+02:00"
+    created: "2021-07-22T10:01:09.142837738+02:00"
     description: A Helm chart for Kubernetes
     digest: 338af58ab05bd752f34209cc2cde809577857dd4299c459365a5b8edbbe9a517
     name: odoo
     type: application
     urls:
     - odoo-0.1.0.tgz
     version: 0.1.0
-generated: "2021-06-22T16:59:11.801025323+02:00"
+generated: "2021-07-22T10:01:09.142081227+02:00"
diff --git a/odoo-0.1.17.tgz b/odoo-0.1.17.tgz
diff --git a/odoo/Chart.yaml b/odoo/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 name: odoo
 description: A Helm chart to deploy Odoo on CampToCamp own platform
 type: application
-version: 0.1.16
+version: 0.1.17
diff --git a/odoo/templates/deployment.yaml b/odoo/templates/deployment.yaml
@@ -12,10 +12,13 @@ spec:
       {{- include "odoo.selectorLabels" . | nindent 6 }}
   template:
     metadata:
+      annotations:
+        config-hash: {{ include (print $.Template.BasePath "/config-odoo.yaml") $ | sha256sum | trunc 63 }}
       labels:
         {{- include "odoo.selectorLabels" . | nindent 8 }}
-        aadpodidbinding: azure-pod-identity-binding-selector
-        config-hash: {{ include (print $.Template.BasePath "/config-odoo.yaml") $ | sha256sum | trunc 63 }}
+        {{- with .Values.additionalLabels }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
@@ -78,9 +81,13 @@ spec:
       queuejob: "true"
   template:
     metadata:
+      annotations:
+        config-hash: {{ include (print $.Template.BasePath "/config-odoo.yaml") $ | sha256sum | trunc 63 }}
       labels:
         {{- include "odoo.selectorLabels" . | nindent 8 }}
-        aadpodidbinding: azure-pod-identity-binding-selector
+        {{- with .Values.additionalLabels }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
         queuejob: "true"
     spec:
       {{- with .Values.imagePullSecrets }}

diff --git a/odoo/values.yaml b/odoo/values.yaml
@@ -55,6 +55,9 @@ nodeSelector: {}
 tolerations: []
 affinity: {}
 
+additionalLabels: {}
+  # aadpodidbinding: some-identity
+
 odoo:
   customerName: customer
   env: integration