From 01d82f5d0587eead92862f3cbcc1d03253e3beca Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Mon, 29 Apr 2024 09:10:59 +0300
Subject: [PATCH] nextcloud: pre-migration actions (#2412)

* pre-mig-nextcloud

* nextcloud: bump version

* fix host

* keep version

* fmt

* dont change host

* fix
---
 library/ix-dev/charts/nextcloud/Chart.yaml    |  2 +-
 .../nextcloud/templates/deployment.yaml       | 25 ++++++++++++++++---
 .../templates/postgres-deployment.yaml        | 25 ++++++++++++++++---
 .../charts/nextcloud/to_keep_versions.md      |  4 +++
 .../charts/nextcloud/to_keep_versions.yaml    |  1 +
 5 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/library/ix-dev/charts/nextcloud/Chart.yaml b/library/ix-dev/charts/nextcloud/Chart.yaml
index cb7b276ebb..fddf41df55 100644
--- a/library/ix-dev/charts/nextcloud/Chart.yaml
+++ b/library/ix-dev/charts/nextcloud/Chart.yaml
@@ -4,7 +4,7 @@ description: A file sharing server that puts the control and security of your ow
 annotations:
   title: Nextcloud
 type: application
-version: 1.6.60
+version: 1.6.61
 apiVersion: v2
 appVersion: 29.0.0
 kubeVersion: '>=1.16.0-0'
diff --git a/library/ix-dev/charts/nextcloud/templates/deployment.yaml b/library/ix-dev/charts/nextcloud/templates/deployment.yaml
index 3a2c74d287..9fbcaf4dfd 100644
--- a/library/ix-dev/charts/nextcloud/templates/deployment.yaml
+++ b/library/ix-dev/charts/nextcloud/templates/deployment.yaml
@@ -1,9 +1,28 @@
 {{ include "common.storage.hostPathValidate" .Values }}
 {{ $postgres_values := (. | mustDeepCopy) }}
 {{ $_ := set $postgres_values "common" (dict "nameSuffix" "postgres") }}
-{{ include "common.deployment.common_config" . | nindent 0 }}
-spec: {{ include "common.deployment.common_spec" . | nindent 2 }}
-  template: {{ include "common.deployment.pod.metadata" . | nindent 4 }}
+
+apiVersion: {{ template "common.capabilities.deployment.apiVersion" . }}
+kind: Deployment
+metadata:
+  name: {{ template "common.names.fullname" . }}-nc
+  labels:
+    app.kubernetes.io/name: {{ template "common.names.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+spec:
+  replicas: {{ (default 1 .Values.replicas) }}
+  strategy:
+    type: "Recreate"
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ template "common.names.name" . }}
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  template:
+    metadata:
+      name: {{ template "common.names.fullname" . }}
+      labels:
+        {{- include "common.labels.selectorLabels" . | nindent 8 }}
+      annotations: {{ include "common.annotations" . | nindent 8 }}
     spec:
       initContainers:
         - name: init-postgresdb
diff --git a/library/ix-dev/charts/nextcloud/templates/postgres-deployment.yaml b/library/ix-dev/charts/nextcloud/templates/postgres-deployment.yaml
index b91bb90bd7..fb5f8acf99 100644
--- a/library/ix-dev/charts/nextcloud/templates/postgres-deployment.yaml
+++ b/library/ix-dev/charts/nextcloud/templates/postgres-deployment.yaml
@@ -1,8 +1,27 @@
 {{ $values := (. | mustDeepCopy) }}
 {{ $_ := set $values "common" (dict "nameSuffix" "postgres") }}
-{{ include "common.deployment.common_config" $values | nindent 0 }}
-spec: {{ include "common.deployment.common_spec" $values | nindent 2 }}
-  template: {{ include "common.deployment.pod.metadata" $values | nindent 4 }}
+
+apiVersion: {{ template "common.capabilities.deployment.apiVersion" . }}
+kind: Deployment
+metadata:
+  name: {{ template "common.names.fullname" . }}-postgres-nc
+  labels:
+    app.kubernetes.io/name: {{ template "common.names.name" . }}-postgres
+    app.kubernetes.io/instance: {{ .Release.Name }}-postgres
+spec:
+  strategy:
+    type: "Recreate"
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ template "common.names.name" . }}-postgres
+      app.kubernetes.io/instance: {{ .Release.Name }}-postgres
+  template:
+    metadata:
+      name: {{ template "common.names.fullname" . }}
+      labels:
+        app.kubernetes.io/name: {{ template "common.names.name" . }}-postgres
+        app.kubernetes.io/instance: {{ .Release.Name }}-postgres
+      annotations: {{ include "common.annotations" . | nindent 8 }}
     spec:
       containers:
       - name: {{ .Chart.Name }}-postgres
diff --git a/library/ix-dev/charts/nextcloud/to_keep_versions.md b/library/ix-dev/charts/nextcloud/to_keep_versions.md
index 0586d5ddb1..ed056e15f0 100644
--- a/library/ix-dev/charts/nextcloud/to_keep_versions.md
+++ b/library/ix-dev/charts/nextcloud/to_keep_versions.md
@@ -11,3 +11,7 @@ Latest 27.x.x version
 ## 1.6.59
 
 Latest 28.x.x version
+
+## 1.6.61
+
+Latest release before migration to 2.x.x
diff --git a/library/ix-dev/charts/nextcloud/to_keep_versions.yaml b/library/ix-dev/charts/nextcloud/to_keep_versions.yaml
index 8e7f967ac5..e5508a5b2b 100644
--- a/library/ix-dev/charts/nextcloud/to_keep_versions.yaml
+++ b/library/ix-dev/charts/nextcloud/to_keep_versions.yaml
@@ -1,3 +1,4 @@
 - 1.6.29
 - 1.6.53
 - 1.6.59
+- 1.6.61