Skip to content

Commit f51f98c

Browse files
joaopapereirajoaopapereira
authored
Merge pull request #1678 from carvel-dev/k8s-min-max-version-bump
k8s 1.32 support validation and GH action refactor
2 parents d5ff91d + 24e5bcf commit f51f98c

File tree

562 files changed

+37034
-31684
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

562 files changed

+37034
-31684
lines changed

‎.github/workflows/kind-action.yml‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,33 +18,28 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: Create k8s Kind Cluster
21-
uses: helm/kind-action@v1.8.0
21+
uses: helm/kind-action@v1
2222
with:
23-
kubectl_version: v1.25.0
2423
cluster_name: kinder
2524
- uses: actions/[email protected]
2625
with:
2726
fetch-depth: 0
28-
- uses: actions/setup-go@v5 # default version of go is 1.10
27+
- uses: actions/setup-go@v5
2928
with:
30-
go-version: 1.23.3
29+
go-version-file: go.mod
3130
- name: Install Carvel Tools
3231
run: ./hack/install-deps.sh
3332
# Run benchmark with `go test -bench` and stores the output to a file
3433
- name: Install kc and run e2e tests on kind
3534
run: |
3635
set -e -x
37-
kubectl version --short
38-
36+
kubectl version
3937
source ./hack/version-util.sh
40-
4138
ytt -f config/config -f config/values-schema.yml -f config-dev -v dev.version="$(get_kappctrl_ver)+develop" | kbld -f- > kbld.out 2> kbldmeta.out
4239
cat kbldmeta.out | tail -n 1 | sed 's/.*final: kapp-controller -> \(.*\)$/\1/p' | tail -n 1 | xargs kind load docker-image --name kinder
4340
kapp deploy -a kc -f kbld.out -c -y
44-
4541
export KAPPCTRL_E2E_SECRETGEN_CONTROLLER=true
4642
source ./hack/secretgen-controller.sh
4743
deploy_secretgen-controller
48-
4944
mkdir tmp
50-
KAPPCTRL_E2E_NAMESPACE=kappctrl-test eval './hack/test-e2e.sh'
45+
KAPPCTRL_E2E_NAMESPACE=kappctrl-test eval './hack/test-e2e.sh'

‎.github/workflows/test-gh.yml‎

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,44 @@ concurrency:
2020

2121
jobs:
2222
test-all:
23-
name: Test GH
23+
name: Run all tests
2424
runs-on: ubuntu-latest
25+
strategy:
26+
fail-fast: false
27+
max-parallel: 2
28+
matrix:
29+
k8s-version: [v1.27.0, latest]
2530
steps:
26-
- name: Set up Go 1.x
27-
uses: actions/setup-go@v5
31+
- name: Check out code into the Go module directory
32+
uses: actions/checkout@v4
2833
with:
29-
go-version: 1.23.3
30-
- name: Check out code
31-
uses: actions/[email protected]
34+
fetch-depth: 0
35+
- name: Set up Go
36+
uses: actions/setup-go@v5
3237
with:
33-
fetch-depth: 0
38+
go-version-file: go.mod
39+
- name: Resolve Kubernetes version
40+
id: resolve-k8s-version
41+
run: |
42+
k8s_version=${{ matrix.k8s-version }}
43+
if [ "${k8s_version}" = "latest" ]; then
44+
k8s_version=$(curl -Ls -o /dev/null -w %{url_effective} https://github.com/kubernetes/kubernetes/releases/latest | grep -oE 'tag/v[0-9]+\.[0-9]+\.[0-9]+' | cut -d'/' -f2)
45+
echo "Resolved latest k8s version to: $k8s_version"
46+
fi
47+
echo "k8s_version=$k8s_version" >> $GITHUB_ENV
48+
- name: start minikube(k8s version ${{ env.k8s_version }})
49+
uses: medyagh/setup-minikube@latest
50+
with:
51+
kubernetes-version: ${{ env.k8s_version }}
52+
driver: docker
53+
start: true
54+
cpus: 3
55+
memory: 8192m
56+
- name: Verify env
57+
run: |
58+
kind version
59+
kubectl version
60+
go version
3461
- name: Install Carvel Tools
3562
run: ./hack/install-deps.sh
3663
- name: Run Tests
@@ -46,7 +73,6 @@ jobs:
4673
4774
./hack/verify-no-dirty-files.sh
4875
49-
minikube start --driver=docker --kubernetes-version="1.20.15"
5076
eval $(minikube docker-env --shell=bash)
5177
5278
export KAPPCTRL_E2E_SECRETGEN_CONTROLLER=true

‎go.mod‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ require (
88
github.com/gogo/protobuf v1.3.2
99
github.com/google/go-cmp v0.6.0 // indirect
1010
github.com/prometheus/client_golang v1.18.0
11-
github.com/stretchr/testify v1.9.0
12-
golang.org/x/crypto v0.28.0
13-
golang.org/x/text v0.19.0 // indirect
11+
github.com/stretchr/testify v1.10.0
12+
golang.org/x/crypto v0.32.0
13+
golang.org/x/text v0.21.0 // indirect
1414
golang.org/x/tools v0.26.0
1515
gopkg.in/yaml.v3 v3.0.1 // indirect
1616
k8s.io/api v0.30.1
@@ -28,27 +28,26 @@ require (
2828
require (
2929
github.com/blang/semver v3.5.1+incompatible
3030
github.com/cppforlife/go-cli-ui v0.0.0-20220425131040-94f26b16bc14
31-
github.com/go-logr/logr v1.4.1
31+
github.com/go-logr/logr v1.4.2
3232
github.com/k14s/semver/v4 v4.0.1-0.20210701191048-266d47ac6115
3333
github.com/prometheus/client_model v0.5.0
3434
github.com/spf13/cobra v1.8.1
35-
golang.org/x/sync v0.9.0
35+
golang.org/x/sync v0.10.0
3636
gopkg.in/yaml.v2 v2.4.0
3737
k8s.io/component-base v0.30.1
3838
k8s.io/klog/v2 v2.120.1
3939
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
4040
)
4141

4242
require (
43-
cloud.google.com/go v0.110.6 // indirect
4443
github.com/NYTimes/gziphandler v1.1.1 // indirect
4544
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
4645
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
4746
github.com/beorn7/perks v1.0.1 // indirect
4847
github.com/blang/semver/v4 v4.0.0 // indirect
4948
github.com/carvel-dev/semver/v4 v4.0.1-0.20240402203627-beb83fbf25e4 // indirect
5049
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
51-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
50+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5251
github.com/coreos/go-semver v0.3.1 // indirect
5352
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
5453
github.com/cppforlife/color v1.9.1-0.20200716202919-6706ac40b835 // indirect
@@ -69,7 +68,7 @@ require (
6968
github.com/google/cel-go v0.17.8 // indirect
7069
github.com/google/gnostic-models v0.6.8 // indirect
7170
github.com/google/gofuzz v1.2.0 // indirect
72-
github.com/google/uuid v1.3.0 // indirect
71+
github.com/google/uuid v1.6.0 // indirect
7372
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
7473
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
7574
github.com/hashicorp/go-version v1.2.1 // indirect
@@ -94,31 +93,30 @@ require (
9493
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
9594
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
9695
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
97-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
96+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
97+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
9898
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
99-
go.opentelemetry.io/otel v1.19.0 // indirect
99+
go.opentelemetry.io/otel v1.34.0 // indirect
100100
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
101101
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
102-
go.opentelemetry.io/otel/metric v1.19.0 // indirect
103-
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
104-
go.opentelemetry.io/otel/trace v1.19.0 // indirect
102+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
103+
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
104+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
105105
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
106106
go.uber.org/multierr v1.11.0 // indirect
107107
go.uber.org/zap v1.26.0 // indirect
108108
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
109109
golang.org/x/mod v0.21.0 // indirect
110-
golang.org/x/net v0.30.0 // indirect
111-
golang.org/x/oauth2 v0.12.0 // indirect
112-
golang.org/x/sys v0.27.0 // indirect
113-
golang.org/x/term v0.25.0 // indirect
110+
golang.org/x/net v0.34.0 // indirect
111+
golang.org/x/oauth2 v0.24.0 // indirect
112+
golang.org/x/sys v0.29.0 // indirect
113+
golang.org/x/term v0.28.0 // indirect
114114
golang.org/x/time v0.3.0 // indirect
115115
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
116-
google.golang.org/appengine v1.6.7 // indirect
117-
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
118-
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
119-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
120-
google.golang.org/grpc v1.58.3 // indirect
121-
google.golang.org/protobuf v1.33.0 // indirect
116+
google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a // indirect
117+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287 // indirect
118+
google.golang.org/grpc v1.70.0 // indirect
119+
google.golang.org/protobuf v1.36.4 // indirect
122120
gopkg.in/inf.v0 v0.9.1 // indirect
123121
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
124122
k8s.io/apiextensions-apiserver v0.30.1 // indirect

0 commit comments

Comments
 (0)