Skip to content

Commit

Permalink
chore: support kubernetes v1.25.0
Browse files Browse the repository at this point in the history 
Signed-off-by: Anish Ramasekar <anish.ramasekar@gmail.com>
  • Loading branch information
@aramase
aramase committed Sep 8, 2022
1 parent 44a1c40 commit 3967562
Show file tree
Hide file tree
Showing 8 changed files with 61 additions and 221 deletions.
6 changes: 6 additions & 0 deletions .pipelines/templates/e2e-test-kind.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ jobs:
kind_v1_24_2_helm:
KIND_K8S_VERSION: v1.24.2
IS_HELM_TEST: true
kind_v1_25_0_helm:
KIND_K8S_VERSION: v1.25.0
IS_HELM_TEST: true
kind_v1_22_9_deployment_manifest:
KIND_K8S_VERSION: v1.22.9
IS_HELM_TEST: false
Expand All @@ -31,6 +34,9 @@ jobs:
kind_v1_24_2_deployment_manifest:
KIND_K8S_VERSION: v1.24.2
IS_HELM_TEST: false
kind_v1_25_0_deployment_manifest:
KIND_K8S_VERSION: v1.25.0
IS_HELM_TEST: false

steps:
# logging in to download the sa.pub and sa.key used for creating the kind cluster
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ BUILDX_BUILDER_NAME ?= img-builder
STEP_CLI_VERSION=0.18.0

# E2E test variables
KIND_VERSION ?= 0.13.0
KIND_K8S_VERSION ?= v1.23.5
KIND_VERSION ?= 0.15.0
KIND_K8S_VERSION ?= v1.24.0
SHELLCHECK_VER ?= v0.8.0

$(TOOLS_DIR)/golangci-lint: $(TOOLS_MOD_DIR)/go.mod $(TOOLS_MOD_DIR)/go.sum $(TOOLS_MOD_DIR)/tools.go
Expand Down
4 changes: 2 additions & 2 deletions cmd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/Azure/go-autorest/autorest/adal"
"google.golang.org/grpc"
"google.golang.org/grpc/health/grpc_health_v1"
"k8s.io/component-base/config"
logsapi "k8s.io/component-base/logs/api/v1"
json "k8s.io/component-base/logs/json"
"k8s.io/klog/v2"
k8spb "sigs.k8s.io/secrets-store-csi-driver/provider/v1alpha1"
Expand Down Expand Up @@ -55,7 +55,7 @@ func main() {

if *logFormatJSON {
jsonFactory := json.Factory{}
logger, _ := jsonFactory.Create(config.LoggingConfiguration{Format: "json"})
logger, _ := jsonFactory.Create(logsapi.LoggingConfiguration{Format: "json"})
klog.SetLogger(logger)
}

Expand Down
28 changes: 15 additions & 13 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ require (
go.opentelemetry.io/otel/exporters/metric/prometheus v0.20.0
go.opentelemetry.io/otel/metric v0.20.0
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
golang.org/x/net v0.0.0-20220722155237-a158d28d115b
google.golang.org/grpc v1.47.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/component-base v0.24.3
k8s.io/klog/v2 v2.70.1
sigs.k8s.io/secrets-store-csi-driver v1.2.2
k8s.io/component-base v0.25.0
k8s.io/klog/v2 v2.80.0
sigs.k8s.io/secrets-store-csi-driver v1.2.3
)

require (
Expand All @@ -33,13 +33,14 @@ require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-logr/logr v1.2.0 // indirect
github.com/go-logr/zapr v1.2.0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/zapr v1.2.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/uuid v1.1.2 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
Expand All @@ -50,6 +51,7 @@ require (
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/spf13/cobra v1.4.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
Expand All @@ -58,14 +60,14 @@ require (
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.19.1 // indirect
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
golang.org/x/text v0.3.7 // indirect
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
google.golang.org/protobuf v1.27.1 // indirect
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/apimachinery v0.24.3 // indirect
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
k8s.io/apimachinery v0.25.0 // indirect
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
)
227 changes: 30 additions & 197 deletions go.sum
View file

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion scripts/create-kind-cluster.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ nodes:
service-account-issuer: ${SERVICE_ACCOUNT_ISSUER}
service-account-key-file: /etc/kubernetes/pki/sa.pub
service-account-signing-key-file: /etc/kubernetes/pki/sa.key
feature-gates: "CSIServiceAccountToken=true"
controllerManager:
extraArgs:
service-account-private-key-file: /etc/kubernetes/pki/sa.key
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ require (
k8s.io/client-go v0.25.0
k8s.io/kubernetes v1.25.0
sigs.k8s.io/controller-runtime v0.13.0
sigs.k8s.io/secrets-store-csi-driver v1.2.2
sigs.k8s.io/secrets-store-csi-driver v1.2.3
)

require (
Expand Down Expand Up @@ -99,7 +99,7 @@ require (
k8s.io/apiserver v0.25.0 // indirect
k8s.io/component-base v0.25.0 // indirect
k8s.io/component-helpers v0.25.0 // indirect
k8s.io/klog/v2 v2.70.1 // indirect
k8s.io/klog/v2 v2.80.0 // indirect
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
k8s.io/kubectl v0.0.0 // indirect
k8s.io/kubelet v0.0.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions test/e2e/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -904,8 +904,8 @@ k8s.io/component-base v0.25.0/go.mod h1:F2Sumv9CnbBlqrpdf7rKZTmmd2meJq0HizeyY/yA
k8s.io/component-helpers v0.25.0 h1:vNzYfqnVXj7f+CPksduKVv2Z9kC+IDsOs9yaOyxZrj0=
k8s.io/component-helpers v0.25.0/go.mod h1:auaFj2bvb5Zmy0mLk4WJNmwP0w4e7Zk+/Tu9FFBGA20=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ=
k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/klog/v2 v2.80.0 h1:lyJt0TWMPaGoODa8B8bUuxgHS3W/m/bNr2cca3brA/g=
k8s.io/klog/v2 v2.80.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkIFQtZShWqoha7snGixVgEA=
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU=
k8s.io/kubectl v0.25.0 h1:/Wn1cFqo8ik3iee1EvpxYre3bkWsGLXzLQI6uCCAkQc=
Expand All @@ -927,8 +927,8 @@ sigs.k8s.io/controller-runtime v0.13.0 h1:iqa5RNciy7ADWnIc8QxCbOX5FEKVR3uxVxKHRM
sigs.k8s.io/controller-runtime v0.13.0/go.mod h1:Zbz+el8Yg31jubvAEyglRZGdLAjplZl+PgtYNI6WNTI=
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
sigs.k8s.io/secrets-store-csi-driver v1.2.2 h1:GGy40rjlHfxmvDHxxQe/dpB7jjfvBENEaMfZBinjJxc=
sigs.k8s.io/secrets-store-csi-driver v1.2.2/go.mod h1:rLWqmapEJNLj/z0siDS8NiMS4JpOrjmudu7fNh0pM9M=
sigs.k8s.io/secrets-store-csi-driver v1.2.3 h1:qOvFEdPhPBooofbs430agDoZaFWB+p6f8g32UvWe1Jc=
sigs.k8s.io/secrets-store-csi-driver v1.2.3/go.mod h1:zbvY7oF5TdvXsKPgvY4vBDg6QUFo6HWPgifpAmMA30k=
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
Expand Down

0 comments on commit 3967562

Please sign in to comment.