Merge branch 'forgejo-upgrade-new'
This commit is contained in:
commit
dbb96f1781
4 changed files with 28 additions and 27 deletions
|
@ -12,6 +12,7 @@
|
||||||
(def config-defaults {:namespace "forgejo"
|
(def config-defaults {:namespace "forgejo"
|
||||||
:issuer "staging"
|
:issuer "staging"
|
||||||
:deploy-federated "false"
|
:deploy-federated "false"
|
||||||
|
:federation-enabled "false"
|
||||||
:db-name "forgejo"
|
:db-name "forgejo"
|
||||||
:pv-storage-size-gb 5
|
:pv-storage-size-gb 5
|
||||||
:pvc-storage-class-name ""
|
:pvc-storage-class-name ""
|
||||||
|
@ -26,7 +27,8 @@
|
||||||
::forgejo/service-noreply-address]
|
::forgejo/service-noreply-address]
|
||||||
:opt-un [::forgejo/issuer
|
:opt-un [::forgejo/issuer
|
||||||
::forgejo/deploy-federated
|
::forgejo/deploy-federated
|
||||||
::forgejo/default-app-name
|
::forgejo/federation-enabled
|
||||||
|
::forgejo/default-app-name
|
||||||
::forgejo/service-domain-whitelist
|
::forgejo/service-domain-whitelist
|
||||||
::forgejo/forgejo-image-version-overwrite
|
::forgejo/forgejo-image-version-overwrite
|
||||||
::backup/restic-repository
|
::backup/restic-repository
|
||||||
|
|
|
@ -33,6 +33,7 @@
|
||||||
(s/def ::default-app-name string?)
|
(s/def ::default-app-name string?)
|
||||||
(s/def ::fqdn pred/fqdn-string?)
|
(s/def ::fqdn pred/fqdn-string?)
|
||||||
(s/def ::deploy-federated boolean-string?)
|
(s/def ::deploy-federated boolean-string?)
|
||||||
|
(s/def ::federation-enabled boolean-string?)
|
||||||
(s/def ::mailer-from pred/bash-env-string?)
|
(s/def ::mailer-from pred/bash-env-string?)
|
||||||
(s/def ::mailer-host pred/bash-env-string?)
|
(s/def ::mailer-host pred/bash-env-string?)
|
||||||
(s/def ::mailer-port pred/bash-env-string?)
|
(s/def ::mailer-port pred/bash-env-string?)
|
||||||
|
@ -53,6 +54,7 @@
|
||||||
::service-noreply-address]
|
::service-noreply-address]
|
||||||
:opt-un [::issuer
|
:opt-un [::issuer
|
||||||
::deploy-federated
|
::deploy-federated
|
||||||
|
::federation-enabled
|
||||||
::default-app-name
|
::default-app-name
|
||||||
::service-domain-whitelist
|
::service-domain-whitelist
|
||||||
::forgejo-image-version-overwrite]))
|
::forgejo-image-version-overwrite]))
|
||||||
|
@ -71,7 +73,7 @@
|
||||||
(def federated-image-name "domaindrivenarchitecture/c4k-forgejo-federated")
|
(def federated-image-name "domaindrivenarchitecture/c4k-forgejo-federated")
|
||||||
(def federated-image-version "latest")
|
(def federated-image-version "latest")
|
||||||
(def non-federated-image-name "codeberg.org/forgejo/forgejo")
|
(def non-federated-image-name "codeberg.org/forgejo/forgejo")
|
||||||
(def non-federated-image-version "1.19")
|
(def non-federated-image-version "8.0")
|
||||||
|
|
||||||
(defn-spec generate-image-str string?
|
(defn-spec generate-image-str string?
|
||||||
[config config?]
|
[config config?]
|
||||||
|
@ -88,7 +90,7 @@
|
||||||
(defn generate-appini-env
|
(defn generate-appini-env
|
||||||
[config]
|
[config]
|
||||||
(let [{:keys [default-app-name
|
(let [{:keys [default-app-name
|
||||||
deploy-federated
|
federation-enabled
|
||||||
fqdn
|
fqdn
|
||||||
mailer-from
|
mailer-from
|
||||||
mailer-host
|
mailer-host
|
||||||
|
@ -97,19 +99,19 @@
|
||||||
service-noreply-address]
|
service-noreply-address]
|
||||||
:or {default-app-name "forgejo instance"
|
:or {default-app-name "forgejo instance"
|
||||||
service-domain-whitelist fqdn}} config
|
service-domain-whitelist fqdn}} config
|
||||||
deploy-federated-bool (boolean-from-string deploy-federated)]
|
federation-enabled-bool (boolean-from-string federation-enabled)]
|
||||||
(->
|
(->
|
||||||
(yaml/load-as-edn "forgejo/appini-env-configmap.yaml")
|
(yaml/load-as-edn "forgejo/appini-env-configmap.yaml")
|
||||||
(cm/replace-all-matching "APPNAME" default-app-name)
|
(cm/replace-all-matching-values-by-new-value "APPNAME" default-app-name)
|
||||||
(cm/replace-all-matching "FQDN" fqdn)
|
(cm/replace-all-matching-values-by-new-value "FQDN" fqdn)
|
||||||
(cm/replace-all-matching "URL" (str "https://" fqdn))
|
(cm/replace-all-matching-values-by-new-value "URL" (str "https://" fqdn))
|
||||||
(cm/replace-all-matching "FROM" mailer-from)
|
(cm/replace-all-matching-values-by-new-value "FROM" mailer-from)
|
||||||
(cm/replace-all-matching "MAILERHOST" mailer-host)
|
(cm/replace-all-matching-values-by-new-value "MAILERHOST" mailer-host)
|
||||||
(cm/replace-all-matching "MAILERPORT" mailer-port)
|
(cm/replace-all-matching-values-by-new-value "MAILERPORT" mailer-port)
|
||||||
(cm/replace-all-matching "WHITELISTDOMAINS" service-domain-whitelist)
|
(cm/replace-all-matching-values-by-new-value "WHITELISTDOMAINS" service-domain-whitelist)
|
||||||
(cm/replace-all-matching "NOREPLY" service-noreply-address)
|
(cm/replace-all-matching-values-by-new-value "NOREPLY" service-noreply-address)
|
||||||
(cm/replace-all-matching "IS_FEDERATED"
|
(cm/replace-all-matching-values-by-new-value "IS_FEDERATED"
|
||||||
(if deploy-federated-bool
|
(if federation-enabled-bool
|
||||||
"true"
|
"true"
|
||||||
"false")))))
|
"false")))))
|
||||||
|
|
||||||
|
@ -148,11 +150,9 @@
|
||||||
|
|
||||||
(defn-spec generate-deployment pred/map-or-seq?
|
(defn-spec generate-deployment pred/map-or-seq?
|
||||||
[config config?]
|
[config config?]
|
||||||
(let [{:keys [deploy-federated]} config
|
|
||||||
deploy-federated-bool (boolean-from-string deploy-federated)]
|
|
||||||
(->
|
(->
|
||||||
(yaml/load-as-edn "forgejo/deployment.yaml")
|
(yaml/load-as-edn "forgejo/deployment.yaml")
|
||||||
(cm/replace-all-matching "IMAGE_NAME" (generate-image-str config)))))
|
(cm/replace-all-matching "IMAGE_NAME" (generate-image-str config))))
|
||||||
|
|
||||||
(defn generate-service
|
(defn generate-service
|
||||||
[]
|
[]
|
||||||
|
|
|
@ -16,7 +16,6 @@ data:
|
||||||
FORGEJO__database__NAME: forgejo
|
FORGEJO__database__NAME: forgejo
|
||||||
FORGEJO__database__LOG_SQL: "false"
|
FORGEJO__database__LOG_SQL: "false"
|
||||||
FORGEJO__database__SSL_MODE: disable
|
FORGEJO__database__SSL_MODE: disable
|
||||||
FORGEJO__database__CHARSET: utf8
|
|
||||||
|
|
||||||
#[DEFAULT]
|
#[DEFAULT]
|
||||||
APP_NAME: APPNAME
|
APP_NAME: APPNAME
|
||||||
|
@ -37,12 +36,12 @@ data:
|
||||||
#[mailer]
|
#[mailer]
|
||||||
FORGEJO__mailer__ENABLED: "true"
|
FORGEJO__mailer__ENABLED: "true"
|
||||||
FORGEJO__mailer__FROM: FROM
|
FORGEJO__mailer__FROM: FROM
|
||||||
FORGEJO__mailer__MAILER_TYPE: smtp+startls
|
FORGEJO__mailer__PROTOCOL: smtp+starttls
|
||||||
FORGEJO__mailer__SMTP_ADDR: MAILERHOST
|
FORGEJO__mailer__SMTP_ADDR: MAILERHOST
|
||||||
FORGEJO__mailer__SMTP_PORT: MAILERPORT
|
FORGEJO__mailer__SMTP_PORT: MAILERPORT
|
||||||
|
|
||||||
#[oauth2]
|
#[oauth2]
|
||||||
FORGEJO__oauth2__ENABLE: "true"
|
FORGEJO__oauth2__ENABLED: "true"
|
||||||
|
|
||||||
#[openid]
|
#[openid]
|
||||||
FORGEJO__openid__ENABLE_OPENID: "true"
|
FORGEJO__openid__ENABLE_OPENID: "true"
|
||||||
|
@ -76,7 +75,7 @@ data:
|
||||||
FORGEJO__service__REQUIRE_SIGNIN_VIEW: "false"
|
FORGEJO__service__REQUIRE_SIGNIN_VIEW: "false"
|
||||||
FORGEJO__service__REGISTER_EMAIL_CONFIRM: "true"
|
FORGEJO__service__REGISTER_EMAIL_CONFIRM: "true"
|
||||||
FORGEJO__service__ENABLE_NOTIFY_MAIL: "true"
|
FORGEJO__service__ENABLE_NOTIFY_MAIL: "true"
|
||||||
FORGEJO__service__EMAIL_DOMAIN_WHITELIST: WHITELISTDOMAINS
|
FORGEJO__service__EMAIL_DOMAIN_ALLOWLIST: WHITELISTDOMAINS
|
||||||
FORGEJO__service__ALLOW_ONLY_EXTERNAL_REGISTRATION: "false"
|
FORGEJO__service__ALLOW_ONLY_EXTERNAL_REGISTRATION: "false"
|
||||||
FORGEJO__service__ENABLE_BASIC_AUTHENTICATION: "true"
|
FORGEJO__service__ENABLE_BASIC_AUTHENTICATION: "true"
|
||||||
FORGEJO__service__ENABLE_CAPTCHA: "false"
|
FORGEJO__service__ENABLE_CAPTCHA: "false"
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
(deftest should-generate-image-str
|
(deftest should-generate-image-str
|
||||||
(testing "non-federated-image"
|
(testing "non-federated-image"
|
||||||
(is (= "codeberg.org/forgejo/forgejo:1.19"
|
(is (= "codeberg.org/forgejo/forgejo:8.0"
|
||||||
(cut/generate-image-str {:fqdn "test.de"
|
(cut/generate-image-str {:fqdn "test.de"
|
||||||
:mailer-from ""
|
:mailer-from ""
|
||||||
:mailer-host "m.t.de"
|
:mailer-host "m.t.de"
|
||||||
|
@ -63,12 +63,12 @@
|
||||||
:FORGEJO__server__ROOT_URL-c2 "https://test.com",
|
:FORGEJO__server__ROOT_URL-c2 "https://test.com",
|
||||||
:FORGEJO__server__SSH_DOMAIN-c1 "test.de",
|
:FORGEJO__server__SSH_DOMAIN-c1 "test.de",
|
||||||
:FORGEJO__server__SSH_DOMAIN-c2 "test.com",
|
:FORGEJO__server__SSH_DOMAIN-c2 "test.com",
|
||||||
:FORGEJO__service__EMAIL_DOMAIN_WHITELIST-c1 "adb.de",
|
:FORGEJO__service__EMAIL_DOMAIN_ALLOWLIST-c1 "adb.de",
|
||||||
:FORGEJO__service__EMAIL_DOMAIN_WHITELIST-c2 "test.com,test.net",
|
:FORGEJO__service__EMAIL_DOMAIN_ALLOWLIST-c2 "test.com,test.net",
|
||||||
:FORGEJO__service__NO_REPLY_ADDRESS-c1 "",
|
:FORGEJO__service__NO_REPLY_ADDRESS-c1 "",
|
||||||
:FORGEJO__service__NO_REPLY_ADDRESS-c2 "noreply@test.com"}
|
:FORGEJO__service__NO_REPLY_ADDRESS-c2 "noreply@test.com"}
|
||||||
(th/map-diff (cut/generate-appini-env {:default-app-name ""
|
(th/map-diff (cut/generate-appini-env {:default-app-name ""
|
||||||
:deploy-federated "false"
|
:federation-enabled "false"
|
||||||
:fqdn "test.de"
|
:fqdn "test.de"
|
||||||
:mailer-from ""
|
:mailer-from ""
|
||||||
:mailer-host "m.t.de"
|
:mailer-host "m.t.de"
|
||||||
|
@ -76,7 +76,7 @@
|
||||||
:service-domain-whitelist "adb.de"
|
:service-domain-whitelist "adb.de"
|
||||||
:service-noreply-address ""})
|
:service-noreply-address ""})
|
||||||
(cut/generate-appini-env {:default-app-name "test forgejo"
|
(cut/generate-appini-env {:default-app-name "test forgejo"
|
||||||
:deploy-federated "true"
|
:federation-enabled "true"
|
||||||
:fqdn "test.com"
|
:fqdn "test.com"
|
||||||
:mailer-from "test@test.com"
|
:mailer-from "test@test.com"
|
||||||
:mailer-host "mail.test.com"
|
:mailer-host "mail.test.com"
|
||||||
|
@ -97,7 +97,7 @@
|
||||||
:spec
|
:spec
|
||||||
{:containers
|
{:containers
|
||||||
[{:name "forgejo",
|
[{:name "forgejo",
|
||||||
:image "codeberg.org/forgejo/forgejo:1.19",
|
:image "codeberg.org/forgejo/forgejo:8.0",
|
||||||
:imagePullPolicy "IfNotPresent",
|
:imagePullPolicy "IfNotPresent",
|
||||||
:envFrom [{:configMapRef {:name "forgejo-env"}} {:secretRef {:name "forgejo-secrets"}}],
|
:envFrom [{:configMapRef {:name "forgejo-env"}} {:secretRef {:name "forgejo-secrets"}}],
|
||||||
:volumeMounts [{:name "forgejo-data-volume", :mountPath "/data"}],
|
:volumeMounts [{:name "forgejo-data-volume", :mountPath "/data"}],
|
||||||
|
|
Loading…
Reference in a new issue