From 33ef3601ed03f0ee6c01f00178c482e629187fcb Mon Sep 17 00:00:00 2001 From: Qian Date: Wed, 15 Jan 2025 12:58:29 -0500 Subject: [PATCH 1/2] added two charts --- stable/fdi-dotstatsuite-sfs-solr-stateful | 1 + stable/fdi-search-discovery-api-chart | 1 + 2 files changed, 2 insertions(+) create mode 160000 stable/fdi-dotstatsuite-sfs-solr-stateful create mode 160000 stable/fdi-search-discovery-api-chart diff --git a/stable/fdi-dotstatsuite-sfs-solr-stateful b/stable/fdi-dotstatsuite-sfs-solr-stateful new file mode 160000 index 00000000..c1326ecf --- /dev/null +++ b/stable/fdi-dotstatsuite-sfs-solr-stateful @@ -0,0 +1 @@ +Subproject commit c1326ecf3462e3ec7246ab661bd7cb7af78a0672 diff --git a/stable/fdi-search-discovery-api-chart b/stable/fdi-search-discovery-api-chart new file mode 160000 index 00000000..f04a4606 --- /dev/null +++ b/stable/fdi-search-discovery-api-chart @@ -0,0 +1 @@ +Subproject commit f04a4606c16edc44ffdbe824d2f0a98115732aad From ada2dcd3737d611162c89f67a6fec00d1a5f9a44 Mon Sep 17 00:00:00 2001 From: Qian Date: Wed, 15 Jan 2025 13:57:48 -0500 Subject: [PATCH 2/2] added two charts with correct the path for repository --- stable/ckan/values.yaml | 2 +- stable/fdi-dotstatsuite-sfs-solr/templates/deploy/solr.yaml | 2 +- stable/fdi-dotstatsuite-sfs-solr/values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stable/ckan/values.yaml b/stable/ckan/values.yaml index 4fc195ea..7196d52e 100644 --- a/stable/ckan/values.yaml +++ b/stable/ckan/values.yaml @@ -3,7 +3,7 @@ # Declare variables to be passed into your templates. replicaCount: 1 - +repository_base: artifactory.cloud.statcan.ca/docker image: repository: statcan/ckan tag: 2.9 diff --git a/stable/fdi-dotstatsuite-sfs-solr/templates/deploy/solr.yaml b/stable/fdi-dotstatsuite-sfs-solr/templates/deploy/solr.yaml index f29375ad..89156819 100644 --- a/stable/fdi-dotstatsuite-sfs-solr/templates/deploy/solr.yaml +++ b/stable/fdi-dotstatsuite-sfs-solr/templates/deploy/solr.yaml @@ -27,7 +27,7 @@ spec: claimName: {{ include "dotstatsuite.fullname" . }}-solr-pv-claim initContainers: - name: init-solr - image: alpine + image: {{ .Values.repository_base }}/alpine command: ["chown", "-R", "8983:8983", "/var/solr"] volumeMounts: - name: {{ include "dotstatsuite.fullname" . }}-solr-pv-storage diff --git a/stable/fdi-dotstatsuite-sfs-solr/values.yaml b/stable/fdi-dotstatsuite-sfs-solr/values.yaml index 2490b343..44d67754 100644 --- a/stable/fdi-dotstatsuite-sfs-solr/values.yaml +++ b/stable/fdi-dotstatsuite-sfs-solr/values.yaml @@ -5,7 +5,7 @@ # Globals nameOverride: "fdi-dotstatsuite-sfs-solr" fullnameOverride: "fdi-dotstatsuite-sfs-solr" - +repository_base: artifactory.cloud.statcan.ca/docker # sfs # https://gitlab.k8s.cloud.statcan.ca/analytics-platform/discovery/dotstatsuite-docker-compose sfs: