Skip to content

Commit

Permalink
Merge pull request #1678 from carvel-dev/k8s-min-max-version-bump
Browse files Browse the repository at this point in the history
k8s 1.32 support validation and GH action refactor
  • Loading branch information
joaopapereira authored Feb 5, 2025
2 parents d5ff91d + 24e5bcf commit f51f98c
Show file tree
Hide file tree
Showing 562 changed files with 37,034 additions and 31,684 deletions.
15 changes: 5 additions & 10 deletions .github/workflows/kind-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,33 +18,28 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Create k8s Kind Cluster
uses: helm/kind-action@v1.8.0
uses: helm/kind-action@v1
with:
kubectl_version: v1.25.0
cluster_name: kinder
- uses: actions/[email protected]
with:
fetch-depth: 0
- uses: actions/setup-go@v5 # default version of go is 1.10
- uses: actions/setup-go@v5
with:
go-version: 1.23.3
go-version-file: go.mod
- name: Install Carvel Tools
run: ./hack/install-deps.sh
# Run benchmark with `go test -bench` and stores the output to a file
- name: Install kc and run e2e tests on kind
run: |
set -e -x
kubectl version --short
kubectl version
source ./hack/version-util.sh
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
cat kbldmeta.out | tail -n 1 | sed 's/.*final: kapp-controller -> \(.*\)$/\1/p' | tail -n 1 | xargs kind load docker-image --name kinder
kapp deploy -a kc -f kbld.out -c -y
export KAPPCTRL_E2E_SECRETGEN_CONTROLLER=true
source ./hack/secretgen-controller.sh
deploy_secretgen-controller
mkdir tmp
KAPPCTRL_E2E_NAMESPACE=kappctrl-test eval './hack/test-e2e.sh'
KAPPCTRL_E2E_NAMESPACE=kappctrl-test eval './hack/test-e2e.sh'
42 changes: 34 additions & 8 deletions .github/workflows/test-gh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,44 @@ concurrency:

jobs:
test-all:
name: Test GH
name: Run all tests
runs-on: ubuntu-latest
strategy:
fail-fast: false
max-parallel: 2
matrix:
k8s-version: [v1.27.0, latest]
steps:
- name: Set up Go 1.x
uses: actions/setup-go@v5
- name: Check out code into the Go module directory
uses: actions/checkout@v4
with:
go-version: 1.23.3
- name: Check out code
uses: actions/[email protected]
fetch-depth: 0
- name: Set up Go
uses: actions/setup-go@v5
with:
fetch-depth: 0
go-version-file: go.mod
- name: Resolve Kubernetes version
id: resolve-k8s-version
run: |
k8s_version=${{ matrix.k8s-version }}
if [ "${k8s_version}" = "latest" ]; then
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)
echo "Resolved latest k8s version to: $k8s_version"
fi
echo "k8s_version=$k8s_version" >> $GITHUB_ENV
- name: start minikube(k8s version ${{ env.k8s_version }})
uses: medyagh/setup-minikube@latest
with:
kubernetes-version: ${{ env.k8s_version }}
driver: docker
start: true
cpus: 3
memory: 8192m
- name: Verify env
run: |
kind version
kubectl version
go version
- name: Install Carvel Tools
run: ./hack/install-deps.sh
- name: Run Tests
Expand All @@ -46,7 +73,6 @@ jobs:
./hack/verify-no-dirty-files.sh
minikube start --driver=docker --kubernetes-version="1.20.15"
eval $(minikube docker-env --shell=bash)
export KAPPCTRL_E2E_SECRETGEN_CONTROLLER=true
Expand Down
44 changes: 21 additions & 23 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ require (
github.com/gogo/protobuf v1.3.2
github.com/google/go-cmp v0.6.0 // indirect
github.com/prometheus/client_golang v1.18.0
github.com/stretchr/testify v1.9.0
golang.org/x/crypto v0.28.0
golang.org/x/text v0.19.0 // indirect
github.com/stretchr/testify v1.10.0
golang.org/x/crypto v0.32.0
golang.org/x/text v0.21.0 // indirect
golang.org/x/tools v0.26.0
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.30.1
Expand All @@ -28,27 +28,26 @@ require (
require (
github.com/blang/semver v3.5.1+incompatible
github.com/cppforlife/go-cli-ui v0.0.0-20220425131040-94f26b16bc14
github.com/go-logr/logr v1.4.1
github.com/go-logr/logr v1.4.2
github.com/k14s/semver/v4 v4.0.1-0.20210701191048-266d47ac6115
github.com/prometheus/client_model v0.5.0
github.com/spf13/cobra v1.8.1
golang.org/x/sync v0.9.0
golang.org/x/sync v0.10.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/component-base v0.30.1
k8s.io/klog/v2 v2.120.1
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
)

require (
cloud.google.com/go v0.110.6 // indirect
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/carvel-dev/semver/v4 v4.0.1-0.20240402203627-beb83fbf25e4 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.2.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/cppforlife/color v1.9.1-0.20200716202919-6706ac40b835 // indirect
Expand All @@ -69,7 +68,7 @@ require (
github.com/google/cel-go v0.17.8 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
github.com/hashicorp/go-version v1.2.1 // indirect
Expand All @@ -94,31 +93,30 @@ require (
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/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
go.opentelemetry.io/otel v1.19.0 // indirect
go.opentelemetry.io/otel v1.34.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
go.opentelemetry.io/otel/metric v1.19.0 // indirect
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
go.opentelemetry.io/otel/trace v1.19.0 // indirect
go.opentelemetry.io/otel/metric v1.34.0 // indirect
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
go.opentelemetry.io/otel/trace v1.34.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
golang.org/x/mod v0.21.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/oauth2 v0.12.0 // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/term v0.25.0 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/oauth2 v0.24.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/term v0.28.0 // indirect
golang.org/x/time v0.3.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/grpc v1.58.3 // indirect
google.golang.org/protobuf v1.33.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287 // indirect
google.golang.org/grpc v1.70.0 // indirect
google.golang.org/protobuf v1.36.4 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
k8s.io/apiextensions-apiserver v0.30.1 // indirect
Expand Down
Loading

0 comments on commit f51f98c

Please sign in to comment.