Merge branch 'refactor-uptodate' into 'master'
Refactoring See merge request domaindrivenarchitecture/c4k-nextcloud!6merge-requests/6/merge
Clemens Geibel
1 year ago
commit
c13cecab46
@ -0,0 +1,17 @@
|
|||||||
|
# Upgrade major or minor versions of nextcloud
|
||||||
|
|
||||||
|
## Nextcloud versions of c4k-nextcloud docker images
|
||||||
|
|
||||||
|
- 4.0.3: nextcloud 22
|
||||||
|
- 5.0.0: nextcloud 23
|
||||||
|
- 6.0.0: nextcloud 24
|
||||||
|
- 7.0.0: nextcloud 25
|
||||||
|
|
||||||
|
## Uprgrading process
|
||||||
|
|
||||||
|
1. Change the version of the docker image in the deployment to the next major version
|
||||||
|
- `kubectl edit deploy cloud-deployment`
|
||||||
|
- change `image: domaindrivenarchitecture/c4k-cloud:4.0.3`
|
||||||
|
2. Wait for the pod to finish restarting
|
||||||
|
3. Verify the website is working and https://URL/settings/admin/overview shows the correct version
|
||||||
|
4. Repeat until desired version is reached
|
||||||
@ -1,55 +1,15 @@
|
|||||||
(ns dda.c4k-nextcloud.uberjar
|
(ns dda.c4k-nextcloud.uberjar
|
||||||
(:gen-class)
|
(:gen-class)
|
||||||
(:require
|
(:require
|
||||||
[clojure.spec.alpha :as s]
|
[dda.c4k-common.uberjar :as uberjar]
|
||||||
[clojure.string :as cs]
|
[dda.c4k-nextcloud.nextcloud :as nextcloud]
|
||||||
[clojure.tools.reader.edn :as edn]
|
[dda.c4k-nextcloud.core :as core]))
|
||||||
[expound.alpha :as expound]
|
|
||||||
[dda.c4k-common.yaml :as yaml]
|
|
||||||
[dda.c4k-nextcloud.core :as core]
|
|
||||||
[dda.c4k-nextcloud.nextcloud :as nextcloud]))
|
|
||||||
|
|
||||||
(def usage
|
|
||||||
"usage:
|
|
||||||
|
|
||||||
c4k-nextcloud {your configuraton file} {your authorization file}")
|
|
||||||
|
|
||||||
(s/def ::options (s/* #{"-h"}))
|
|
||||||
(s/def ::filename (s/and string?
|
|
||||||
#(not (cs/starts-with? % "-"))))
|
|
||||||
(s/def ::cmd-args (s/cat :options ::options
|
|
||||||
:args (s/?
|
|
||||||
(s/cat :config ::filename
|
|
||||||
:auth ::filename))))
|
|
||||||
(defn invalid-args-msg
|
|
||||||
[spec args]
|
|
||||||
(s/explain spec args)
|
|
||||||
(println (str "Bad commandline arguments\n" usage)))
|
|
||||||
|
|
||||||
(defn -main [& cmd-args]
|
(defn -main [& cmd-args]
|
||||||
(let [parsed-args-cmd (s/conform ::cmd-args cmd-args)]
|
(uberjar/main-common
|
||||||
(if (= ::s/invalid parsed-args-cmd)
|
"c4k-nextcloud"
|
||||||
(invalid-args-msg ::cmd-args cmd-args)
|
nextcloud/config?
|
||||||
(let [{:keys [options args]} parsed-args-cmd
|
nextcloud/auth?
|
||||||
{:keys [config auth]} args]
|
core/config-defaults
|
||||||
(cond
|
core/k8s-objects
|
||||||
(some #(= "-h" %) options)
|
cmd-args))
|
||||||
(println usage)
|
|
||||||
:default
|
|
||||||
(let [config-str (slurp config)
|
|
||||||
auth-str (slurp auth)
|
|
||||||
config-parse-fn (if (yaml/is-yaml? config) yaml/from-string edn/read-string)
|
|
||||||
auth-parse-fn (if (yaml/is-yaml? auth) yaml/from-string edn/read-string)
|
|
||||||
parsed-config (config-parse-fn config-str)
|
|
||||||
parsed-auth (auth-parse-fn auth-str)
|
|
||||||
config-valid? (s/valid? ::core/config parsed-config)
|
|
||||||
auth-valid? (s/valid? ::core/auth parsed-auth)]
|
|
||||||
(if (and config-valid? auth-valid?)
|
|
||||||
(println (core/generate parsed-config parsed-auth))
|
|
||||||
(do
|
|
||||||
(when (not config-valid?)
|
|
||||||
(println
|
|
||||||
(expound/expound-str ::core/config parsed-config {:print-specs? false})))
|
|
||||||
(when (not auth-valid?)
|
|
||||||
(println
|
|
||||||
(expound/expound-str ::core/auth parsed-auth {:print-specs? false})))))))))))
|
|
||||||
|
|||||||
@ -1,60 +1,44 @@
|
|||||||
(ns dda.c4k-nextcloud.core
|
(ns dda.c4k-nextcloud.core
|
||||||
(:require
|
(:require
|
||||||
[clojure.string :as cs]
|
|
||||||
[clojure.spec.alpha :as s]
|
[clojure.spec.alpha :as s]
|
||||||
#?(:clj [orchestra.core :refer [defn-spec]]
|
#?(:clj [orchestra.core :refer [defn-spec]]
|
||||||
:cljs [orchestra.core :refer-macros [defn-spec]])
|
:cljs [orchestra.core :refer-macros [defn-spec]])
|
||||||
|
[dda.c4k-common.common :as cm]
|
||||||
|
[dda.c4k-common.predicate :as cp]
|
||||||
[dda.c4k-common.yaml :as yaml]
|
[dda.c4k-common.yaml :as yaml]
|
||||||
[dda.c4k-common.postgres :as postgres]
|
[dda.c4k-common.postgres :as postgres]
|
||||||
[dda.c4k-nextcloud.nextcloud :as nextcloud]
|
[dda.c4k-nextcloud.nextcloud :as nextcloud]
|
||||||
[dda.c4k-nextcloud.backup :as backup]))
|
[dda.c4k-nextcloud.backup :as backup]
|
||||||
|
[dda.c4k-common.monitoring :as mon]))
|
||||||
|
|
||||||
(def default-storage-class :local-path)
|
(def default-storage-class :local-path)
|
||||||
|
|
||||||
(def config-defaults {:issuer "staging"})
|
(def config-defaults {:issuer "staging"})
|
||||||
|
|
||||||
(def config? (s/keys :req-un [::nextcloud/fqdn]
|
(defn-spec k8s-objects cp/map-or-seq?
|
||||||
:opt-un [::nextcloud/issuer
|
[config nextcloud/config?
|
||||||
::nextcloud/restic-repository
|
auth nextcloud/auth?]
|
||||||
::nextcloud/pv-storage-size-gb
|
|
||||||
::nextcloud/pvc-storage-class-name]))
|
|
||||||
|
|
||||||
(def auth? (s/keys :req-un [::postgres/postgres-db-user ::postgres/postgres-db-password
|
|
||||||
::nextcloud/nextcloud-admin-user ::nextcloud/nextcloud-admin-password
|
|
||||||
::aws-access-key-id ::aws-secret-access-key
|
|
||||||
::restic-password]))
|
|
||||||
|
|
||||||
(s/def ::config config?)
|
|
||||||
(s/def ::auth auth?)
|
|
||||||
|
|
||||||
(defn-spec k8s-objects any?
|
|
||||||
[config (s/merge config? auth?)]
|
|
||||||
(let [nextcloud-default-storage-config {:pvc-storage-class-name default-storage-class
|
(let [nextcloud-default-storage-config {:pvc-storage-class-name default-storage-class
|
||||||
:pv-storage-size-gb 200}]
|
:pv-storage-size-gb 200}]
|
||||||
(into
|
(map yaml/to-string
|
||||||
[]
|
(filter
|
||||||
(concat [(yaml/to-string (postgres/generate-config {:postgres-size :8gb}))
|
#(not (nil? %))
|
||||||
(yaml/to-string (postgres/generate-secret config))
|
(cm/concat-vec
|
||||||
(yaml/to-string (postgres/generate-pvc {:pv-storage-size-gb 50
|
[(postgres/generate-config {:postgres-size :8gb :db-name "nextcloud"})
|
||||||
:pvc-storage-class-name default-storage-class}))
|
(postgres/generate-secret auth)
|
||||||
(yaml/to-string (postgres/generate-deployment))
|
(postgres/generate-pvc {:pv-storage-size-gb 50
|
||||||
(yaml/to-string (postgres/generate-service))
|
:pvc-storage-class-name default-storage-class})
|
||||||
(yaml/to-string (nextcloud/generate-secret config))
|
(postgres/generate-deployment)
|
||||||
(yaml/to-string (nextcloud/generate-pvc (merge nextcloud-default-storage-config config)))
|
(postgres/generate-service)
|
||||||
(yaml/to-string (nextcloud/generate-deployment config))
|
(nextcloud/generate-secret auth)
|
||||||
(yaml/to-string (nextcloud/generate-service))
|
(nextcloud/generate-pvc (merge nextcloud-default-storage-config config))
|
||||||
(yaml/to-string (nextcloud/generate-certificate config))
|
(nextcloud/generate-deployment config)
|
||||||
(yaml/to-string (nextcloud/generate-ingress config))]
|
(nextcloud/generate-service)]
|
||||||
(when (contains? config :restic-repository)
|
(nextcloud/generate-ingress-and-cert config)
|
||||||
[(yaml/to-string (backup/generate-config config))
|
(when (:contains? config :restic-repository)
|
||||||
(yaml/to-string (backup/generate-secret config))
|
[(backup/generate-config config)
|
||||||
(yaml/to-string (backup/generate-cron))
|
(backup/generate-secret auth)
|
||||||
(yaml/to-string (backup/generate-backup-restore-deployment config))])))))
|
(backup/generate-cron)
|
||||||
|
(backup/generate-backup-restore-deployment config)])
|
||||||
(defn-spec generate any?
|
(when (:contains? config :mon-cfg)
|
||||||
[my-config config?
|
(mon/generate (:mon-cfg config) (:mon-auth auth))))))))
|
||||||
my-auth auth?]
|
|
||||||
(let [resulting-config (merge config-defaults my-config my-auth)]
|
|
||||||
(cs/join
|
|
||||||
"\n---\n"
|
|
||||||
(k8s-objects resulting-config))))
|
|
||||||
|
|||||||
@ -1,15 +0,0 @@
|
|||||||
apiVersion: cert-manager.io/v1
|
|
||||||
kind: Certificate
|
|
||||||
metadata:
|
|
||||||
name: cloud-cert
|
|
||||||
namespace: default
|
|
||||||
spec:
|
|
||||||
secretName: cloud-cert
|
|
||||||
duration: 2160h # 90d
|
|
||||||
renewBefore: 360h # 15d
|
|
||||||
commonName: fqdn
|
|
||||||
dnsNames:
|
|
||||||
- fqdn
|
|
||||||
issuerRef:
|
|
||||||
name: staging
|
|
||||||
kind: ClusterIssuer
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
apiVersion: networking.k8s.io/v1
|
|
||||||
kind: Ingress
|
|
||||||
metadata:
|
|
||||||
name: ingress-cloud
|
|
||||||
annotations:
|
|
||||||
cert-manager.io/cluster-issuer: letsencrypt-staging-issuer
|
|
||||||
ingress.kubernetes.io/ssl-redirect: "true"
|
|
||||||
ingress.kubernetes.io/rewrite-target: /
|
|
||||||
ingress.kubernetes.io/proxy-body-size: "256m"
|
|
||||||
ingress.kubernetes.io/proxy-connect-timeout: "300"
|
|
||||||
ingress.kubernetes.io/proxy-send-timeout: "300"
|
|
||||||
ingress.kubernetes.io/proxy-read-timeout: "300"
|
|
||||||
namespace: default
|
|
||||||
spec:
|
|
||||||
tls:
|
|
||||||
- hosts:
|
|
||||||
- fqdn
|
|
||||||
secretName: cloud-cert
|
|
||||||
rules:
|
|
||||||
- host: fqdn
|
|
||||||
http:
|
|
||||||
paths:
|
|
||||||
- path: /
|
|
||||||
pathType: Prefix
|
|
||||||
backend:
|
|
||||||
service:
|
|
||||||
name: cloud-service
|
|
||||||
port:
|
|
||||||
number: 80
|
|
||||||
@ -1,55 +0,0 @@
|
|||||||
(ns dda.c4k-nextcloud.core-test
|
|
||||||
(:require
|
|
||||||
#?(:clj [clojure.test :refer [deftest is are testing run-tests]]
|
|
||||||
:cljs [cljs.test :refer-macros [deftest is are testing run-tests]])
|
|
||||||
[clojure.string :as st]
|
|
||||||
[dda.c4k-nextcloud.core :as cut]
|
|
||||||
))
|
|
||||||
|
|
||||||
(deftest should-k8s-objects
|
|
||||||
(is (= 15
|
|
||||||
(count (cut/k8s-objects {:fqdn "nextcloud-neu.prod.meissa-gmbh.de"
|
|
||||||
:postgres-db-user "nextcloud"
|
|
||||||
:postgres-db-password "nextcloud-db-password"
|
|
||||||
:nextcloud-admin-user "cloudadmin"
|
|
||||||
:nextcloud-admin-password "cloudpassword"
|
|
||||||
:issuer "prod"
|
|
||||||
:aws-access-key-id "aws-id"
|
|
||||||
:aws-secret-access-key "aws-secret"
|
|
||||||
:restic-password "restic-pw"
|
|
||||||
:restic-repository "restic-repository"}))))
|
|
||||||
(is (= 11
|
|
||||||
(count (cut/k8s-objects {:fqdn "nextcloud-neu.prod.meissa-gmbh.de"
|
|
||||||
:postgres-db-user "nextcloud"
|
|
||||||
:postgres-db-password "nextcloud-db-password"
|
|
||||||
:nextcloud-admin-user "cloudadmin"
|
|
||||||
:nextcloud-admin-password "cloudpassword"
|
|
||||||
:issuer "prod"
|
|
||||||
:aws-access-key-id "aws-id"
|
|
||||||
:aws-secret-access-key "aws-secret"
|
|
||||||
:restic-password "restic-pw"}))))
|
|
||||||
(is (st/includes?
|
|
||||||
(get-in (cut/k8s-objects {:fqdn "nextcloud-neu.prod.meissa-gmbh.de"
|
|
||||||
:postgres-db-user "nextcloud"
|
|
||||||
:postgres-db-password "nextcloud-db-password"
|
|
||||||
:nextcloud-admin-user "cloudadmin"
|
|
||||||
:nextcloud-admin-password "cloudpassword"
|
|
||||||
:issuer "prod"
|
|
||||||
:aws-access-key-id "aws-id"
|
|
||||||
:aws-secret-access-key "aws-secret"
|
|
||||||
:restic-password "restic-pw"})
|
|
||||||
[0])
|
|
||||||
"max_connections = 700"))
|
|
||||||
(is (st/includes?
|
|
||||||
(get-in (cut/k8s-objects {:fqdn "nextcloud-neu.prod.meissa-gmbh.de"
|
|
||||||
:postgres-db-user "nextcloud"
|
|
||||||
:postgres-db-password "nextcloud-db-password"
|
|
||||||
:nextcloud-admin-user "cloudadmin"
|
|
||||||
:nextcloud-admin-password "cloudpassword"
|
|
||||||
:issuer "prod"
|
|
||||||
:aws-access-key-id "aws-id"
|
|
||||||
:aws-secret-access-key "aws-secret"
|
|
||||||
:restic-password "restic-pw"})
|
|
||||||
[6])
|
|
||||||
"storageClassName: local-path"))
|
|
||||||
)
|
|
||||||
@ -1,5 +1,5 @@
|
|||||||
fqdn: "cloud.test.meissa-gmbh.de"
|
fqdns: "cloud.test.meissa-gmbh.de"
|
||||||
issuer: "staging"
|
issuer: "none"
|
||||||
nextcloud-data-volume-path: "/var/cloud"
|
nextcloud-data-volume-path: "/var/cloud"
|
||||||
postgres-data-volume-path: "/var/postgres"
|
postgres-data-volume-path: "/var/postgres"
|
||||||
restic-repository: "s3:s3.amazonaws.com/your-bucket/your-folder"
|
restic-repository: "s3:s3.amazonaws.com/your-bucket/your-folder"
|
||||||
@ -0,0 +1,10 @@
|
|||||||
|
postgres-db-user: "nextcloud"
|
||||||
|
postgres-db-password: "nextcloud-db-password"
|
||||||
|
nextcloud-admin-user: "cloudadmin"
|
||||||
|
nextcloud-admin-password: "cloudpassword"
|
||||||
|
aws-access-key-id: "aws-id"
|
||||||
|
aws-secret-access-key: "aws-secret"
|
||||||
|
restic-password: "restic-password"
|
||||||
|
mon-auth:
|
||||||
|
grafana-cloud-user: "user"
|
||||||
|
grafana-cloud-password: "password"
|
||||||
@ -0,0 +1,9 @@
|
|||||||
|
fqdn: "cloud.test.meissa-gmbh.de"
|
||||||
|
issuer: "staging"
|
||||||
|
nextcloud-data-volume-path: "/var/cloud"
|
||||||
|
postgres-data-volume-path: "/var/postgres"
|
||||||
|
restic-repository: "s3:s3.amazonaws.com/your-bucket/your-folder"
|
||||||
|
mon-cfg:
|
||||||
|
grafana-cloud-url: "url-for-your-prom-remote-write-endpoint"
|
||||||
|
cluster-name: "keycloak"
|
||||||
|
cluster-stage: "test"
|
||||||
Loading…
Reference in New Issue