From dd9af049d65a9f62622a43e589257882616399d4 Mon Sep 17 00:00:00 2001 From: wbsong111 Date: Mon, 24 Nov 2025 10:12:49 +0900 Subject: [PATCH] Update BUILD-README.md and bitnarmi repo --- charts/gitea/BUILD-README.md | 80 ++----------------- charts/gitea/charts/postgresql-ha/values.yaml | 8 +- charts/gitea/charts/postgresql/values.yaml | 6 +- .../gitea/charts/valkey-cluster/values.yaml | 8 +- charts/gitea/charts/valkey/values.yaml | 10 +-- 5 files changed, 24 insertions(+), 88 deletions(-) diff --git a/charts/gitea/BUILD-README.md b/charts/gitea/BUILD-README.md index 59cfe11..bb3d6f6 100644 --- a/charts/gitea/BUILD-README.md +++ b/charts/gitea/BUILD-README.md @@ -51,102 +51,38 @@ $ git checkout -b update-gitea/12.4.0 rm gitea-*.tgz ``` -### 2) 차트 수정 사항 반영 - -- gitea 배포 시 sso 및 외부 db 사용을 기본으로 하기 위하여 차트의 파일을 수정하였다. - -#### ./values.yaml - -- 다음은 gitea에 SSO 설정을 사용할 때, 대상 keycloak이 사설인증서를 사용하면 X509 에러가 발생한다. - - 에러 해결을 위해서 인증서를 등록하기 위해 `lifecycleHooks`를 추가하였다. -- 그리고 기본으로 활성화되어 있는 `memcached.enable`과 `postgresql.enable`을 diable로 변경하였다. - -``` yaml -... -clusterDomain: cluster.local - -# line 22 아래 항목 추가 -## @param lifecycleHooks LifecycleHook to set additional configuration at startup Evaluated as a template -## -lifecycleHooks: {} - -... -memcached: - ## line 413 true를 false로 변경 - enabled: false - -... -postgresql: - ## line 416 true를 false로 변경 - enabled: false -``` - -#### ./templates/_helpers.tpl - -``` yaml -... -## line 334 -{{/* -Renders a value that contains template. -Usage: -{{ include "common.tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }} -*/}} -{{- define "common.tplvalues.render" -}} - {{- if typeIs "string" .value }} - {{- tpl .value .context }} - {{- else }} - {{- tpl (.value | toYaml) .context }} - {{- end }} -{{- end -}} -``` - -#### ./templates/statefulset.yaml - -``` yaml -... - containers: - - name: {{ .Chart.Name }} - image: "{{ include "gitea.image" . }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - # line 205 아래 내용 추가 - {{- if .Values.lifecycleHooks }} - lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.lifecycleHooks "context" $) | nindent 12 }} - {{- end }} -``` - - - ## 3. git push 및 tag 추가 - 갱신작업 진행후 commit ``` $ git add . -$ git commit -m "update gitea/6.0.3" +$ git commit -m "update gitea/12.4.0" ``` - main 브랜치에 체크아웃 후 merge ``` $ git checkout main -$ git merge update-gitea/6.0.3 +$ git merge update-gitea/12.4.0 ``` - git에 push 후 작업 브랜치 삭제 ``` $ git push -u origin main -$ git branch -d update-gitea/6.0.3 +$ git branch -d update-gitea/12.4.0 ``` - git tag 추가 후 push ``` -$ git tag gitea/6.0.3 -$ git push origin gitea/6.0.3 +$ git tag gitea/12.4.0 +$ git push origin gitea/12.4.0 ``` ## 4. 차트 버전 정보 - +- gitea/12.4.0 + - gitea 버전 1.24.6 업데이트 + - 신규 차트에서 SSO 지원으로 기존 차트 수정사항 삭제 - gitea/6.0.3 - Keycloak SSO 연동 시 사설 인증서 사용을 위한 lifecycleHook을 추가하였다. - 서비스 배포를 위하여 custom-values.yam에 정의하였다. diff --git a/charts/gitea/charts/postgresql-ha/values.yaml b/charts/gitea/charts/postgresql-ha/values.yaml index a144b88..ac88ecb 100644 --- a/charts/gitea/charts/postgresql-ha/values.yaml +++ b/charts/gitea/charts/postgresql-ha/values.yaml @@ -119,7 +119,7 @@ postgresql: ## image: registry: docker.io - repository: bitnami/postgresql-repmgr + repository: bitnamilegacy/postgresql-repmgr tag: 17.6.0-debian-12-r2 digest: "" ## ref: https://kubernetes.io/docs/concepts/containers/images/#pre-pulled-images @@ -1132,7 +1132,7 @@ pgpool: ## image: registry: docker.io - repository: bitnami/pgpool + repository: bitnamilegacy/pgpool tag: 4.6.3-debian-12-r0 digest: "" ## ref: https://kubernetes.io/docs/concepts/containers/images/#pre-pulled-images @@ -1736,7 +1736,7 @@ metrics: ## image: registry: docker.io - repository: bitnami/postgres-exporter + repository: bitnamilegacy/postgres-exporter tag: 0.17.1-debian-12-r16 digest: "" ## ref: https://kubernetes.io/docs/concepts/containers/images/#pre-pulled-images @@ -1986,7 +1986,7 @@ volumePermissions: ## image: registry: docker.io - repository: bitnami/os-shell + repository: bitnamilegacy/os-shell tag: 12-debian-12-r51 digest: "" ## ref: https://kubernetes.io/docs/concepts/containers/images/#pre-pulled-images diff --git a/charts/gitea/charts/postgresql/values.yaml b/charts/gitea/charts/postgresql/values.yaml index 01c3ed1..107f1a4 100644 --- a/charts/gitea/charts/postgresql/values.yaml +++ b/charts/gitea/charts/postgresql/values.yaml @@ -120,7 +120,7 @@ diagnosticMode: ## image: registry: docker.io - repository: bitnami/postgresql + repository: bitnamilegacy/postgresql tag: 17.6.0-debian-12-r4 digest: "" ## Specify a imagePullPolicy @@ -1598,7 +1598,7 @@ volumePermissions: ## image: registry: docker.io - repository: bitnami/os-shell + repository: bitnamilegacy/os-shell tag: 12-debian-12-r51 digest: "" pullPolicy: IfNotPresent @@ -1707,7 +1707,7 @@ metrics: ## image: registry: docker.io - repository: bitnami/postgres-exporter + repository: bitnamilegacy/postgres-exporter tag: 0.17.1-debian-12-r16 digest: "" pullPolicy: IfNotPresent diff --git a/charts/gitea/charts/valkey-cluster/values.yaml b/charts/gitea/charts/valkey-cluster/values.yaml index f13ea71..d70b7eb 100644 --- a/charts/gitea/charts/valkey-cluster/values.yaml +++ b/charts/gitea/charts/valkey-cluster/values.yaml @@ -85,7 +85,7 @@ diagnosticMode: ## image: registry: docker.io - repository: bitnami/valkey-cluster + repository: bitnamilegacy/valkey-cluster tag: 8.1.3-debian-12-r3 digest: "" ## Specify a imagePullPolicy @@ -434,7 +434,7 @@ volumePermissions: ## image: registry: docker.io - repository: bitnami/os-shell + repository: bitnamilegacy/os-shell tag: 12-debian-12-r51 digest: "" pullPolicy: IfNotPresent @@ -916,7 +916,7 @@ metrics: ## image: registry: docker.io - repository: bitnami/redis-exporter + repository: bitnamilegacy/redis-exporter tag: 1.76.0-debian-12-r0 digest: "" pullPolicy: IfNotPresent @@ -1122,7 +1122,7 @@ sysctlImage: ## @param sysctlImage.pullSecrets Specify docker-registry secret names as an array ## registry: docker.io - repository: bitnami/os-shell + repository: bitnamilegacy/os-shell tag: 12-debian-12-r51 digest: "" pullPolicy: IfNotPresent diff --git a/charts/gitea/charts/valkey/values.yaml b/charts/gitea/charts/valkey/values.yaml index 6e637be..7c7ac31 100644 --- a/charts/gitea/charts/valkey/values.yaml +++ b/charts/gitea/charts/valkey/values.yaml @@ -109,7 +109,7 @@ diagnosticMode: ## image: registry: docker.io - repository: bitnami/valkey + repository: bitnamilegacy/valkey tag: 8.1.3-debian-12-r3 digest: "" ## Specify a imagePullPolicy @@ -1165,7 +1165,7 @@ sentinel: ## image: registry: docker.io - repository: bitnami/valkey-sentinel + repository: bitnamilegacy/valkey-sentinel tag: 8.1.3-debian-12-r3 digest: "" ## Specify a imagePullPolicy @@ -1651,7 +1651,7 @@ metrics: ## image: registry: docker.io - repository: bitnami/redis-exporter + repository: bitnamilegacy/redis-exporter tag: 1.76.0-debian-12-r0 digest: "" pullPolicy: IfNotPresent @@ -2017,7 +2017,7 @@ volumePermissions: ## image: registry: docker.io - repository: bitnami/os-shell + repository: bitnamilegacy/os-shell tag: 12-debian-12-r51 digest: "" pullPolicy: IfNotPresent @@ -2073,7 +2073,7 @@ kubectl: ## image: registry: docker.io - repository: bitnami/kubectl + repository: bitnamilegacy/kubectl tag: 1.33.4-debian-12-r0 digest: "" ## Specify a imagePullPolicy