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.

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

fix(deps): strip quotes from version string #431

Merged
merged 3 commits into from
Jan 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
release=${{ steps.auto_version.outputs.version }}
provenance: false # https://issues.redhat.com/browse/PROJQUAY-5013 quay doesn't support it
build-args: |
VERSION='${{ steps.auto_version.outputs.version }}'
VERSION=${{ steps.auto_version.outputs.version }}
platforms: linux/amd64,linux/arm64

# HELM
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
quay.expires-after=14d
provenance: false # https://issues.redhat.com/browse/PROJQUAY-5013 quay doesn't support it
build-args: |
VERSION='${{ steps.auto_version.outputs.version }}'
VERSION=${{ steps.auto_version.outputs.version }}
platforms: linux/amd64,linux/arm64

# HELM
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,12 @@ jobs:
cache-from: type=gha
cache-to: type=gha,mode=max
labels: |
revision='${{ steps.set_version.outputs.version }}'
revision=${{ steps.set_version.outputs.version }}
version=${{ steps.set_version.outputs.version }}
release=${{ steps.set_version.outputs.version }}

build-args: |
VERSION='${{ steps.set_version.outputs.version }}'
VERSION=${{ steps.set_version.outputs.version }}
platforms: linux/amd64,linux/arm64

- name: helm-docs
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN true


