From ea7a2d7f48c55ab682ad1a79536cf2ba7c9b659e Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Fri, 14 Mar 2025 12:57:38 +0100 Subject: [PATCH 1/2] bump postgres and minio --- .../getting_started/getting_started.sh | 38 +++++++++---------- .../getting_started/getting_started.sh.j2 | 38 +++++++++---------- .../examples/getting_started/minio-stack.yaml | 2 +- .../getting_started/postgres-stack.yaml | 2 +- docs/templating_vars.yaml | 4 +- 5 files changed, 42 insertions(+), 42 deletions(-) diff --git a/docs/modules/hive/examples/getting_started/getting_started.sh b/docs/modules/hive/examples/getting_started/getting_started.sh index 20778d12..6a70acf4 100755 --- a/docs/modules/hive/examples/getting_started/getting_started.sh +++ b/docs/modules/hive/examples/getting_started/getting_started.sh @@ -42,29 +42,29 @@ helm install --wait hive-operator stackable-dev/hive-operator --version 0.0.0-de echo "Install minio for S3" # tag::helm-install-minio[] helm install minio \ ---version 4.0.2 \ ---namespace default \ ---set mode=standalone \ ---set replicas=1 \ ---set persistence.enabled=false \ ---set "buckets[0].name=hive,buckets[0].policy=none" \ ---set "users[0].accessKey=hive,users[0].secretKey=hivehive,users[0].policy=readwrite" \ ---set resources.requests.memory=1Gi \ ---set service.type=NodePort,service.nodePort=null \ ---set consoleService.type=NodePort,consoleService.nodePort=null \ ---repo https://charts.min.io/ minio + --version 5.4.0 \ + --namespace default \ + --set mode=standalone \ + --set replicas=1 \ + --set persistence.enabled=false \ + --set buckets[0].name=hive,buckets[0].policy=none \ + --set users[0].accessKey=hive,users[0].secretKey=hivehive,users[0].policy=readwrite \ + --set resources.requests.memory=1Gi \ + --set service.type=NodePort,service.nodePort=null \ + --set consoleService.type=NodePort,consoleService.nodePort=null \ + --repo https://charts.min.io/ minio # end::helm-install-minio[] echo "Install postgres for Hive" # tag::helm-install-postgres[] -helm install postgresql \ ---version 12.1.5 \ ---namespace default \ ---set auth.username=hive \ ---set auth.password=hive \ ---set auth.database=hive \ ---set primary.extendedConfiguration="password_encryption=md5" \ ---repo https://charts.bitnami.com/bitnami postgresql +helm install postgresql oci://registry-1.docker.io/bitnamicharts/postgresql \ + --version 16.5.0 \ + --namespace default \ + --set auth.username=hive \ + --set auth.password=hive \ + --set auth.database=hive \ + --set primary.extendedConfiguration="password_encryption=md5" \ + --wait # end::helm-install-postgres[] ;; "stackablectl") diff --git a/docs/modules/hive/examples/getting_started/getting_started.sh.j2 b/docs/modules/hive/examples/getting_started/getting_started.sh.j2 index 5878a39c..556cd13d 100755 --- a/docs/modules/hive/examples/getting_started/getting_started.sh.j2 +++ b/docs/modules/hive/examples/getting_started/getting_started.sh.j2 @@ -42,29 +42,29 @@ helm install --wait hive-operator {{ helm.repo_name }}/hive-operator --version { echo "Install minio for S3" # tag::helm-install-minio[] helm install minio \ ---version {{ versions.minio }} \ ---namespace default \ ---set mode=standalone \ ---set replicas=1 \ ---set persistence.enabled=false \ ---set buckets[0].name=hive,buckets[0].policy=none \ ---set users[0].accessKey=hive,users[0].secretKey=hivehive,users[0].policy=readwrite \ ---set resources.requests.memory=1Gi \ ---set service.type=NodePort,service.nodePort=null \ ---set consoleService.type=NodePort,consoleService.nodePort=null \ ---repo https://charts.min.io/ minio + --version {{ versions.minio }} \ + --namespace default \ + --set mode=standalone \ + --set replicas=1 \ + --set persistence.enabled=false \ + --set buckets[0].name=hive,buckets[0].policy=none \ + --set users[0].accessKey=hive,users[0].secretKey=hivehive,users[0].policy=readwrite \ + --set resources.requests.memory=1Gi \ + --set service.type=NodePort,service.nodePort=null \ + --set consoleService.type=NodePort,consoleService.nodePort=null \ + --repo https://charts.min.io/ minio # end::helm-install-minio[] echo "Install postgres for Hive" # tag::helm-install-postgres[] -helm install postgresql \ ---version {{ versions.postgresql }} \ ---namespace default \ ---set auth.username=hive \ ---set auth.password=hive \ ---set auth.database=hive \ ---set primary.extendedConfiguration="password_encryption=md5" \ ---repo https://charts.bitnami.com/bitnami postgresql +helm install postgresql oci://registry-1.docker.io/bitnamicharts/postgresql \ + --version {{ versions.postgresql }} \ + --namespace default \ + --set auth.username=hive \ + --set auth.password=hive \ + --set auth.database=hive \ + --set primary.extendedConfiguration="password_encryption=md5" \ + --wait # end::helm-install-postgres[] ;; "stackablectl") diff --git a/docs/modules/hive/examples/getting_started/minio-stack.yaml b/docs/modules/hive/examples/getting_started/minio-stack.yaml index 504b8c5c..48fcfd66 100644 --- a/docs/modules/hive/examples/getting_started/minio-stack.yaml +++ b/docs/modules/hive/examples/getting_started/minio-stack.yaml @@ -4,7 +4,7 @@ name: minio repo: name: minio url: https://charts.min.io/ -version: 4.0.2 +version: 5.4.0 options: rootUser: root rootPassword: rootroot diff --git a/docs/modules/hive/examples/getting_started/postgres-stack.yaml b/docs/modules/hive/examples/getting_started/postgres-stack.yaml index 09f375be..46e5b0cc 100644 --- a/docs/modules/hive/examples/getting_started/postgres-stack.yaml +++ b/docs/modules/hive/examples/getting_started/postgres-stack.yaml @@ -4,7 +4,7 @@ name: postgresql repo: name: bitnami url: https://charts.bitnami.com/bitnami/ -version: 12.1.5 +version: 16.5.0 options: volumePermissions: enabled: false diff --git a/docs/templating_vars.yaml b/docs/templating_vars.yaml index 62e39d76..0dac15ec 100644 --- a/docs/templating_vars.yaml +++ b/docs/templating_vars.yaml @@ -7,5 +7,5 @@ versions: secret: 0.0.0-dev listener: 0.0.0-dev hive: 0.0.0-dev - minio: 4.0.2 - postgresql: 12.1.5 + minio: 5.4.0 + postgresql: 16.5.0 From c80ad6faac5ee0b0377ea9f137387402965c4ec6 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Fri, 14 Mar 2025 14:05:34 +0100 Subject: [PATCH 2/2] template minio and postgresql scripts --- .../getting_started/minio-stack.yaml.j2 | 27 +++++++++++++++++++ .../getting_started/postgres-stack.yaml.j2 | 19 +++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 docs/modules/hive/examples/getting_started/minio-stack.yaml.j2 create mode 100644 docs/modules/hive/examples/getting_started/postgres-stack.yaml.j2 diff --git a/docs/modules/hive/examples/getting_started/minio-stack.yaml.j2 b/docs/modules/hive/examples/getting_started/minio-stack.yaml.j2 new file mode 100644 index 00000000..d91ad0c2 --- /dev/null +++ b/docs/modules/hive/examples/getting_started/minio-stack.yaml.j2 @@ -0,0 +1,27 @@ +--- +releaseName: minio +name: minio +repo: + name: minio + url: https://charts.min.io/ +version: {{ versions.minio }} +options: + rootUser: root + rootPassword: rootroot + mode: standalone + users: + - accessKey: hive + secretKey: hivehive + policy: readwrite + buckets: + - name: hive + policy: public + resources: + requests: + memory: 2Gi + service: + type: NodePort + nodePort: null + consoleService: + type: NodePort + nodePort: null diff --git a/docs/modules/hive/examples/getting_started/postgres-stack.yaml.j2 b/docs/modules/hive/examples/getting_started/postgres-stack.yaml.j2 new file mode 100644 index 00000000..862c977f --- /dev/null +++ b/docs/modules/hive/examples/getting_started/postgres-stack.yaml.j2 @@ -0,0 +1,19 @@ +--- +releaseName: postgresql +name: postgresql +repo: + name: bitnami + url: https://charts.bitnami.com/bitnami/ +version: {{ versions.postgresql }} +options: + volumePermissions: + enabled: false + securityContext: + runAsUser: auto + primary: + extendedConfiguration: | + password_encryption=md5 + auth: + username: hive + password: hive + database: hive