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

Upgrade plugin to support 1.30 Kubernetes version cluster and sideCars version #814

Merged
merged 4 commits into from
Oct 15, 2024
Merged

Upgrade plugin to support 1.30 Kubernetes version cluster and sideCars version #814

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e0e349
bump k8s and go versions
outscale-hmi Aug 26, 2024
d8e9ddf
bump external-snapshotter version
outscale-hmi Oct 2, 2024
7a0f499
add patch to provisioner and snapshotor clusterrole
outscale-hmi Oct 14, 2024
a3f168a
fix wait for success
outscale-hmi Oct 14, 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
6 changes: 3 additions & 3 deletions .github/workflows/e2e_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- uses: azure/[email protected]
- uses: azure/setup-helm@v3
with:
version: v3.10.1
version: v3.16.1
- uses: actions/setup-go@v3
with:
go-version-file: 'go.mod'
Expand All @@ -59,8 +59,8 @@ jobs:
osc_secret_key: ${{ secrets.OSC_SECRET_KEY }}
osc_region: ${{ secrets.OSC_REGION }}
image_id: ${{ secrets.OMI_ID }}
rke_version: "v1.4.12"
kubernetes_version: "v1.26.11-rancher2-1"
rke_version: "v1.6.0"
kubernetes_version: "v1.30.2-rancher1-1"
- name: Wait to access the cluster
uses: nick-invision/retry@v2
with:
Expand Down
7 changes: 4 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
ARG GOLANG_IMAGE_TAG=1.19-buster
ARG RUNTIME_IMAGE_TAG=3.13.12
ARG GOLANG_IMAGE_TAG=1.23.2-bookworm
ARG RUNTIME_IMAGE_TAG=3.13

# Build image
FROM golang:${GOLANG_IMAGE_TAG} AS builder

# This build arg is the version to embed in the CPI binary
ARG VERSION=${VERSION}

Expand Down Expand Up @@ -30,4 +31,4 @@ RUN apk add --no-cache \
cryptsetup=2.3.7-r0
COPY --from=builder /build/bin/osc-bsu-csi-driver /bin/osc-bsu-csi-driver

ENTRYPOINT ["/bin/osc-bsu-csi-driver"]
ENTRYPOINT ["/bin/osc-bsu-csi-driver"]
10 changes: 5 additions & 5 deletions docs/deploy.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Deployment
> **_NOTE:_** Starting from the version v0.0.15, the snapshot-controller and the CRD will no longer be included in the chart. If you need it, you will have to install it manually as following
```
kubectl apply -f https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/release-5.0/client/config/crd/snapshot.storage.k8s.io_volumesnapshotclasses.yaml
kubectl apply -f https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/release-5.0/client/config/crd/snapshot.storage.k8s.io_volumesnapshotcontents.yaml
kubectl apply -f https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/release-5.0/client/config/crd/snapshot.storage.k8s.io_volumesnapshots.yaml
kubectl apply -f https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/release-5.0/deploy/kubernetes/snapshot-controller/rbac-snapshot-controller.yaml
kubectl apply -f https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/release-5.0/deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml
kubectl apply -f https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/release-8.0/client/config/crd/snapshot.storage.k8s.io_volumesnapshotclasses.yaml
kubectl apply -f https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/release-8.0/client/config/crd/snapshot.storage.k8s.io_volumesnapshotcontents.yaml
kubectl apply -f https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/release-8.0/client/config/crd/snapshot.storage.k8s.io_volumesnapshots.yaml
kubectl apply -f https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/release-8.0/deploy/kubernetes/snapshot-controller/rbac-snapshot-controller.yaml
kubectl apply -f https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/release-8.0/deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml
```

## Steps
Expand Down
226 changes: 122 additions & 104 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,144 +1,162 @@
module github.com/outscale-dev/osc-bsu-csi-driver

go 1.19
go 1.23.0

