diff --git a/.github/workflows/testkube.yml b/.github/workflows/testkube.yml index 0ca1e79..36d4e66 100644 --- a/.github/workflows/testkube.yml +++ b/.github/workflows/testkube.yml @@ -94,17 +94,15 @@ 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: | - 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: | diff --git a/charts/minio/templates/minio-deployment.yaml b/charts/minio/templates/minio-deployment.yaml index de0c91a..70a2942 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 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 }}