This commit is contained in:
Andrei Kvapil
2024-02-01 19:11:46 +01:00
parent da090a0344
commit 8bdf4ce07c
10 changed files with 14 additions and 12 deletions

1
TODO
View File

@@ -31,3 +31,4 @@ reconcile system helm releases
remove cluster and other namespace resources from apps charts, eg extension-apiserver-authentication-reader
spawn etcd per tenant / per cluster
add ownerReferences for tenants
nginx-ingress has no values

View File

@@ -1,14 +1,14 @@
{
"containerimage.config.digest": "sha256:77ea033186d5c168113ca21b92d9f1c7ee38c1aab3e99356ec7e79ba2dda96bb",
"containerimage.config.digest": "sha256:908655779a8f125609aa59e58a3e40b4446115c10aa27a82d47a6bc6a5fb0731",
"containerimage.descriptor": {
"mediaType": "application/vnd.docker.distribution.manifest.v2+json",
"digest": "sha256:99b5902ce02fb7f65b49375b2c599c2868c6d789c746ea2327cb46d17bb2d09c",
"digest": "sha256:a5da553cb766383ca39dd1fd1c10b9dc00a8fc3cdb0cd98fc2cec7af0297b4a3",
"size": 2074,
"platform": {
"architecture": "amd64",
"os": "linux"
}
},
"containerimage.digest": "sha256:99b5902ce02fb7f65b49375b2c599c2868c6d789c746ea2327cb46d17bb2d09c",
"containerimage.digest": "sha256:a5da553cb766383ca39dd1fd1c10b9dc00a8fc3cdb0cd98fc2cec7af0297b4a3",
"image.name": "ghcr.io/aenix-io/cozystack/installer:latest"
}

View File

@@ -3,3 +3,4 @@ update:
helm repo add clastix https://clastix.github.io/charts
helm repo update clastix
helm pull clastix/kamaji-etcd --untar --untardir charts
sed -i 's/hook-failed/before-hook-creation,hook-failed/' `grep -rl hook-failed charts`

View File

@@ -6,7 +6,7 @@ metadata:
annotations:
"helm.sh/hook": pre-delete
"helm.sh/hook-weight": "10"
"helm.sh/hook-delete-policy": "hook-succeeded,hook-failed"
"helm.sh/hook-delete-policy": "hook-succeeded,before-hook-creation,hook-failed"
name: "{{ .Release.Name }}-etcd-teardown"
namespace: {{ .Release.Namespace }}
spec:

View File

@@ -6,7 +6,7 @@ metadata:
annotations:
"helm.sh/hook": pre-install
"helm.sh/hook-weight": "10"
"helm.sh/hook-delete-policy": "hook-succeeded,hook-failed"
"helm.sh/hook-delete-policy": "hook-succeeded,before-hook-creation,hook-failed"
name: "{{ .Release.Name }}-etcd-setup-1"
namespace: {{ .Release.Namespace }}
spec:

View File

@@ -6,7 +6,7 @@ metadata:
annotations:
"helm.sh/hook": post-install
"helm.sh/hook-weight": "10"
"helm.sh/hook-delete-policy": "hook-succeeded,hook-failed"
"helm.sh/hook-delete-policy": "hook-succeeded,before-hook-creation,hook-failed"
name: "{{ .Release.Name }}-etcd-setup-2"
namespace: {{ .Release.Namespace }}
spec:

View File

@@ -8,7 +8,7 @@ metadata:
annotations:
"helm.sh/hook": post-install,post-upgrade,post-rollback
"helm.sh/hook-weight": "5"
"helm.sh/hook-delete-policy": "hook-succeeded,hook-failed"
"helm.sh/hook-delete-policy": "hook-succeeded,before-hook-creation,hook-failed"
name: "{{ .Release.Name }}-s3-retention"
namespace: {{ .Release.Namespace }}
spec:

View File

@@ -3,7 +3,7 @@ kind: Role
metadata:
annotations:
"helm.sh/hook": pre-install,post-install,pre-delete
"helm.sh/hook-delete-policy": "hook-succeeded,hook-failed"
"helm.sh/hook-delete-policy": "hook-succeeded,before-hook-creation,hook-failed"
"helm.sh/hook-weight": "5"
labels:
{{- include "etcd.labels" . | nindent 4 }}
@@ -44,7 +44,7 @@ kind: RoleBinding
metadata:
annotations:
"helm.sh/hook": pre-install,post-install,pre-delete
"helm.sh/hook-delete-policy": "hook-succeeded,hook-failed"
"helm.sh/hook-delete-policy": "hook-succeeded,before-hook-creation,hook-failed"
"helm.sh/hook-weight": "5"
labels:
{{- include "etcd.labels" . | nindent 4 }}

View File

@@ -7,7 +7,7 @@ metadata:
{{- include "etcd.labels" . | nindent 4 }}
annotations:
"helm.sh/hook": pre-install
"helm.sh/hook-delete-policy": "hook-failed"
"helm.sh/hook-delete-policy": "before-hook-creation,hook-failed"
"helm.sh/hook-weight": "0"
{{- with .Values.serviceAccount.annotations }}
{{- toYaml . | nindent 4 }}

View File

@@ -24,10 +24,10 @@ spec:
certificate:
secretReference:
keyPath: tls.crt
name: etcd-client-certs
name: etcd-root-client-certs
namespace: {{ .Release.Namespace }}
privateKey:
secretReference:
keyPath: tls.key
name: etcd-client-certs
name: etcd-root-client-certs
namespace: {{ .Release.Namespace }}