replace (
gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1 // for the CVE-2022-28948
k8s.io/api => k8s.io/api v0.26.8
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.8
k8s.io/apimachinery => k8s.io/apimachinery v0.26.8
k8s.io/apiserver => k8s.io/apiserver v0.26.8
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.8
k8s.io/client-go => k8s.io/client-go v0.26.8
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.8
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.8
k8s.io/code-generator => k8s.io/code-generator v0.26.8
k8s.io/component-base => k8s.io/component-base v0.26.8
k8s.io/component-helpers => k8s.io/component-helpers v0.26.8
k8s.io/controller-manager => k8s.io/controller-manager v0.26.8
k8s.io/cri-api => k8s.io/cri-api v0.26.8
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.8
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.8
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.8
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.8
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.8
k8s.io/kubectl => k8s.io/kubectl v0.26.8
k8s.io/kubelet => k8s.io/kubelet v0.26.8
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.8
k8s.io/metrics => k8s.io/metrics v0.26.8
k8s.io/mount-utils => k8s.io/mount-utils v0.26.8
k8s.io/node-api => k8s.io/node-api v0.26.8
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.8
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.8
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.8
k8s.io/sample-controller => k8s.io/sample-controller v0.26.8
vbom.ml/util => github.com/fvbommel/util v0.0.0-20160121211510-db5cfe13f5cc
k8s.io/api => k8s.io/api v0.30.5
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.5
k8s.io/apimachinery => k8s.io/apimachinery v0.30.5
k8s.io/apiserver => k8s.io/apiserver v0.30.5
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.5
k8s.io/client-go => k8s.io/client-go v0.30.5
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.5
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.5
k8s.io/code-generator => k8s.io/code-generator v0.30.5
k8s.io/component-base => k8s.io/component-base v0.31.0-alpha.2 // HACK: Workaround https://github.com/kubernetes/kubernetes/issues/124687 by using alpha tag
k8s.io/component-helpers => k8s.io/component-helpers v0.30.5
k8s.io/controller-manager => k8s.io/controller-manager v0.30.5
k8s.io/cri-api => k8s.io/cri-api v0.30.5
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.5
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.5
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.5
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.5
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.5
k8s.io/kubectl => k8s.io/kubectl v0.30.5
k8s.io/kubelet => k8s.io/kubelet v0.30.5
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.5
k8s.io/metrics => k8s.io/metrics v0.30.5
k8s.io/mount-utils => k8s.io/mount-utils v0.30.5
k8s.io/node-api => k8s.io/node-api v0.30.5
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.5
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.5
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.30.5
k8s.io/sample-controller => k8s.io/sample-controller v0.30.5
vbom.ml/util => github.com/fvbommel/util v0.0.2
)

require (
github.com/aws/aws-sdk-go v1.44.203
github.com/container-storage-interface/spec v1.7.0
github.com/container-storage-interface/spec v1.8.0
github.com/golang/mock v1.6.0
github.com/kubernetes-csi/csi-test/v4 v4.3.0
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0
github.com/onsi/ginkgo/v2 v2.8.1
github.com/onsi/gomega v1.26.0
github.com/outscale/osc-sdk-go/v2 v2.18.1
github.com/stretchr/testify v1.8.4
golang.org/x/sys v0.13.0
google.golang.org/grpc v1.59.0
google.golang.org/protobuf v1.31.0
k8s.io/api v0.26.8
k8s.io/apimachinery v0.26.8
k8s.io/client-go v0.26.8
k8s.io/component-base v0.26.8
k8s.io/klog/v2 v2.80.1
k8s.io/kubernetes v1.26.8
k8s.io/mount-utils v0.26.8
github.com/kubernetes-csi/csi-test/v5 v5.1.0
github.com/kubernetes-csi/external-snapshotter/client/v8 v8.0.0
github.com/onsi/ginkgo/v2 v2.20.1
github.com/onsi/gomega v1.34.1
github.com/outscale/osc-sdk-go/v2 v2.21.0
github.com/stretchr/testify v1.9.0
golang.org/x/sys v0.23.0
google.golang.org/grpc v1.66.2
google.golang.org/protobuf v1.34.2
k8s.io/api v0.32.0-alpha.1
k8s.io/apimachinery v0.32.0-alpha.1
k8s.io/client-go v1.5.2
k8s.io/component-base v0.32.0-alpha.1
k8s.io/klog/v2 v2.130.1
k8s.io/kubernetes v1.30.5
k8s.io/mount-utils v0.30.5
k8s.io/pod-security-admission v0.0.0
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
)

require (
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/coreos/go-semver v0.3.1 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/cel-go v0.17.8 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
github.com/imdario/mergo v0.3.6 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/moby/sys/mountinfo v0.6.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/onsi/ginkgo v1.16.4 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/selinux v1.10.0 // indirect
github.com/opencontainers/selinux v1.11.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/spf13/cobra v1.6.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.19.1 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/spf13/cobra v1.8.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0 // indirect
go.opentelemetry.io/otel v1.10.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
go.opentelemetry.io/otel/metric v0.31.0 // indirect
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
go.opentelemetry.io/otel/trace v1.10.0 // indirect
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.11.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
google.golang.org/appengine v1.6.7 // indirect
github.com/stoewer/go-strcase v1.2.0 // indirect
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0 // indirect
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
go.opentelemetry.io/otel/trace v1.28.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/crypto v0.26.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/term v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.24.0 // indirect
google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.0.0 // indirect
k8s.io/apiserver v0.26.8 // indirect
k8s.io/apiserver v0.30.5 // indirect
k8s.io/cloud-provider v0.25.6 // indirect
k8s.io/component-helpers v0.26.8 // indirect
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
k8s.io/component-helpers v0.30.5 // indirect
k8s.io/controller-manager v0.30.5 // indirect
k8s.io/kms v0.30.5 // indirect
k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 // indirect
k8s.io/kubectl v0.0.0 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
k8s.io/kubelet v0.0.0 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
Loading