Skip to content

Commit

Permalink
Merge branch 'development' into personal/dabradley/cleanupbadmounts
Browse files Browse the repository at this point in the history
  • Loading branch information
dabradley authored Nov 25, 2024
2 parents 9297cb4 + d656416 commit 186ee0a
Show file tree
Hide file tree
Showing 1,624 changed files with 60,602 additions and 45,215 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ REGISTRY ?= azurelustre.azurecr.io
REGISTRY_NAME ?= $(shell echo $(REGISTRY) | sed "s/.azurecr.io//g")
TARGET ?= csi
IMAGE_NAME ?= azurelustre-$(TARGET)
IMAGE_VERSION ?= v0.1.15
IMAGE_VERSION ?= v0.1.16
CLOUD ?= AzurePublicCloud
# Use a custom version for E2E tests if we are in Prow
ifdef CI
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ This driver allows Kubernetes to access Azure Lustre file system.
| v0.1.11 | mcr.microsoft.com/oss/kubernetes-csi/azurelustre-csi:v0.1.11 | 1.21+ | 2.15.1 |
| v0.1.14 | mcr.microsoft.com/oss/kubernetes-csi/azurelustre-csi:v0.1.14 | 1.21+ | 2.15.3 |
| v0.1.15 | mcr.microsoft.com/oss/kubernetes-csi/azurelustre-csi:v0.1.15 | 1.21+ | 2.15.4 |
| v0.1.16 | mcr.microsoft.com/oss/kubernetes-csi/azurelustre-csi:v0.1.15 | 1.21+ | 2.15.5 |
| v0.1.16 | mcr.microsoft.com/oss/kubernetes-csi/azurelustre-csi:v0.1.16 | 1.21+ | 2.15.5 |

 

Expand Down
2 changes: 1 addition & 1 deletion deploy/csi-azurelustre-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ spec:
cpu: 10m
memory: 20Mi
- name: azurelustre
image: mcr.microsoft.com/oss/kubernetes-csi/azurelustre-csi:v0.1.15
image: mcr.microsoft.com/oss/kubernetes-csi/azurelustre-csi:v0.1.16
imagePullPolicy: IfNotPresent
args:
- "-v=5"
Expand Down
2 changes: 1 addition & 1 deletion deploy/csi-azurelustre-node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ spec:
cpu: 10m
memory: 20Mi
- name: azurelustre
image: mcr.microsoft.com/oss/kubernetes-csi/azurelustre-csi:v0.1.15
image: mcr.microsoft.com/oss/kubernetes-csi/azurelustre-csi:v0.1.16
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
Expand Down
124 changes: 66 additions & 58 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,36 +5,43 @@ go 1.23.1
require (
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0
github.com/Azure/go-autorest/autorest v0.11.29
github.com/container-storage-interface/spec v1.8.0
github.com/kubernetes-csi/csi-lib-utils v0.9.1
github.com/container-storage-interface/spec v1.9.0
github.com/kubernetes-csi/csi-lib-utils v0.19.0
github.com/kubernetes-csi/csi-test/v5 v5.1.0
github.com/pborman/uuid v1.2.1
github.com/pelletier/go-toml v1.9.4
github.com/stretchr/testify v1.9.0
golang.org/x/net v0.29.0
google.golang.org/grpc v1.66.1
google.golang.org/protobuf v1.34.2
k8s.io/apimachinery v0.30.4
golang.org/x/net v0.30.0
google.golang.org/grpc v1.67.1
google.golang.org/protobuf v1.35.1
k8s.io/apimachinery v0.31.1
k8s.io/klog/v2 v2.130.1
k8s.io/kubernetes v1.30.4
k8s.io/mount-utils v0.30.4
k8s.io/utils v0.0.0-20231127182322-b307cd553661
sigs.k8s.io/cloud-provider-azure v1.30.4
k8s.io/kubernetes v1.31.1
k8s.io/mount-utils v0.31.1
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6
sigs.k8s.io/cloud-provider-azure v1.31.1
sigs.k8s.io/yaml v1.4.0
)

require (
github.com/Azure/go-autorest/autorest/adal v0.9.24 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/godbus/dbus/v5 v5.1.0 // indirect
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/klauspost/compress v1.17.11 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/opencontainers/runc v1.1.15 // indirect
github.com/opencontainers/runtime-spec v1.2.0 // indirect
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
k8s.io/apiextensions-apiserver v0.0.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/x448/float16 v0.8.4 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
k8s.io/apiextensions-apiserver v0.31.1 // indirect
)

