From 3f79de50b1e3438f11b5a5b73b7f4913011fb5ca Mon Sep 17 00:00:00 2001 From: Hector Machin Date: Mon, 26 Feb 2024 13:56:13 -0500 Subject: [PATCH 1/8] Support minio storage class type --- charts/minio/templates/minio-storage-class.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/charts/minio/templates/minio-storage-class.yaml b/charts/minio/templates/minio-storage-class.yaml index 7dc00eb..332b498 100644 --- a/charts/minio/templates/minio-storage-class.yaml +++ b/charts/minio/templates/minio-storage-class.yaml @@ -8,4 +8,10 @@ metadata: provisioner: {{ .Values.storage.provisioner }} reclaimPolicy: Retain volumeBindingMode: {{ .Values.storage.volumeBindingMode }} +{{- if (hasKey .Values.storage "parameters") }} +{{- if (hasKey .Values.storage.parameters "type") }} +parameters: + type: {{ .Values.storage.parameters.type }} +{{- end -}} +{{- end -}} {{- end }} From fbde64a2a630538246075e219164060d3c5a3d86 Mon Sep 17 00:00:00 2001 From: Hector Machin Date: Mon, 26 Feb 2024 16:25:45 -0500 Subject: [PATCH 2/8] Adding nodeselector for minio --- charts/minio/templates/minio-deployment.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/charts/minio/templates/minio-deployment.yaml b/charts/minio/templates/minio-deployment.yaml index de0c91a..c7bee27 100644 --- a/charts/minio/templates/minio-deployment.yaml +++ b/charts/minio/templates/minio-deployment.yaml @@ -52,4 +52,10 @@ spec: - name: minio-claim0 persistentVolumeClaim: claimName: minio-claim0 +{{- if (hasKey .Values.storage "nodeSelector") }} +{{- if (hasKey .Values.storage.nodeSelector "app") }} + nodeSelector: + app: {{ .Values.storage.nodeSelector.app }} +{{- end -}} +{{- end -}} status: {} From aeb92d40438645ab1e6d95d6ffb3e8772ba68400 Mon Sep 17 00:00:00 2001 From: Hector Machin Date: Mon, 26 Feb 2024 16:32:26 -0500 Subject: [PATCH 3/8] Adding nodeselector for minio --- charts/minio/templates/minio-deployment.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/minio/templates/minio-deployment.yaml b/charts/minio/templates/minio-deployment.yaml index c7bee27..f99673c 100644 --- a/charts/minio/templates/minio-deployment.yaml +++ b/charts/minio/templates/minio-deployment.yaml @@ -52,10 +52,10 @@ spec: - name: minio-claim0 persistentVolumeClaim: claimName: minio-claim0 -{{- if (hasKey .Values.storage "nodeSelector") }} -{{- if (hasKey .Values.storage.nodeSelector "app") }} + {{- if (hasKey .Values.storage "nodeSelector") }} + {{- if (hasKey .Values.storage.nodeSelector "app") }} nodeSelector: app: {{ .Values.storage.nodeSelector.app }} -{{- end -}} -{{- end -}} + {{- end -}} + {{- end -}} status: {} From 99416782dfc3f2d2afb92d2f8ccbfb04ada6396a Mon Sep 17 00:00:00 2001 From: Hector Machin Date: Mon, 26 Feb 2024 16:39:18 -0500 Subject: [PATCH 4/8] Adding nodeselector for minio --- charts/minio/templates/minio-deployment.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/minio/templates/minio-deployment.yaml b/charts/minio/templates/minio-deployment.yaml index f99673c..9a78616 100644 --- a/charts/minio/templates/minio-deployment.yaml +++ b/charts/minio/templates/minio-deployment.yaml @@ -17,6 +17,12 @@ spec: labels: app: minio spec: + {{- if (hasKey .Values.storage "nodeSelector") }} + {{- if (hasKey .Values.storage.nodeSelector "app") }} + nodeSelector: + app: {{ .Values.storage.nodeSelector.app }} + {{- end -}} + {{- end -}} containers: - command: - bash @@ -52,10 +58,4 @@ spec: - name: minio-claim0 persistentVolumeClaim: claimName: minio-claim0 - {{- if (hasKey .Values.storage "nodeSelector") }} - {{- if (hasKey .Values.storage.nodeSelector "app") }} - nodeSelector: - app: {{ .Values.storage.nodeSelector.app }} - {{- end -}} - {{- end -}} status: {} From 7276afacde21dc2c879bfd5af9a919cb93ee2d02 Mon Sep 17 00:00:00 2001 From: Hector Machin Date: Mon, 26 Feb 2024 16:43:45 -0500 Subject: [PATCH 5/8] Adding nodeselector for minio --- charts/minio/templates/minio-deployment.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/minio/templates/minio-deployment.yaml b/charts/minio/templates/minio-deployment.yaml index 9a78616..70a2942 100644 --- a/charts/minio/templates/minio-deployment.yaml +++ b/charts/minio/templates/minio-deployment.yaml @@ -17,12 +17,12 @@ spec: labels: app: minio spec: - {{- if (hasKey .Values.storage "nodeSelector") }} - {{- if (hasKey .Values.storage.nodeSelector "app") }} + {{- if (hasKey .Values.storage "nodeSelector") -}} + {{- if (hasKey .Values.storage.nodeSelector "app") -}} nodeSelector: app: {{ .Values.storage.nodeSelector.app }} - {{- end -}} - {{- end -}} + {{- end }} + {{- end }} containers: - command: - bash From 6d05f25c41dea505aa324408f5ca55ee5bb2d36a Mon Sep 17 00:00:00 2001 From: Hector Machin Date: Mon, 26 Feb 2024 16:50:03 -0500 Subject: [PATCH 6/8] Adding nodeselector for minio --- .github/workflows/testkube.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/testkube.yml b/.github/workflows/testkube.yml index 0ca1e79..4d72b55 100644 --- a/.github/workflows/testkube.yml +++ b/.github/workflows/testkube.yml @@ -20,6 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@master + - uses: kubeshop/setup-testkube@v1 - name: Create k3d Cluster uses: nolar/setup-k3d-k3s@v1 @@ -96,15 +97,12 @@ jobs: - name: Installing Testkube run: | - wget -qO - https://repo.testkube.io/key.pub | sudo apt-key add - - echo "deb https://repo.testkube.io/linux linux main" | sudo tee -a /etc/apt/sources.list - sudo apt-get update - sudo apt-get install -y testkube kubectl testkube install --no-confirm kubectl wait --for=condition=ready --timeout=30m pod -n testkube -l app.kubernetes.io/instance=testkube kubectl port-forward -n testkube svc/testkube-api-server 8088:8088 & testkube config api-uri http://127.0.0.1:8088/v1 + - name: Create Testkube Tests continue-on-error: true run: | From 6fc224eee5b5a2c70514020ced3e24be41345ca0 Mon Sep 17 00:00:00 2001 From: Hector Machin Date: Mon, 26 Feb 2024 16:52:41 -0500 Subject: [PATCH 7/8] Adding testkube github action --- .github/workflows/testkube.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testkube.yml b/.github/workflows/testkube.yml index 4d72b55..36d4e66 100644 --- a/.github/workflows/testkube.yml +++ b/.github/workflows/testkube.yml @@ -20,7 +20,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@master - - uses: kubeshop/setup-testkube@v1 - name: Create k3d Cluster uses: nolar/setup-k3d-k3s@v1 @@ -95,6 +94,7 @@ jobs: mc alias set swoopminio http://127.0.0.1:9000 $MINIO_ACCESS_KEY $MINIO_SECRET_KEY mc cp --recursive swoop/tests/fixtures/io/base_01/ swoopminio/swoop/executions/2595f2da-81a6-423c-84db-935e6791046e/ + - uses: kubeshop/setup-testkube@v1 - name: Installing Testkube run: | kubectl testkube install --no-confirm From 1194a925e8903a8376a12bb86597f71f323abfa4 Mon Sep 17 00:00:00 2001 From: Hector Machin Date: Mon, 26 Feb 2024 17:15:30 -0500 Subject: [PATCH 8/8] Adding nodeselector for minio and nginx --- charts/minio/templates/minio-deployment.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/minio/templates/minio-deployment.yaml b/charts/minio/templates/minio-deployment.yaml index 70a2942..a2f568f 100644 --- a/charts/minio/templates/minio-deployment.yaml +++ b/charts/minio/templates/minio-deployment.yaml @@ -17,12 +17,12 @@ spec: labels: app: minio spec: - {{- if (hasKey .Values.storage "nodeSelector") -}} - {{- if (hasKey .Values.storage.nodeSelector "app") -}} + {{ if (hasKey .Values.storage "nodeSelector") }} + {{ if (hasKey .Values.storage.nodeSelector "app") }} nodeSelector: app: {{ .Values.storage.nodeSelector.app }} - {{- end }} - {{- end }} + {{ end }} + {{ end }} containers: - command: - bash