From 906fe38b881ff6d4fb2cc7410c4fb2fffd2fc397 Mon Sep 17 00:00:00 2001 From: Albert Hsieh Date: Thu, 3 Oct 2024 17:03:14 +0800 Subject: [PATCH 1/3] Revert "build(deps): Update dependencies charts" --- charts/agh3/Chart.lock | 6 +++--- charts/agh3/Chart.yaml | 2 +- charts/agh3/templates/report/report-deployment.yml | 2 +- charts/agh3/templates/report/report-service.yml | 2 +- charts/agh3/values.yaml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/charts/agh3/Chart.lock b/charts/agh3/Chart.lock index f9b491cd..296ef470 100644 --- a/charts/agh3/Chart.lock +++ b/charts/agh3/Chart.lock @@ -4,7 +4,7 @@ dependencies: version: 12.1.2 - name: minio repository: https://charts.bitnami.com/bitnami - version: 14.7.15 + version: 12.2.4 - name: rabbitmq repository: https://charts.bitnami.com/bitnami version: 13.0.0 @@ -17,5 +17,5 @@ dependencies: - name: postfix repository: https://charts.lkc-lab.com version: 0.1.1 -digest: sha256:cd03a3f86cfebb52c598d5981b149ea3506f7884e7a774dd30713f50d6d156da -generated: "2024-10-03T13:10:16.958923+08:00" +digest: sha256:fb6ba056468f47e486b96134dccb3de190f3525da983e7413f352b5bd6051982 +generated: "2024-09-11T12:52:01.457922+08:00" diff --git a/charts/agh3/Chart.yaml b/charts/agh3/Chart.yaml index 3b278bdd..eedb97a2 100644 --- a/charts/agh3/Chart.yaml +++ b/charts/agh3/Chart.yaml @@ -25,7 +25,7 @@ dependencies: repository: https://charts.bitnami.com/bitnami condition: db.internal.enabled - name: minio - version: 14.7.15 + version: 12.2.4 repository: https://charts.bitnami.com/bitnami condition: minio.internal.enabled - name: rabbitmq diff --git a/charts/agh3/templates/report/report-deployment.yml b/charts/agh3/templates/report/report-deployment.yml index 55c550e1..06cf2136 100644 --- a/charts/agh3/templates/report/report-deployment.yml +++ b/charts/agh3/templates/report/report-deployment.yml @@ -1,4 +1,4 @@ -{{- if and .Values.report.enabled }} +{{- if and .Values.ui.enabled }} apiVersion: apps/v1 kind: Deployment metadata: diff --git a/charts/agh3/templates/report/report-service.yml b/charts/agh3/templates/report/report-service.yml index 8a948279..c09124f0 100644 --- a/charts/agh3/templates/report/report-service.yml +++ b/charts/agh3/templates/report/report-service.yml @@ -1,4 +1,4 @@ -{{- if and .Values.report.enabled }} +{{- if and .Values.ui.enabled }} apiVersion: v1 kind: Service metadata: diff --git a/charts/agh3/values.yaml b/charts/agh3/values.yaml index 09d323c8..14d13e3a 100644 --- a/charts/agh3/values.yaml +++ b/charts/agh3/values.yaml @@ -213,8 +213,8 @@ postgresql: ## @param postgresql.image.pullSecrets Specify docker-registry secret names as an array ## image: - repository: docker/bitnami/postgresql - tag: 15 + repository: leukocyte-lab/postgresql + tag: v0.1.2-postgres-15.1.0-pgroonga-2.4.2-debian pullPolicy: IfNotPresent pullSecrets: [] ## @param postgresql.auth.enabled Enable postgresql auth secret generate From 538201c6c95b194e2f48ad24087435fb5c9b60eb Mon Sep 17 00:00:00 2001 From: knowlet Date: Thu, 3 Oct 2024 15:19:00 +0800 Subject: [PATCH 2/3] fix: should be disable report #199 --- charts/agh3/templates/report/report-deployment.yml | 2 +- charts/agh3/templates/report/report-service.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/agh3/templates/report/report-deployment.yml b/charts/agh3/templates/report/report-deployment.yml index 06cf2136..55c550e1 100644 --- a/charts/agh3/templates/report/report-deployment.yml +++ b/charts/agh3/templates/report/report-deployment.yml @@ -1,4 +1,4 @@ -{{- if and .Values.ui.enabled }} +{{- if and .Values.report.enabled }} apiVersion: apps/v1 kind: Deployment metadata: diff --git a/charts/agh3/templates/report/report-service.yml b/charts/agh3/templates/report/report-service.yml index c09124f0..8a948279 100644 --- a/charts/agh3/templates/report/report-service.yml +++ b/charts/agh3/templates/report/report-service.yml @@ -1,4 +1,4 @@ -{{- if and .Values.ui.enabled }} +{{- if and .Values.report.enabled }} apiVersion: v1 kind: Service metadata: From 36faa25afb54ddeabed8d9a3e6dd003406651746 Mon Sep 17 00:00:00 2001 From: knowlet Date: Thu, 3 Oct 2024 15:18:33 +0800 Subject: [PATCH 3/3] fix: pgroonga is not used in agh3 #200 --- charts/agh3/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/agh3/values.yaml b/charts/agh3/values.yaml index 14d13e3a..09d323c8 100644 --- a/charts/agh3/values.yaml +++ b/charts/agh3/values.yaml @@ -213,8 +213,8 @@ postgresql: ## @param postgresql.image.pullSecrets Specify docker-registry secret names as an array ## image: - repository: leukocyte-lab/postgresql - tag: v0.1.2-postgres-15.1.0-pgroonga-2.4.2-debian + repository: docker/bitnami/postgresql + tag: 15 pullPolicy: IfNotPresent pullSecrets: [] ## @param postgresql.auth.enabled Enable postgresql auth secret generate