Skip to content

Commit

Permalink
Merge pull request #157 from SgtCoDFish/verbump
Browse files Browse the repository at this point in the history
Bump version for release
  • Loading branch information
jetstack-bot authored Nov 14, 2023
2 parents 2885aa2 + a3336d9 commit db1959d
Show file tree
Hide file tree
Showing 6 changed files with 1,304 additions and 43 deletions.
11 changes: 8 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@

BINDIR ?= $(CURDIR)/bin
ARCH ?= $(shell go env GOARCH)
HELM_VERSION ?= 3.8.1
IMAGE_PLATFORMS ?= linux/amd64,linux/arm64,linux/arm/v7,linux/ppc64le

APP_VERSION ?= v0.6.0
HELM_VERSION ?= 3.8.1

UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Linux)
OS := linux
Expand Down Expand Up @@ -62,7 +64,7 @@ helm-docs: $(BINDIR)/helm-docs # verify helm-docs
# arguments to `--push`.
.PHONY: image
image: ## build cert-manager-csi-driver docker image targeting all supported platforms
docker buildx build --platform=$(IMAGE_PLATFORMS) -t quay.io/jetstack/cert-manager-csi-driver:v0.5.0 --output type=oci,dest=./bin/cert-manager-csi-driver-oci .
docker buildx build --platform=$(IMAGE_PLATFORMS) -t quay.io/jetstack/cert-manager-csi-driver:$(APP_VERSION) --output type=oci,dest=./bin/cert-manager-csi-driver-oci .

.PHONY: e2e
e2e: depend ## run end to end tests
Expand All @@ -79,15 +81,18 @@ deploy/charts/csi-driver/README.md: $(BINDIR)/helm-docs $(CHART_YAML)
.PHONY: depend
depend: $(BINDIR)/helm $(BINDIR)/helm-docs $(BINDIR)/kind

# TODO: respect locally specified Helm version and overwrite binary when version changes
$(BINDIR)/helm: | $(BINDIR)
curl -o $(BINDIR)/helm.tar.gz -LO "https://get.helm.sh/helm-v$(HELM_VERSION)-$(OS)-$(ARCH).tar.gz"
tar -C $(BINDIR) -xzf $(BINDIR)/helm.tar.gz
cp $(BINDIR)/$(OS)-$(ARCH)/helm $(BINDIR)/helm
rm -r $(BINDIR)/$(OS)-$(ARCH) $(BINDIR)/helm.tar.gz

# TODO: respect locally specified helm-docs version and overwrite binary when version changes
$(BINDIR)/helm-docs: $(BINDIR)
cd hack/tools && go build -o $(BINDIR)/helm-docs github.com/norwoodj/helm-docs/cmd/helm-docs
cd hack/tools && go build -o $(BINDIR)/helm-docs github.com/norwoodj/helm-docs/cmd/helm-docs

# TODO: respect locally specified kind version and overwrite binary when version changes
$(BINDIR)/kind:
cd hack/tools && go build -o $(BINDIR)/kind sigs.k8s.io/kind

Expand Down
6 changes: 3 additions & 3 deletions deploy/charts/csi-driver/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2

name: cert-manager-csi-driver
type: application
description: A Helm chart for cert-manager-csi-driver
description: cert-manager-csi-driver enables issuing secretless X.509 certificates for pods using cert-manager

home: https://github.com/cert-manager/csi-driver
maintainers:
Expand All @@ -12,5 +12,5 @@ maintainers:
sources:
- https://github.com/cert-manager/csi-driver

appVersion: v0.5.0
version: v0.5.1
appVersion: v0.6.0
version: v0.6.0
8 changes: 4 additions & 4 deletions deploy/charts/csi-driver/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# cert-manager-csi-driver

