Skip to content

Commit

Permalink
[release/v2.26] Bump kkp dependencies (#7013)
Browse files Browse the repository at this point in the history 
* [release/v2.26] Bump dashboard version for KKP next patch release 2.26.1

Signed-off-by: archups <[email protected]>

* [release/v2.26] Bump KKP dependencies

Signed-off-by: archups <[email protected]>

---------

Signed-off-by: archups <[email protected]>
  • Loading branch information
@archups
archups authored Nov 21, 2024
1 parent d39b646 commit e201cca
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 28 deletions.
11 changes: 10 additions & 1 deletion modules/api/cmd/kubermatic-api/swagger.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30470,6 +30470,11 @@
"type": "object",
"title": "DatacenterSpecKubevirt describes a kubevirt datacenter.",
"properties": {
"ccmZoneAndRegionEnabled": {
"description": "Optional: indicates if region and zone labels from the cloud provider should be fetched.",
"type": "boolean",
"x-go-name": "CCMZoneAndRegionEnabled"
},
"customNetworkPolicies": {
"description": "Optional: CustomNetworkPolicies allows to add some extra custom NetworkPolicies, that are deployed\nin the dedicated infra KubeVirt cluster. They are added to the defaults.",
"type": "array",
Expand Down Expand Up @@ -37905,6 +37910,10 @@
"type": "string",
"x-go-name": "Name"
},
"networkPolicyEnabled": {
"type": "boolean",
"x-go-name": "NetworkPolicyEnabled"
},
"vpcs": {
"type": "array",
"items": {
Expand Down Expand Up @@ -40583,4 +40592,4 @@
"api_key": []
}
]
}
}
17 changes: 8 additions & 9 deletions modules/api/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,19 +69,19 @@ require (
google.golang.org/api v0.197.0
gopkg.in/yaml.v3 v3.0.1
k8c.io/kubeone v1.7.3
k8c.io/kubermatic/v2 v2.26.0-rc.0.0.20241108105135-9605363a38ac
k8c.io/kubermatic/v2 v2.26.1-0.20241121112806-f5f8eb1457bc
k8c.io/machine-controller v1.60.1-0.20241104231631-36a68f1ae069
k8c.io/operating-system-manager v1.6.0
k8c.io/reconciler v0.5.0
k8s.io/api v0.31.1
k8s.io/api v0.31.2
k8s.io/apiextensions-apiserver v0.31.1
k8s.io/apimachinery v0.31.1
k8s.io/apiserver v0.31.1
k8s.io/apimachinery v0.31.2
k8s.io/apiserver v0.31.2
k8s.io/client-go v1.5.2
k8s.io/code-generator v0.31.1
k8s.io/code-generator v0.31.2
k8s.io/klog/v2 v2.130.1
k8s.io/kubectl v0.31.1
k8s.io/metrics v0.31.1
k8s.io/metrics v0.31.2
k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3
kubevirt.io/api v1.3.1
kubevirt.io/containerized-data-importer-api v1.60.3
Expand All @@ -100,7 +100,7 @@ replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20240903163716-9e1beec

replace k8s.io/client-go => k8s.io/client-go v0.31.1

require github.com/kubeovn/kube-ovn v1.12.27
require github.com/kubeovn/kube-ovn v1.12.28

require (
cloud.google.com/go/auth v0.9.4 // indirect
Expand Down Expand Up @@ -145,7 +145,6 @@ require (
github.com/distribution/reference v0.6.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
github.com/equinix/equinix-sdk-go v0.46.0 // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/fatih/color v1.17.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
Expand Down Expand Up @@ -269,7 +268,7 @@ require (
gopkg.in/yaml.v2 v2.4.0 // indirect
helm.sh/helm/v3 v3.14.3 // indirect
k8s.io/autoscaler/vertical-pod-autoscaler v1.0.0 // indirect
k8s.io/component-base v0.31.1 // indirect
k8s.io/component-base v0.31.2 // indirect
k8s.io/gengo/v2 v2.0.0-20240826214909-a7b603a56eb7 // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/kube-aggregator v0.31.1 // indirect
Expand Down
34 changes: 16 additions & 18 deletions modules/api/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,6 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/equinix/equinix-sdk-go v0.46.0 h1:ldQo4GtXNr+0XsThQJf/pUdx5wcLFe9QpLFtAwonqH8=
github.com/equinix/equinix-sdk-go v0.46.0/go.mod h1:hEb3XLaedz7xhl/dpPIS6eOIiXNPeqNiVoyDrT6paIg=
github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
github.com/evanphx/json-patch v5.9.0+incompatible h1:fBXyNpNMuTTDdquAq/uisOr2lShz4oaXpDTX2bLe7ls=
github.com/evanphx/json-patch v5.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
Expand Down Expand Up @@ -455,8 +453,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/kubeovn/kube-ovn v1.12.27 h1:iyZ66gtnGpSivwF8uIwjjh+9n1QkuOaEl88ScIkaXpE=
github.com/kubeovn/kube-ovn v1.12.27/go.mod h1:WdJ0jK7yXYPuxjpAeBJdfHAK0kJuRleuJx0sNX2vqnQ=
github.com/kubeovn/kube-ovn v1.12.28 h1:t4yN9J63hjxBpP2Gc9dj51bEYmVG9Sj97f/n8lg8DCs=
github.com/kubeovn/kube-ovn v1.12.28/go.mod h1:WdJ0jK7yXYPuxjpAeBJdfHAK0kJuRleuJx0sNX2vqnQ=
github.com/kubernetes-csi/external-snapshotter/client/v7 v7.0.0 h1:j3YK74myEQRxR/srciTpOrm221SAvz6J5OVWbyfeXFo=
github.com/kubernetes-csi/external-snapshotter/client/v7 v7.0.0/go.mod h1:FlyYFe32mPxKEPaRXKNxfX576d1AoCzstYDoOOnyMA4=
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
Expand Down Expand Up @@ -1089,33 +1087,33 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8c.io/kubeone v1.7.3 h1:KZ2Q6LQMxoiFf9UQ3ugqjid39NccduhJ50bdbP5tdIU=
k8c.io/kubeone v1.7.3/go.mod h1:9v2VFz/+l36cW65kd5YufEYHunbKlJ6P8SBakj05xgM=
k8c.io/kubermatic/v2 v2.26.0-rc.0.0.20241108105135-9605363a38ac h1:2PgK8DdBC6WNJQ40I6oCUKqBuqgQ3YfowZthM+ON0XA=
k8c.io/kubermatic/v2 v2.26.0-rc.0.0.20241108105135-9605363a38ac/go.mod h1:QePebtvMvNtknnlexwVPnM5fzVXgu5nOyZp17mhmRh8=
k8c.io/kubermatic/v2 v2.26.1-0.20241121112806-f5f8eb1457bc h1:2J1mQHRdK/F8eZu3bV11SOtdGk57NUxJA9Zh0KCkQDI=
k8c.io/kubermatic/v2 v2.26.1-0.20241121112806-f5f8eb1457bc/go.mod h1:IRqVcGOr7CIHzbdEK4ZCyEajwJ+0MtdvnEFhUrlvbT8=
k8c.io/machine-controller v1.60.1-0.20241104231631-36a68f1ae069 h1:5qsXjpYhQnNhMA9Gx3K1SgFNxFVdUu3BR89kBxA57zg=
k8c.io/machine-controller v1.60.1-0.20241104231631-36a68f1ae069/go.mod h1:Xn3sAXDb3eIQFvyPgMxG3auvMfOJxP6rXGPT/STpzJM=
k8c.io/operating-system-manager v1.6.0 h1:CxtogwY2xRxMSN5I8C8hrurlAZdWzrDFTOD/YSvJriQ=
k8c.io/operating-system-manager v1.6.0/go.mod h1:Dh9IZp5pb5G3s2r6ZrHUb+gTuHw5AmbIFYuFxIcgU7o=
k8c.io/reconciler v0.5.0 h1:BHpelg1UfI/7oBFctqOq8sX6qzflXpl3SlvHe7e8wak=
k8c.io/reconciler v0.5.0/go.mod h1:pT1+SVcVXJQeBJhpJBXQ5XW64QnKKeYTnVlQf0dGE0k=
k8s.io/api v0.23.3/go.mod h1:w258XdGyvCmnBj/vGzQMj6kzdufJZVUwEM1U2fRJwSQ=
k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU=
k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI=
k8s.io/api v0.31.2 h1:3wLBbL5Uom/8Zy98GRPXpJ254nEFpl+hwndmk9RwmL0=
k8s.io/api v0.31.2/go.mod h1:bWmGvrGPssSK1ljmLzd3pwCQ9MgoTsRCuK35u6SygUk=
k8s.io/apiextensions-apiserver v0.31.1 h1:L+hwULvXx+nvTYX/MKM3kKMZyei+UiSXQWciX/N6E40=
k8s.io/apiextensions-apiserver v0.31.1/go.mod h1:tWMPR3sgW+jsl2xm9v7lAyRF1rYEK71i9G5dRtkknoQ=
k8s.io/apimachinery v0.23.3/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM=
k8s.io/apimachinery v0.31.1 h1:mhcUBbj7KUjaVhyXILglcVjuS4nYXiwC+KKFBgIVy7U=
k8s.io/apimachinery v0.31.1/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
k8s.io/apiserver v0.31.1 h1:Sars5ejQDCRBY5f7R3QFHdqN3s61nhkpaX8/k1iEw1c=
k8s.io/apiserver v0.31.1/go.mod h1:lzDhpeToamVZJmmFlaLwdYZwd7zB+WYRYIboqA1kGxM=
k8s.io/apimachinery v0.31.2 h1:i4vUt2hPK56W6mlT7Ry+AO8eEsyxMD1U44NR22CLTYw=
k8s.io/apimachinery v0.31.2/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
k8s.io/apiserver v0.31.2 h1:VUzOEUGRCDi6kX1OyQ801m4A7AUPglpsmGvdsekmcI4=
k8s.io/apiserver v0.31.2/go.mod h1:o3nKZR7lPlJqkU5I3Ove+Zx3JuoFjQobGX1Gctw6XuE=
k8s.io/autoscaler/vertical-pod-autoscaler v1.0.0 h1:y0TgWoHaeYEv3L1MfLC+D2WVxyN1fGr6axURHXq+wHE=
k8s.io/autoscaler/vertical-pod-autoscaler v1.0.0/go.mod h1:w6/LjLR3DPQd57vlgvgbpzpuJKsCiily0+OzQI+nyfI=
k8s.io/client-go v0.31.1 h1:f0ugtWSbWpxHR7sjVpQwuvw9a3ZKLXX0u0itkFXufb0=
k8s.io/client-go v0.31.1/go.mod h1:sKI8871MJN2OyeqRlmA4W4KM9KBdBUpDLu/43eGemCg=
k8s.io/code-generator v0.23.3/go.mod h1:S0Q1JVA+kSzTI1oUvbKAxZY/DYbA/ZUb4Uknog12ETk=
k8s.io/code-generator v0.31.1 h1:GvkRZEP2g2UnB2QKT2Dgc/kYxIkDxCHENv2Q1itioVs=
k8s.io/code-generator v0.31.1/go.mod h1:oL2ky46L48osNqqZAeOcWWy0S5BXj50vVdwOtTefqIs=
k8s.io/component-base v0.31.1 h1:UpOepcrX3rQ3ab5NB6g5iP0tvsgJWzxTyAo20sgYSy8=
k8s.io/component-base v0.31.1/go.mod h1:WGeaw7t/kTsqpVTaCoVEtillbqAhF2/JgvO0LDOMa0w=
k8s.io/code-generator v0.31.2 h1:xLWxG0HEpMSHfcM//3u3Ro2Hmc6AyyLINQS//Z2GEOI=
k8s.io/code-generator v0.31.2/go.mod h1:eEQHXgBU/m7LDaToDoiz3t97dUUVyOblQdwOr8rivqc=
k8s.io/component-base v0.31.2 h1:Z1J1LIaC0AV+nzcPRFqfK09af6bZ4D1nAOpWsy9owlA=
k8s.io/component-base v0.31.2/go.mod h1:9PeyyFN/drHjtJZMCTkSpQJS3U9OXORnHQqMLDz0sUQ=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/gengo/v2 v2.0.0-20240826214909-a7b603a56eb7 h1:cErOOTkQ3JW19o4lo91fFurouhP8NcoBvb7CkvhZZpk=
Expand All @@ -1135,8 +1133,8 @@ k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 h1:1dWzkmJrrprYvjGwh9kEUx
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38/go.mod h1:coRQXBK9NxO98XUv3ZD6AK3xzHCxV6+b7lrquKwaKzA=
k8s.io/kubectl v0.31.1 h1:ih4JQJHxsEggFqDJEHSOdJ69ZxZftgeZvYo7M/cpp24=
k8s.io/kubectl v0.31.1/go.mod h1:aNuQoR43W6MLAtXQ/Bu4GDmoHlbhHKuyD49lmTC8eJM=
k8s.io/metrics v0.31.1 h1:h4I4dakgh/zKflWYAOQhwf0EXaqy8LxAIyE/GBvxqRc=
k8s.io/metrics v0.31.1/go.mod h1:JuH1S9tJiH9q1VCY0yzSCawi7kzNLsDzlWDJN4xR+iA=
k8s.io/metrics v0.31.2 h1:sQhujR9m3HN/Nu/0fTfTscjnswQl0qkQAodEdGBS0N4=
k8s.io/metrics v0.31.2/go.mod h1:QqqyReApEWO1UEgXOSXiHCQod6yTxYctbAAQBWZkboU=
k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3 h1:b2FmK8YH+QEwq/Sy2uAEhmqL5nPfGYbJOcaqjeYYZoA=
Expand Down
3 changes: 3 additions & 0 deletions modules/api/pkg/test/e2e/utils/apiclient/models/datacenter_spec_kubevirt.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions modules/api/pkg/test/e2e/utils/apiclient/models/provider_network.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e201cca

Please sign in to comment.