RUN echo Building package
RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -a -ldflags '-X main.version='$VERSION' -extldflags "-static"' -o "/bin/wekafsplugin" /src/cmd/*
RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -a -ldflags "-X main.version=$VERSION -extldflags '-static'" -o "/bin/wekafsplugin" /src/cmd/*
FROM registry.k8s.io/kubernetes/kubectl:v${KUBECTL_VERSION} AS kubectl

FROM registry.access.redhat.com/ubi9/ubi:${UBI_HASH}
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# CSI WekaFS Driver
Helm chart for Deployment of WekaIO Container Storage Interface (CSI) plugin for WekaFS - the world fastest filesystem

![Version: 2.6.0-SNAPSHOT.76.1bf2221](https://img.shields.io/badge/Version-2.6.0--SNAPSHOT.76.1bf2221-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.6.0-SNAPSHOT.76.1bf2221](https://img.shields.io/badge/AppVersion-v2.6.0--SNAPSHOT.76.1bf2221-informational?style=flat-square)
![Version: 2.6.0-SNAPSHOT.79.9698a4b](https://img.shields.io/badge/Version-2.6.0--SNAPSHOT.79.9698a4b-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.6.0-SNAPSHOT.79.9698a4b](https://img.shields.io/badge/AppVersion-v2.6.0--SNAPSHOT.79.9698a4b-informational?style=flat-square)
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
[![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/csi-wekafs)](https://artifacthub.io/packages/search?repo=csi-wekafs)

Expand Down Expand Up @@ -48,7 +48,7 @@ make build
|-----|------|---------|-------------|
| dynamicProvisionPath | string | `"csi-volumes"` | Directory in root of file system where dynamic volumes are provisioned |
| csiDriverName | string | `"csi.weka.io"` | Name of the driver (and provisioner) |
| csiDriverVersion | string | `"2.6.0-SNAPSHOT.76.1bf2221"` | CSI driver version |
| csiDriverVersion | string | `"2.6.0-SNAPSHOT.79.9698a4b"` | CSI driver version |
| images.livenessprobesidecar | string | `"registry.k8s.io/sig-storage/livenessprobe:v2.15.0"` | CSI liveness probe sidecar image URL |
| images.attachersidecar | string | `"registry.k8s.io/sig-storage/csi-attacher:v4.8.0"` | CSI attacher sidecar image URL |
| images.provisionersidecar | string | `"registry.k8s.io/sig-storage/csi-provisioner:v5.1.0"` | CSI provisioner sidecar image URL |
Expand All @@ -57,7 +57,7 @@ make build
| images.snapshottersidecar | string | `"registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0"` | CSI snapshotter sidecar image URL |
| images.nodeinfo | string | `"quay.io/weka.io/csi-wekafs"` | CSI nodeinfo sidecar image URL, used for reading node metadata |
| images.csidriver | string | `"quay.io/weka.io/csi-wekafs"` | CSI driver main image URL |
| images.csidriverTag | string | `"2.6.0-SNAPSHOT.76.1bf2221"` | CSI driver tag |
| images.csidriverTag | string | `"2.6.0-SNAPSHOT.79.9698a4b"` | CSI driver tag |
| imagePullSecret | string | `""` | image pull secret required for image download. Must have permissions to access all images above. Should be used in case of private registry that requires authentication |
| globalPluginTolerations | list | `[{"effect":"NoSchedule","key":"node-role.kubernetes.io/master","operator":"Exists"}]` | Tolerations for all CSI driver components |
| controllerPluginTolerations | list | `[{"effect":"NoSchedule","key":"node-role.kubernetes.io/master","operator":"Exists"}]` | Tolerations for CSI controller component only (by default same as global) |
Expand Down
4 changes: 2 additions & 2 deletions charts/csi-wekafsplugin/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ sources:
home: https://github.com/weka/csi-wekafs
icon: https://weka.github.io/csi-wekafs/logo.png
type: application
version: 2.6.0-SNAPSHOT.76.1bf2221
appVersion: v2.6.0-SNAPSHOT.76.1bf2221
version: 2.6.0-SNAPSHOT.79.9698a4b
appVersion: v2.6.0-SNAPSHOT.79.9698a4b
keywords: [storage, filesystem, HPC]
annotations:
artifacthub.io/category: "storage"
Expand Down
6 changes: 3 additions & 3 deletions charts/csi-wekafsplugin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Helm chart for Deployment of WekaIO Container Storage Interface (CSI) plugin for

[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
[![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/csi-wekafs)](https://artifacthub.io/packages/search?repo=csi-wekafs)
![Version: 2.6.0-SNAPSHOT.76.1bf2221](https://img.shields.io/badge/Version-2.6.0--SNAPSHOT.76.1bf2221-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.6.0-SNAPSHOT.76.1bf2221](https://img.shields.io/badge/AppVersion-v2.6.0--SNAPSHOT.76.1bf2221-informational?style=flat-square)
![Version: 2.6.0-SNAPSHOT.79.9698a4b](https://img.shields.io/badge/Version-2.6.0--SNAPSHOT.79.9698a4b-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.6.0-SNAPSHOT.79.9698a4b](https://img.shields.io/badge/AppVersion-v2.6.0--SNAPSHOT.79.9698a4b-informational?style=flat-square)

## Homepage
https://github.com/weka/csi-wekafs
Expand Down Expand Up @@ -52,7 +52,7 @@ helm install csi-wekafsplugin csi-wekafs/csi-wekafsplugin --namespace csi-wekafs
|-----|------|---------|-------------|
| dynamicProvisionPath | string | `"csi-volumes"` | Directory in root of file system where dynamic volumes are provisioned |
| csiDriverName | string | `"csi.weka.io"` | Name of the driver (and provisioner) |
| csiDriverVersion | string | `"2.6.0-SNAPSHOT.76.1bf2221"` | CSI driver version |
| csiDriverVersion | string | `"2.6.0-SNAPSHOT.79.9698a4b"` | CSI driver version |
| images.livenessprobesidecar | string | `"registry.k8s.io/sig-storage/livenessprobe:v2.15.0"` | CSI liveness probe sidecar image URL |
| images.attachersidecar | string | `"registry.k8s.io/sig-storage/csi-attacher:v4.8.0"` | CSI attacher sidecar image URL |
| images.provisionersidecar | string | `"registry.k8s.io/sig-storage/csi-provisioner:v5.1.0"` | CSI provisioner sidecar image URL |
Expand All @@ -61,7 +61,7 @@ helm install csi-wekafsplugin csi-wekafs/csi-wekafsplugin --namespace csi-wekafs
| images.snapshottersidecar | string | `"registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0"` | CSI snapshotter sidecar image URL |
| images.nodeinfo | string | `"quay.io/weka.io/csi-wekafs"` | CSI nodeinfo sidecar image URL, used for reading node metadata |
| images.csidriver | string | `"quay.io/weka.io/csi-wekafs"` | CSI driver main image URL |
| images.csidriverTag | string | `"2.6.0-SNAPSHOT.76.1bf2221"` | CSI driver tag |
| images.csidriverTag | string | `"2.6.0-SNAPSHOT.79.9698a4b"` | CSI driver tag |
| imagePullSecret | string | `""` | image pull secret required for image download. Must have permissions to access all images above. Should be used in case of private registry that requires authentication |
| globalPluginTolerations | list | `[{"effect":"NoSchedule","key":"node-role.kubernetes.io/master","operator":"Exists"}]` | Tolerations for all CSI driver components |
| controllerPluginTolerations | list | `[{"effect":"NoSchedule","key":"node-role.kubernetes.io/master","operator":"Exists"}]` | Tolerations for CSI controller component only (by default same as global) |
Expand Down
2 changes: 1 addition & 1 deletion charts/csi-wekafsplugin/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dynamicProvisionPath: "csi-volumes"
# -- Name of the driver (and provisioner)
csiDriverName: "csi.weka.io"
# -- CSI driver version
csiDriverVersion: &csiDriverVersion 2.6.0-SNAPSHOT.76.1bf2221
csiDriverVersion: &csiDriverVersion 2.6.0-SNAPSHOT.79.9698a4b
images:
# -- CSI liveness probe sidecar image URL
livenessprobesidecar: registry.k8s.io/sig-storage/livenessprobe:v2.15.0
Expand Down
2 changes: 1 addition & 1 deletion tests/csi-sanity/ga-Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN go install -v github.com/kubernetes-csi/csi-test/v5/cmd/csi-sanity@v5.3.1
COPY cmd cmd
COPY pkg pkg

RUN CGO_ENABLED=0 GOOS="linux" GOARCH="amd64" go build -a -ldflags '-X main.version='$VERSION' -extldflags "-static"' -o wekafsplugin ./cmd/wekafsplugin/main.go
RUN CGO_ENABLED=0 GOOS="linux" GOARCH="amd64" go build -a -ldflags "-X main.version=$VERSION -extldflags '-static'" -o wekafsplugin ./cmd/wekafsplugin/main.go


FROM golang:1.23-alpine
Expand Down
Loading