![Version: v0.5.1](https://img.shields.io/badge/Version-v0.5.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.5.0](https://img.shields.io/badge/AppVersion-v0.5.0-informational?style=flat-square)
![Version: v0.6.0](https://img.shields.io/badge/Version-v0.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.6.0](https://img.shields.io/badge/AppVersion-v0.6.0-informational?style=flat-square)

A Helm chart for cert-manager-csi-driver
cert-manager-csi-driver enables issuing secretless X.509 certificates for pods using cert-manager

**Homepage:** <https://github.com/cert-manager/csi-driver>

Expand Down Expand Up @@ -33,14 +33,14 @@ A Helm chart for cert-manager-csi-driver
| daemonSetAnnotations | object | `{}` | Optional additional annotations to add to the csi-driver DaemonSet |
| image.pullPolicy | string | `"IfNotPresent"` | Kubernetes imagePullPolicy on csi-driver. |
| image.repository | string | `"quay.io/jetstack/cert-manager-csi-driver"` | Target image repository. |
| image.tag | string | `"v0.5.0"` | Target image version tag. |
| image.tag | string | `"v0.6.0"` | Target image version tag. |
| imagePullSecrets | list | `[]` | Optional secrets used for pulling the csi-driver container image |
| livenessProbeImage.pullPolicy | string | `"IfNotPresent"` | Kubernetes imagePullPolicy on liveness probe. |
| livenessProbeImage.repository | string | `"registry.k8s.io/sig-storage/livenessprobe"` | Target image repository. |
| livenessProbeImage.tag | string | `"v2.9.0"` | Target image version tag. |
| nodeDriverRegistrarImage.pullPolicy | string | `"IfNotPresent"` | Kubernetes imagePullPolicy on node-driver. |
| nodeDriverRegistrarImage.repository | string | `"registry.k8s.io/sig-storage/csi-node-driver-registrar"` | Target image repository. |
| nodeDriverRegistrarImage.tag | string | `"v2.7.0"` | Target image version tag. |
| nodeDriverRegistrarImage.tag | string | `"v2.9.1"` | Target image version tag. |
| nodeSelector | object | `{}` | Kubernetes node selector: node labels for pod assignment |
| podAnnotations | object | `{}` | Optional additional annotations to add to the csi-driver Pods |
| podLabels | object | `{}` | Optional additional labels to add to the csi-driver Pods |
Expand Down
4 changes: 2 additions & 2 deletions deploy/charts/csi-driver/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ image:
# -- Target image repository.
repository: quay.io/jetstack/cert-manager-csi-driver
# -- Target image version tag.
tag: v0.5.0
tag: v0.6.0
# -- Kubernetes imagePullPolicy on csi-driver.
pullPolicy: IfNotPresent
# Setting a digest will override any tag
Expand All @@ -19,7 +19,7 @@ nodeDriverRegistrarImage:
# -- Target image repository.
repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
# -- Target image version tag.
tag: v2.7.0
tag: v2.9.1
# -- Kubernetes imagePullPolicy on node-driver.
pullPolicy: IfNotPresent

Expand Down
71 changes: 40 additions & 31 deletions hack/tools/go.mod
Original file line number Diff line number Diff line change
@@ -1,50 +1,59 @@
module github.com/cert-manager/csi-driver/hack/tools

go 1.19
go 1.20

require (
github.com/norwoodj/helm-docs v1.10.0
sigs.k8s.io/kind v0.14.0
github.com/norwoodj/helm-docs v1.11.3
sigs.k8s.io/kind v0.20.0
)

require (
github.com/BurntSushi/toml v1.0.0 // indirect
github.com/BurntSushi/toml v1.3.2 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.1.1 // indirect
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
github.com/alessio/shellescape v1.4.1 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/google/uuid v1.2.0 // indirect
github.com/Masterminds/semver/v3 v3.2.1 // indirect
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
github.com/alessio/shellescape v1.4.2 // indirect
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/google/safetext v0.0.0-20230106111101-7156a760e523 // indirect
github.com/google/uuid v1.4.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/huandu/xstrings v1.3.2 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/huandu/xstrings v1.4.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/magiconair/properties v1.8.5 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/mapstructure v1.4.1 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/pelletier/go-toml v1.9.4 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/shopspring/decimal v1.2.0 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/spf13/afero v1.6.0 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/spf13/cobra v1.4.0 // indirect
github.com/sagikazarmark/locafero v0.3.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.10.0 // indirect
github.com/spf13/cast v1.5.1 // indirect
github.com/spf13/cobra v1.8.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.8.1 // indirect
github.com/stretchr/testify v1.7.2 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
golang.org/x/text v0.3.8 // indirect
github.com/spf13/viper v1.17.0 // indirect
github.com/stretchr/testify v1.8.4 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.15.0 // indirect
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/text v0.14.0 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/ini.v1 v1.62.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/helm v2.14.3+incompatible // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
k8s.io/helm v2.17.0+incompatible // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
Loading

0 comments on commit db1959d

Please sign in to comment.