Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sanity Test Fixes #296

Merged
merged 5 commits into from
Jan 12, 2024
Merged

Sanity Test Fixes #296

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
47ff1ce
sanity test updated
rishabhatdell Dec 14, 2023
a7420eb
sanity test
rishabhatdell Dec 14, 2023
4137536
Merge branch 'main' into sanity_test_fixes
rishabhatdell Jan 11, 2024
8d56b15
upated golang version
rishabhatdell Jan 11, 2024
06810d3
updated copyright year
rishabhatdell Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions tests/sanity/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,15 @@
#
#

FROM golang:1.13.4 as build-env
FROM golang:1.20.2 as build-env
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we update it to 1.21 or 1.22?


RUN go get -u github.com/kubernetes-csi/csi-test/...
RUN git clone https://github.com/kubernetes-csi/csi-test.git && \
cd csi-test/cmd/csi-sanity && \
make clean install && \
cp ./csi-sanity /csi-sanity

FROM frolvlad/alpine-glibc
WORKDIR /app/csi-sanity/
COPY --from=build-env /go/bin/csi-sanity .
COPY --from=build-env /csi-sanity .

ENTRYPOINT [ "./csi-sanity" ]
ENTRYPOINT [ "./csi-sanity" ]
25 changes: 0 additions & 25 deletions tests/sanity/helm/config.yaml
View file
Open in desktop

This file was deleted.

16 changes: 10 additions & 6 deletions tests/sanity/helm/sanity-csi-powerstore/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
#
# Copyright © 2020-2022 Dell Inc. or its subsidiaries. All Rights Reserved.
# Copyright © 2020-2023 Dell Inc. or its subsidiaries. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -13,20 +13,24 @@
# limitations under the License.
#
#

apiVersion: v2
appVersion: "2.9.0"
name: sanity-csi-powerstore
version: 1.0.0
appVersion: 1.0.0
version: 2.9.0
description: |
PowerStore CSI (Container Storage Interface) driver Kubernetes
integration. This chart includes everything required to provision via CSI as
well as a PowerStore StorageClass.
type: application
kubeVersion: ">= 1.24.0 < 1.29.0"
# If you are using a complex K8s version like "v1.24.3-mirantis-1", use this kubeVersion check instead
# WARNING: this version of the check will allow the use of alpha and beta versions, which is NOT SUPPORTED
# kubeVersion: ">= 1.24.0-0 < 1.29.0-0"
keywords:
- csi
- storage
home: https://github.com/dell/csi-powerstore
sources:
- https://github.com/dell/csi-powerstore
maintainers:
- name: DellEMC
engine: gotpl
- name: DellEMC
10 changes: 10 additions & 0 deletions tests/sanity/helm/sanity-csi-powerstore/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{{/*
Return true if storage capacity tracking is enabled and is supported based on k8s version
*/}}
{{- define "csi-powerstore.isStorageCapacitySupported" -}}
{{- if eq .Values.storageCapacity.enabled true -}}
{{- if and (eq .Capabilities.KubeVersion.Major "1") (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") -}}
{{- true -}}
{{- end -}}
{{- end -}}
{{- end -}}
Loading
Loading