From f13a69426c8ff81d319bcc6388325f3df5ef7ac1 Mon Sep 17 00:00:00 2001 From: Nikolai Rodionov Date: Wed, 22 Feb 2023 09:24:03 +0000 Subject: [PATCH] Migrate longhorn (#14) Reviewed-on: https://git.badhouseplants.net/badhouseplants/k8s-cluster-config/pulls/14 --- badhouseplants/helmfile.yaml | 4 ++++ badhouseplants/values/secrets.funkwhale.yaml | 5 +++-- bin/migrate.sh | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/badhouseplants/helmfile.yaml b/badhouseplants/helmfile.yaml index b489173..b0cd0f7 100644 --- a/badhouseplants/helmfile.yaml +++ b/badhouseplants/helmfile.yaml @@ -11,6 +11,10 @@ releases: installed: true namespace: drone-service createNamespace: false + - <<: *longhorn + installed: true + namespace: longhorn-system + createNamespace: false - <<: *nrodionov installed: true diff --git a/badhouseplants/values/secrets.funkwhale.yaml b/badhouseplants/values/secrets.funkwhale.yaml index 4c60758..47cc127 100644 --- a/badhouseplants/values/secrets.funkwhale.yaml +++ b/badhouseplants/values/secrets.funkwhale.yaml @@ -1,3 +1,4 @@ +djangoSecret: ENC[AES256_GCM,data:CxsJVhNxku3pohREaVs=,iv:KDupR8tZlPkPeRwGWzyz+eKtp1tfTdFWqXNuQW20oXo=,tag:lCHqv2CC8cXpnqTr8fGzPg==,type:str] postgresql: auth: username: ENC[AES256_GCM,data:S09SpdX3ro0S,iv:QYQiF8Ozz9iLElqsoxyika+iVcHzRyo4hhaaIw8/vDM=,tag:KzorD+/Pysqwm5PneRRsyg==,type:str] @@ -19,8 +20,8 @@ sops: dWdMUFpOOVJYSXdBbzJiSzhQM0VmbWMKUqdIpfa8i7vASIga8HFurrPf1RgA+WVA GZiG+M0i4yc3SooTIwbDzH0orfaEHueKdNTGOXMgxNiRIt2q9BG76g== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-02-22T08:45:06Z" - mac: ENC[AES256_GCM,data:dPUc7qB2Vtb5AirZUR3Dt3bOBTClYyxDFZx6/6DpvZfaNwI6yn9sjg/2CmX6z21UeKTWo/cPKOuSl+qQjMJe90ZeKVGaSgw5qEtkj5DhwOIOlIL9tQlbSurVuIPOXAPZkWcO0Mhr6jS94OKaydt3tqW4JVf2PVQc1C3dCoU1hJY=,iv:iUhHjaCB9Si+TE7AjQiZtc1cXgd3ecc2hf/vPvAOHHk=,tag:y5ACLeLZ2GtdqvT4WJ6ANA==,type:str] + lastmodified: "2023-02-22T09:20:09Z" + mac: ENC[AES256_GCM,data:1Wt61yiS/8/D0IwiM1RQwV6fYZNq5yZFxOWE/1T4/eLhZY4jSLFMMDrZLA3joOv6ZeN1fWzbJpbGEzsBdPm0ZP7scz56+XwWJTjY9xlnlRB6ou35ViABE9mKCNP6/wUqqnw0d3EhnxhC5lOAPsl5koUHhGQw/8dZEDiA9PniQ20=,iv:dgkvOii83PR3cpFBQoSq9pi53g7DjTcrAXc5O5ge9nA=,tag:/RWIko/vBwFcHIZqmJdrZQ==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.7.3 diff --git a/bin/migrate.sh b/bin/migrate.sh index 81c6e7d..cfcd410 100755 --- a/bin/migrate.sh +++ b/bin/migrate.sh @@ -3,4 +3,4 @@ argo_instance=$1 helm_name=$2 helm_ns=$3 -kubectl get PersistentVolumeClaim,EnvoyFilter,PodDisruptionBudget,sa,ValidatingWebhookConfiguration,all,cm,secret,ing,role,clusterrole,rolebindings,clusterrolebindings,MutatingWebhookConfiguration -l argocd.argoproj.io/instance=$argo_instance -A --no-headers --output custom-columns="POD-NAME":.kind,"NAMESPACE":.metadata.name,"ns":.metadata.namespace | while read -r var1 var2 var3; do kubectl annotate $var1 $var2 -n $var3 "meta.helm.sh/release-namespace"="$helm_ns" "meta.helm.sh/release-name"="$helm_name" && kubectl label $var1 $var2 -n $var3 app.kubernetes.io/managed-by=Helm; done +kubectl get CustomResourceDefinition,PersistentVolumeClaim,EnvoyFilter,PodDisruptionBudget,sa,ValidatingWebhookConfiguration,all,cm,secret,ing,role,clusterrole,rolebindings,clusterrolebindings,MutatingWebhookConfiguration -l argocd.argoproj.io/instance=$argo_instance -l helm.sh/chart=longhorn-1.4.0 -A --no-headers --output custom-columns="POD-NAME":.kind,"NAMESPACE":.metadata.name,"ns":.metadata.namespace | while read -r var1 var2 var3; do kubectl annotate $var1 $var2 -n $var3 "meta.helm.sh/release-namespace"="$helm_ns" "meta.helm.sh/release-name"="$helm_name" && kubectl label $var1 $var2 -n $var3 app.kubernetes.io/managed-by=Helm; done