require (
Expand Down Expand Up @@ -73,91 +80,92 @@ require (
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/onsi/ginkgo/v2 v2.20.1 // indirect
github.com/onsi/ginkgo/v2 v2.20.2 // indirect
github.com/onsi/gomega v1.34.2 // indirect
github.com/opencontainers/selinux v1.11.0 // indirect
github.com/opencontainers/selinux v1.11.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.20.3 // indirect
github.com/prometheus/client_golang v1.20.5 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.59.1 // indirect
github.com/prometheus/common v0.60.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/crypto v0.27.0 // indirect
golang.org/x/crypto v0.28.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/term v0.24.0 // indirect
golang.org/x/text v0.18.0 // indirect
golang.org/x/time v0.6.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/term v0.25.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/time v0.7.0 // indirect
golang.org/x/tools v0.25.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.30.4 // indirect
k8s.io/apiserver v0.30.4 // indirect
k8s.io/client-go v0.30.4 // indirect
k8s.io/cloud-provider v0.30.4 // indirect
k8s.io/component-base v0.30.4 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
k8s.io/api v0.31.1 // indirect
k8s.io/apiserver v0.31.1 // indirect
k8s.io/client-go v1.5.2 // indirect
k8s.io/component-base v0.31.1 // indirect
k8s.io/kube-openapi v0.0.0-20241009091222-67ed5848f094 // indirect
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)

replace k8s.io/api => k8s.io/api v0.30.4
replace k8s.io/api => k8s.io/api v0.31.1

replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.4
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.1

replace k8s.io/apimachinery => k8s.io/apimachinery v0.30.4
replace k8s.io/apimachinery => k8s.io/apimachinery v0.31.1

replace k8s.io/apiserver => k8s.io/apiserver v0.30.4
replace k8s.io/apiserver => k8s.io/apiserver v0.31.1

replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.4
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.1

replace k8s.io/client-go => k8s.io/client-go v0.30.4
replace k8s.io/client-go => k8s.io/client-go v0.31.1

replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.4
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.1

replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.4
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.1

replace k8s.io/code-generator => k8s.io/code-generator v0.30.4
replace k8s.io/code-generator => k8s.io/code-generator v0.31.1

replace k8s.io/component-base => k8s.io/component-base v0.30.4
replace k8s.io/component-base => k8s.io/component-base v0.31.1

replace k8s.io/component-helpers => k8s.io/component-helpers v0.30.4
replace k8s.io/component-helpers => k8s.io/component-helpers v0.31.1

replace k8s.io/controller-manager => k8s.io/controller-manager v0.30.4
replace k8s.io/controller-manager => k8s.io/controller-manager v0.31.1

replace k8s.io/cri-api => k8s.io/cri-api v0.30.4
replace k8s.io/cri-api => k8s.io/cri-api v0.31.1

replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.4
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.1

replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.4
replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.1

replace k8s.io/kms => k8s.io/kms v0.30.4
replace k8s.io/kms => k8s.io/kms v0.31.1

replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.4
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.1

replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.4
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.1

replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.4
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.1

replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.4
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.1

replace k8s.io/kubectl => k8s.io/kubectl v0.30.4
replace k8s.io/kubectl => k8s.io/kubectl v0.31.1

replace k8s.io/kubelet => k8s.io/kubelet v0.30.4
replace k8s.io/kubelet => k8s.io/kubelet v0.31.1

replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.4

replace k8s.io/metrics => k8s.io/metrics v0.30.4
replace k8s.io/metrics => k8s.io/metrics v0.31.1

replace k8s.io/mount-utils => k8s.io/mount-utils v0.30.4
replace k8s.io/mount-utils => k8s.io/mount-utils v0.31.1

replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.4
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.1

replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.4
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.1

replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.30.4
replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.1

replace k8s.io/sample-controller => k8s.io/sample-controller v0.30.4
replace k8s.io/sample-controller => k8s.io/sample-controller v0.31.1

replace k8s.io/endpointslice => k8s.io/endpointslice v0.30.4
replace k8s.io/endpointslice => k8s.io/endpointslice v0.31.1

replace k8s.io/cri-client => k8s.io/cri-client v0.31.1
Loading

0 comments on commit 186ee0a

Please sign in to comment.