Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps (kubernetes-model-generator) : Upgrade Kubernetes Model to Kubernetes v1.29.0 (#5643) #5686

Merged
merged 2 commits into from
Jan 8, 2024
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
37 changes: 1 addition & 36 deletions .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
strategy:
fail-fast: false
matrix:
kubernetes: [v1.28.1,v1.27.5, v1.26.8, v1.25.13, v1.20.15, v1.19.16]
kubernetes: [v1.29.0,v1.28.1,v1.27.5, v1.26.8, v1.25.13, v1.20.15, v1.19.16]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -93,41 +93,6 @@ jobs:
run: |
./mvnw ${MAVEN_ARGS} -Pitests -pl $IT_MODULE test -Dtest="io.fabric8.kubernetes.**"

minikube_docker:
name: Docker K8S
needs: buildWithoutTests
runs-on: ubuntu-latest
if: github.repository == 'fabric8io/kubernetes-client'
strategy:
fail-fast: false
matrix:
kubernetes: [v1.28.1]
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Minikube-Kubernetes
uses: manusa/[email protected]
with:
minikube version: v1.31.2
driver: docker
container runtime: containerd
kubernetes version: ${{ matrix.kubernetes }}
github token: ${{ secrets.GITHUB_TOKEN }}
start args: '--force'
- name: Cache .m2 registry
uses: actions/cache@v3
with:
path: ~/.m2/repository
key: cache-e2e-${{ github.sha }}-${{ github.run_id }}
- name: Setup Java 8
uses: actions/setup-java@v4
with:
java-version: '8'
distribution: 'temurin'
- name: Install and Run Integration Tests
run: |
./mvnw ${MAVEN_ARGS} -Pitests -pl $IT_MODULE test -Dtest="io.fabric8.kubernetes.**"

k8s-legacy:
name: K8S legacy
needs: buildWithoutTests
Expand Down
48 changes: 23 additions & 25 deletions kubernetes-model-generator/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/fabric8io/kubernetes-client/kubernetes-model-generator

go 1.17
go 1.21

require (
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.2.0
Expand All @@ -18,12 +18,12 @@ require (
github.com/operator-framework/api v0.17.7
github.com/operator-framework/operator-lifecycle-manager v0.22.0
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.68.0
k8s.io/api v0.28.2
k8s.io/apiextensions-apiserver v0.28.2
k8s.io/apimachinery v0.28.2
k8s.io/api v0.29.0
k8s.io/apiextensions-apiserver v0.29.0
k8s.io/apimachinery v0.29.0
k8s.io/client-go v12.0.0+incompatible
k8s.io/kube-aggregator v0.28.2
k8s.io/metrics v0.28.2
k8s.io/kube-aggregator v0.29.0
k8s.io/metrics v0.29.0
sigs.k8s.io/gateway-api v0.6.1
sigs.k8s.io/kube-storage-version-migrator v0.0.5
sigs.k8s.io/kustomize/api v0.14.0
Expand All @@ -40,21 +40,21 @@ require (
github.com/bshuster-repo/logrus-logstash-hook v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/zapr v1.2.4 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/cel-go v0.16.1 // indirect
github.com/google/cel-go v0.17.7 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/h2non/filetype v1.1.1 // indirect
Expand All @@ -71,7 +71,7 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nutanix-cloud-native/prism-go-client v0.2.1-0.20220804130801-c8a253627c64 // indirect
github.com/onsi/gomega v1.27.10 // indirect
github.com/onsi/gomega v1.29.0 // indirect
github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87 // indirect
github.com/operator-framework/operator-registry v1.29.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
Expand All @@ -85,32 +85,30 @@ require (
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.25.0 // indirect
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.10.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.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/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
google.golang.org/grpc v1.56.3 // 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.31.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/component-base v0.28.2 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/component-base v0.29.0 // indirect
k8s.io/klog/v2 v2.110.1 // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
sigs.k8s.io/cluster-api v1.5.2 // indirect
sigs.k8s.io/controller-runtime v0.16.2 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/kustomize/kyaml v0.14.3 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

Expand All @@ -130,11 +128,11 @@ replace (
github.com/openshift/assisted-service/models => github.com/openshift/assisted-service/models v0.0.0-20231001134623-54b30e6f7d8e
github.com/terraform-providers/terraform-provider-aws => github.com/openshift/terraform-provider-aws v1.60.1-0.20211215220004-24df6d73af46
github.com/terraform-providers/terraform-provider-ignition/v2 => github.com/community-terraform-providers/terraform-provider-ignition/v2 v2.1.0
k8s.io/client-go => k8s.io/client-go v0.28.2
k8s.io/client-go => k8s.io/client-go v0.29.0
k8s.io/cloud-provider-vsphere => github.com/openshift/cloud-provider-vsphere v1.19.1-0.20230928092837-f518c23f1b0d
k8s.io/component-helpers => k8s.io/component-helpers v0.28.2
k8s.io/controller-manager => k8s.io/controller-manager v0.28.2
k8s.io/mount-utils => k8s.io/mount-utils v0.28.2
k8s.io/component-helpers => k8s.io/component-helpers v0.29.0
k8s.io/controller-manager => k8s.io/controller-manager v0.29.0
k8s.io/mount-utils => k8s.io/mount-utils v0.29.0
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.5.2
sigs.k8s.io/cluster-api-provider-aws => github.com/openshift/cluster-api-provider-aws v0.2.1-0.20230919101006-78c1a04f0a1c
sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20230918123958-2aec6b9229c3
Expand Down
Loading
Loading