Skip to content
This repository was archived by the owner on Jan 22, 2026. It is now read-only.
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/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a
with:
go-version: "1.20"
go-version: "1.24"

- name: Build container image
run: |
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@
# See
# https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
# for info on BUILDPLATFORM, TARGETOS, TARGETARCH, etc.
FROM registry.k8s.io/build-image/debian-base:bullseye-v1.4.3 AS builder
FROM registry.k8s.io/build-image/debian-base:bookworm-v1.0.5 AS builder

RUN apt-get update && apt-get install -y wget libcryptsetup-dev build-essential tar git pkgconf
RUN wget https://golang.org/dl/go1.22.3.linux-amd64.tar.gz
RUN rm -rf /usr/local/go && tar -C /usr/local -xzf go1.22.3.linux-amd64.tar.gz
RUN wget https://golang.org/dl/go1.24.6.linux-amd64.tar.gz
RUN rm -rf /usr/local/go && tar -C /usr/local -xzf go1.24.6.linux-amd64.tar.gz
ENV PATH=$PATH:/usr/local/go/bin

WORKDIR /go/src/github.com/kubernetes-sigs/aws-ebs-csi-driver
Expand All @@ -52,7 +52,7 @@ ARG VERSION
RUN OS=$TARGETOS ARCH=$TARGETARCH make

# Driver image
FROM registry.k8s.io/build-image/debian-base:bullseye-v1.4.3 AS linux-amazon
FROM registry.k8s.io/build-image/debian-base:bookworm-v1.0.5 AS linux-amazon

RUN apt-get update && apt-get install -y util-linux e2fsprogs mount ca-certificates udev xfsprogs btrfs-progs libcryptsetup-dev

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

VERSION?=v1.2.0
VERSION?=v1.3.0

PKG=github.com/kubernetes-sigs/aws-ebs-csi-driver
GIT_COMMIT?=$(shell git rev-parse HEAD)
Expand Down
4 changes: 4 additions & 0 deletions charts/aws-ebs-csi-driver/templates/_node.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ spec:
mountPath: /csi
- name: device-dir
mountPath: /dev
- name: tmp-dir
mountPath: /tmp
- name: cryptsetup
mountPath: /run/cryptsetup
{{- with .Values.node.volumeMounts }}
Expand Down Expand Up @@ -237,6 +239,8 @@ spec:
hostPath:
path: /run/cryptsetup
type: Directory
- name: tmp-dir
emptyDir: {}
- name: probe-dir
{{- if .Values.node.probeDirVolume }}
{{- toYaml .Values.node.probeDirVolume | nindent 10 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/aws-ebs-csi-driver/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
image:
repository: ghcr.io/edgelesssys/constellation/aws-csi-driver
# Overrides the image tag whose default is v{{ .Chart.AppVersion }}
tag: "v1.2.0@sha256:9477e8ed37989c46963d57d24de5ddbc7ab965b1685d709d06c1ae536b23b5b1"
tag: "v1.3.0@sha256:39e24e39c595d2b51b04d9017afecfa134ae3c9e7466235f06f6a2358321f712"
pullPolicy: Always

# -- Custom labels to add into metadata
Expand Down
4 changes: 2 additions & 2 deletions cmd/hooks/prestop.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/cache"
"k8s.io/klog/v2"
corev1beta1 "sigs.k8s.io/karpenter/pkg/apis/v1beta1"
corev1beta1 "sigs.k8s.io/karpenter/pkg/apis/v1"
)

/*
Expand Down Expand Up @@ -70,7 +70,7 @@ func isNodeBeingDrained(node *v1.Node) bool {
}

// Karpenter eviction taint
if corev1beta1.IsDisruptingTaint(taint) {
if taint.MatchTaint(&corev1beta1.DisruptedNoScheduleTaint) || taint.Value == corev1beta1.DisruptedNoScheduleTaint.Value {
return true
}

Expand Down
10 changes: 5 additions & 5 deletions cmd/hooks/prestop_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
v1 "k8s.io/api/core/v1"
storagev1 "k8s.io/api/storage/v1"
"k8s.io/apimachinery/pkg/watch"
corev1beta1 "sigs.k8s.io/karpenter/pkg/apis/v1beta1"
corev1beta1 "sigs.k8s.io/karpenter/pkg/apis/v1"
)

func TestPreStopHook(t *testing.T) {
Expand Down Expand Up @@ -220,7 +220,7 @@ func TestPreStopHook(t *testing.T) {
Spec: v1.NodeSpec{
Taints: []v1.Taint{
{
Key: corev1beta1.DisruptionNoScheduleTaint.Key,
Key: corev1beta1.DisruptedNoScheduleTaint.Key,
Effect: "",
},
},
Expand All @@ -244,7 +244,7 @@ func TestPreStopHook(t *testing.T) {
Spec: v1.NodeSpec{
Taints: []v1.Taint{
{
Key: corev1beta1.DisruptionNoScheduleTaint.Key,
Key: corev1beta1.DisruptedNoScheduleTaint.Key,
Effect: v1.TaintEffectNoSchedule,
},
},
Expand Down Expand Up @@ -276,7 +276,7 @@ func TestPreStopHook(t *testing.T) {
Spec: v1.NodeSpec{
Taints: []v1.Taint{
{
Key: corev1beta1.DisruptionNoScheduleTaint.Key,
Key: corev1beta1.DisruptedNoScheduleTaint.Key,
Effect: v1.TaintEffectNoSchedule,
},
},
Expand Down Expand Up @@ -316,7 +316,7 @@ func TestPreStopHook(t *testing.T) {
Spec: v1.NodeSpec{
Taints: []v1.Taint{
{
Key: corev1beta1.DisruptionNoScheduleTaint.Key,
Key: corev1beta1.DisruptedNoScheduleTaint.Key,
Effect: v1.TaintEffectNoSchedule,
},
},
Expand Down
Loading
Loading