Merge pull request #7 from adRise/jmz/kiam-6.1.2

add kiam 6.1.2 source

charts/index.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 entries:
   airflow:
   - apiVersion: v1
-    created: "2021-05-20T15:55:08.050564+08:00"
+    created: "2024-07-02T16:40:52.385149+08:00"
     dependencies:
     - condition: postgresql.enabled
       name: postgresql
@@ -20,7 +20,7 @@ entries:
   consul:
   - apiVersion: v1
     appVersion: 1.7.2
-    created: "2021-05-20T15:55:08.054689+08:00"
+    created: "2024-07-02T16:40:52.387279+08:00"
     description: Official HashiCorp Consul Chart
     digest: e1c53fdf8644c271f047ac9c04794093cfd7fb245fd4a6b10c107a8ad659a227
     home: https://www.consul.io
@@ -33,9 +33,30 @@ entries:
     - https://adrise.github.io/helm-charts/charts/consul-0.20.1-1.tgz
     version: 0.20.1-1
   kiam:
+  - apiVersion: v1
+    appVersion: "4.2"
+    created: "2024-07-02T16:40:52.389886+08:00"
+    description: Integrate AWS IAM with Kubernetes
+    digest: 89b10dc7ea552364afe0abce90cd293ab194839805627b8fb675ec9f4b97faf0
+    home: https://github.com/uswitch/kiam
+    icon: https://user-images.githubusercontent.com/44974642/63503185-ee2ce880-c4c6-11e9-9a65-c398db914289.png
+    keywords:
+    - kiam
+    - aws
+    - iam
+    - security
+    maintainers:
+    - email: [email protected]
+      name: uswitch
+    name: kiam
+    sources:
+    - https://github.com/uswitch/kiam
+    urls:
+    - https://adrise.github.io/helm-charts/charts/kiam-6.1.2.tgz
+    version: 6.1.2
   - apiVersion: v1
     appVersion: "3.6"
-    created: "2021-05-20T15:55:08.056848+08:00"
+    created: "2024-07-02T16:40:52.388343+08:00"
     description: Integrate AWS IAM with Kubernetes
     digest: b9b5aebd45f23bfec156791680ef79e338eca1164fd8c2c15c7c67eb1469e128
     home: https://github.com/uswitch/kiam
@@ -54,4 +75,4 @@ entries:
     urls:
     - https://adrise.github.io/helm-charts/charts/kiam-5.10.0-1.tgz
     version: 5.10.0-1
-generated: "2021-05-20T15:55:08.041153+08:00"
+generated: "2024-07-02T16:40:52.377999+08:00"

patches/kiam-6.1.2.patch

@@ -0,0 +1,40 @@
+diff --git a/kiam-source/Chart.yaml b/kiam/Chart.yaml
+index 25eaad2..22c8101 100644
+--- a/kiam-source/Chart.yaml
++++ b/kiam/Chart.yaml
+@@ -1,7 +1,7 @@
+ apiVersion: v1
+ name: kiam
+ version: 6.1.2
+-appVersion: 4.0
++appVersion: 4.2
+ description: Integrate AWS IAM with Kubernetes
+ keywords:
+   - kiam
+diff --git a/kiam-source/templates/_helpers.tpl b/kiam/templates/_helpers.tpl
+index 14281dc..2272bec 100644
+--- a/kiam-source/templates/_helpers.tpl
++++ b/kiam/templates/_helpers.tpl
+@@ -93,18 +93,18 @@ Create the name of the server service account to use.
+ Generate certificates for kiam server and agent
+ */}}
+ {{- define "kiam.agent.gen-certs" -}}
+-{{- $ca := .ca | default (genCA "kiam-ca" 365) -}}
++{{- $ca := .ca | default (genCA "kiam-ca" 3650) -}}
+ {{- $_ := set . "ca" $ca -}}
+-{{- $cert := genSignedCert "Kiam Agent" nil nil 365 $ca -}}
++{{- $cert := genSignedCert "Kiam Agent" nil nil 3650 $ca -}}
+ {{.Values.agent.tlsCerts.caFileName }}: {{ $ca.Cert | b64enc }}
+ {{.Values.agent.tlsCerts.certFileName }}: {{ $cert.Cert | b64enc }}
+ {{.Values.agent.tlsCerts.keyFileName }}: {{ $cert.Key | b64enc }}
+ {{- end -}}
+ {{- define "kiam.server.gen-certs" -}}
+ {{- $altNames := list (include "kiam.server.fullname" .) (printf "%s:%d" (include "kiam.server.fullname" .) (int64 .Values.server.service.port)) (printf "127.0.0.1:%d" (int64 .Values.server.service.targetPort)) -}}
+-{{- $ca := .ca | default (genCA "kiam-ca" 365) -}}
++{{- $ca := .ca | default (genCA "kiam-ca" 3650) -}}
+ {{- $_ := set . "ca" $ca -}}
+-{{- $cert := genSignedCert "Kiam Server" (list "127.0.0.1") $altNames 365 $ca -}}
++{{- $cert := genSignedCert "Kiam Server" (list "127.0.0.1") $altNames 3650 $ca -}}
+ {{.Values.server.tlsCerts.caFileName }}: {{ $ca.Cert | b64enc }}
+ {{.Values.server.tlsCerts.certFileName }}: {{ $cert.Cert | b64enc }}
+ {{.Values.server.tlsCerts.keyFileName }}: {{ $cert.Key | b64enc }}