Skip to content

Commit

Permalink
Merge branch 'master' into fix-default-subnet-vpc
Browse files Browse the repository at this point in the history
  • Loading branch information
@cnvergence
cnvergence authored Dec 16, 2024
2 parents 0ef9c1d + 77650e5 commit 6c48c2c
Show file tree
Hide file tree
Showing 109 changed files with 1,735 additions and 3,088 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ kubectl-ko-log.tar.gz
kube-apiserver-audit.log
kube-apiserver-audit.json
kube-ovn.yaml
!/charts/kube-ovn/templates/kube-ovn-crd.yaml
kube-ovn-crd.yaml
ovn.yaml
ovn-ic-controller.yaml
Expand Down
25 changes: 25 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# Changelog

## v1.13.2 (2024-12-16)

* [229b0b74](https://github.com/kubeovn/kube-ovn/commit/229b0b74e0039c34c2e61942ce3ad76bd2b00e37) release v1.13.2
* [221b1a3c](https://github.com/kubeovn/kube-ovn/commit/221b1a3c7a817f3a184aebcf77b9ce8c7b4970e5) cni: do not exit if the sysctl variable does not exist or can not be set (#4828)
* [e4654105](https://github.com/kubeovn/kube-ovn/commit/e4654105efad75d4ea03932626cd3f42cf45700a) skip node local dns ip conntrack when set acl (#4824)
* [fe75a849](https://github.com/kubeovn/kube-ovn/commit/fe75a849730904cedb59d12cce9f179b146aab3d) prepare for next release

### Contributors

* changluyi
* 张祖建

## v1.13.1 (2024-12-11)

* [75dc01ae](https://github.com/kubeovn/kube-ovn/commit/75dc01ae133d9eb92d0101aed50a7eb72b31d114) release v1.13.1
Expand Down Expand Up @@ -1054,6 +1066,19 @@
* 张祖建
* 袁又袁

## v1.12.30 (2024-12-16)

* [4344a467](https://github.com/kubeovn/kube-ovn/commit/4344a46714a1e21a879d1842eb09afb300edddb8) release v1.12.30
* [f2c7937a](https://github.com/kubeovn/kube-ovn/commit/f2c7937a7b4227bbaa72aa77c5036c3d6aa1517b) skip node local dns ip conntrack when acl is set: (#4810)
* [249b3edc](https://github.com/kubeovn/kube-ovn/commit/249b3edc00a9b9cfbaf1d4192611cf8f1abe0106) bump k8s to v1.30.7 (#4771)
* [86794c28](https://github.com/kubeovn/kube-ovn/commit/86794c287c5141762e6ff4dbfe2e6e337ca06abd) bump dpdk base image to ubuntu 24.04 (#4770)
* [9dc2ab28](https://github.com/kubeovn/kube-ovn/commit/9dc2ab28f0642a981078cad7cd9e2e0c155ff972) prepare for next release

### Contributors

* changluyi
* 张祖建

## v1.12.29 (2024-11-25)

* [803bceeb](https://github.com/kubeovn/kube-ovn/commit/803bceeb43434012225be4de8f7bccf8516c5208) release v1.12.29
Expand Down
16 changes: 16 additions & 0 deletions charts/kube-ovn/templates/kube-ovn-crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -876,12 +876,24 @@ spec:
storage: true
subresources:
status: {}
scale:
# specReplicasPath defines the JSONPath inside of a custom resource that corresponds to Scale.Spec.Replicas.
specReplicasPath: .spec.replicas
# statusReplicasPath defines the JSONPath inside of a custom resource that corresponds to Scale.Status.Replicas.
statusReplicasPath: .status.replicas
# labelSelectorPath defines the JSONPath inside of a custom resource that corresponds to Scale.Status.Selector.
labelSelectorPath: .status.labelSelector
schema:
openAPIV3Schema:
type: object
properties:
status:
properties:
replicas:
type: integer
format: int32
labelSelector:
type: string
conditions:
items:
properties:
Expand Down Expand Up @@ -978,6 +990,7 @@ spec:
properties:
replicas:
type: integer
format: int32
default: 1
minimum: 1
maximum: 10
Expand Down Expand Up @@ -1025,12 +1038,15 @@ spec:
default: false
minRX:
type: integer
format: int32
default: 1000
minTX:
type: integer
format: int32
default: 1000
multiplier:
type: integer
format: int32
default: 3
policies:
type: array
Expand Down
9 changes: 9 additions & 0 deletions cmd/cni/sysctl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package main

import (
"fmt"
"os"

"github.com/containernetworking/plugins/pkg/ns"
"github.com/containernetworking/plugins/pkg/utils/sysctl"
Expand All @@ -19,10 +20,18 @@ func sysctlEnableIPv6(nsPath string) error {
name := fmt.Sprintf("net.ipv6.conf.%s.disable_ipv6", conf)
value, err := sysctl.Sysctl(name)
if err != nil {
if os.IsNotExist(err) {
// The sysctl variable doesn't exist, so we can't set it
continue
}
return fmt.Errorf("failed to get sysctl variable %s: %w", name, err)
}
if value != "0" {
if _, err = sysctl.Sysctl(name, "0"); err != nil {
if os.IsPermission(err) {
// We don't have permission to set the sysctl variable, so we can't set it
continue
}
return fmt.Errorf("failed to set sysctl variable %s to 0: %w", name, err)
}
}
Expand Down
2 changes: 1 addition & 1 deletion dist/images/Dockerfile.base
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ FROM ghcr.io/aquasecurity/trivy:latest AS trivy

ARG ARCH
ENV CNI_VERSION="v1.6.1"
ENV KUBE_VERSION="v1.31.4"
ENV KUBE_VERSION="v1.32.0"
ENV GOBGP_VERSION="3.32.0"
ENV TRIVY_DB_REPOSITORY="public.ecr.aws/aquasecurity/trivy-db:2"

Expand Down
2 changes: 1 addition & 1 deletion dist/images/go-deps/download-go-deps.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e

ARCH=${ARCH:-amd64}
CNI_PLUGINS_VERSION=${CNI_PLUGINS_VERSION:-v1.6.1}
KUBECTL_VERSION=${KUBECTL_VERSION:-v1.31.4}
KUBECTL_VERSION=${KUBECTL_VERSION:-v1.32.0}
GOBGP_VERSION=${GOBGP_VERSION:-3.32.0}


Expand Down
16 changes: 16 additions & 0 deletions dist/images/install.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1124,12 +1124,24 @@ spec:
storage: true
subresources:
status: {}
scale:
# specReplicasPath defines the JSONPath inside of a custom resource that corresponds to Scale.Spec.Replicas.
specReplicasPath: .spec.replicas
# statusReplicasPath defines the JSONPath inside of a custom resource that corresponds to Scale.Status.Replicas.
statusReplicasPath: .status.replicas
# labelSelectorPath defines the JSONPath inside of a custom resource that corresponds to Scale.Status.Selector.
labelSelectorPath: .status.labelSelector
schema:
openAPIV3Schema:
type: object
properties:
status:
properties:
replicas:
type: integer
format: int32
labelSelector:
type: string
conditions:
items:
properties:
Expand Down Expand Up @@ -1223,6 +1235,7 @@ spec:
properties:
replicas:
type: integer
format: int32
default: 1
minimum: 1
maximum: 10
Expand Down Expand Up @@ -1270,12 +1283,15 @@ spec:
default: false
minRX:
type: integer
format: int32
default: 1000
minTX:
type: integer
format: int32
default: 1000
multiplier:
type: integer
format: int32
default: 3
policies:
type: array
Expand Down
114 changes: 56 additions & 58 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,24 +39,24 @@ require (
github.com/sirupsen/logrus v1.9.3
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.10.0
github.com/vishvananda/netlink v1.3.0
github.com/vishvananda/netlink v1.3.1-0.20240905180732-b1ce50cfa9be
go.uber.org/mock v0.5.0
golang.org/x/mod v0.22.0
golang.org/x/sys v0.28.0
golang.org/x/time v0.8.0
golang.org/x/tools v0.28.0
google.golang.org/grpc v1.68.1
google.golang.org/grpc v1.69.0
google.golang.org/protobuf v1.35.2
gopkg.in/k8snetworkplumbingwg/multus-cni.v4 v4.1.4
k8s.io/api v0.31.4
k8s.io/apiextensions-apiserver v0.31.4
k8s.io/apimachinery v0.31.4
k8s.io/api v0.32.0
k8s.io/apiextensions-apiserver v0.32.0
k8s.io/apimachinery v0.32.0
k8s.io/client-go v12.0.0+incompatible
k8s.io/component-base v0.31.4
k8s.io/component-base v0.32.0
k8s.io/klog/v2 v2.130.1
k8s.io/kubectl v0.31.4
k8s.io/kubernetes v1.31.4
k8s.io/pod-security-admission v0.31.4
k8s.io/kubectl v0.32.0
k8s.io/kubernetes v1.32.0
k8s.io/pod-security-admission v0.32.0
k8s.io/utils v0.0.0-20241210054802-24370beab758
kernel.org/pub/linux/libs/security/libcap/cap v1.2.73
kubevirt.io/api v1.4.0
Expand All @@ -68,10 +68,11 @@ require (

require (
cel.dev/expr v0.18.0 // indirect
cloud.google.com/go/compute/metadata v0.5.0 // indirect
cloud.google.com/go/compute/metadata v0.5.2 // indirect
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab // indirect
github.com/MakeNowJust/heredoc v1.0.0 // indirect
github.com/Microsoft/hnslib v0.0.8 // indirect
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/andybalholm/brotli v1.0.4 // indirect
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
Expand All @@ -85,7 +86,6 @@ require (
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/chai2010/gettext-go v1.0.2 // indirect
github.com/container-storage-interface/spec v1.9.0 // indirect
github.com/containerd/cgroups v1.1.0 // indirect
github.com/containerd/cgroups/v3 v3.0.3 // indirect
github.com/containerd/containerd/api v1.7.19 // indirect
github.com/containerd/continuity v0.4.3 // indirect
Expand Down Expand Up @@ -133,7 +133,7 @@ require (
github.com/google/btree v1.1.3 // indirect
github.com/google/cadvisor v0.51.0 // indirect
github.com/google/cel-go v0.22.1 // indirect
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
github.com/google/gnostic-models v0.6.9 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20241122213907-cbe949e5a41b // indirect
Expand All @@ -149,7 +149,6 @@ require (
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hashicorp/yamux v0.1.1 // indirect
github.com/httprunner/funplugin v0.5.5 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jinzhu/copier v0.3.5 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
Expand Down Expand Up @@ -253,8 +252,8 @@ require (
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
gocv.io/x/gocv v0.39.0 // indirect
golang.org/x/crypto v0.30.0 // indirect
golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d // indirect
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/exp v0.0.0-20241210194714-1829a127f884 // indirect
golang.org/x/net v0.32.0 // indirect
golang.org/x/oauth2 v0.24.0 // indirect
golang.org/x/sync v0.10.0 // indirect
Expand All @@ -268,24 +267,23 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
howett.net/plist v1.0.1 // indirect
k8s.io/apiserver v0.31.4 // indirect
k8s.io/cli-runtime v0.31.4 // indirect
k8s.io/cloud-provider v0.31.4 // indirect
k8s.io/cluster-bootstrap v0.31.4 // indirect
k8s.io/component-helpers v0.31.4 // indirect
k8s.io/controller-manager v0.31.4 // indirect
k8s.io/cri-api v0.31.4 // indirect
k8s.io/apiserver v0.32.0 // indirect
k8s.io/cli-runtime v0.32.0 // indirect
k8s.io/cloud-provider v0.32.0 // indirect
k8s.io/cluster-bootstrap v0.32.0 // indirect
k8s.io/component-helpers v0.32.0 // indirect
k8s.io/controller-manager v0.32.0 // indirect
k8s.io/cri-api v0.32.0 // indirect
k8s.io/cri-client v0.0.0 // indirect
k8s.io/csi-translation-lib v0.31.4 // indirect
k8s.io/csi-translation-lib v0.32.0 // indirect
k8s.io/dynamic-resource-allocation v0.0.0 // indirect
k8s.io/kms v0.31.4 // indirect
k8s.io/kms v0.32.0 // indirect
k8s.io/kube-aggregator v0.26.4 // indirect
k8s.io/kube-openapi v0.31.4 // indirect
k8s.io/kube-openapi v0.32.0 // indirect
k8s.io/kube-scheduler v0.0.0 // indirect
k8s.io/kubelet v0.31.4 // indirect
k8s.io/kubelet v0.32.0 // indirect
k8s.io/mount-utils v0.0.0 // indirect
kernel.org/pub/linux/libs/security/libcap/psx v1.2.73 // indirect
kubevirt.io/containerized-data-importer-api v1.58.1 // indirect
Expand All @@ -294,7 +292,7 @@ require (
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/kustomize/api v0.18.0 // indirect
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.3 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)

Expand All @@ -303,34 +301,34 @@ replace (
github.com/openshift/api => github.com/openshift/api v0.0.0-20191219222812-2987a591a72c
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20210112165513-ebc401615f47
github.com/ovn-org/libovsdb => github.com/kubeovn/libovsdb v0.0.0-20240814054845-978196448fb2
k8s.io/api => k8s.io/api v0.31.4
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.4
k8s.io/apimachinery => k8s.io/apimachinery v0.31.4
k8s.io/apiserver => k8s.io/apiserver v0.31.4
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.4
k8s.io/client-go => k8s.io/client-go v0.31.4
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.4
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.4
k8s.io/code-generator => k8s.io/code-generator v0.31.4
k8s.io/component-base => k8s.io/component-base v0.31.4
k8s.io/component-helpers => k8s.io/component-helpers v0.31.4
k8s.io/controller-manager => k8s.io/controller-manager v0.31.4
k8s.io/cri-api => k8s.io/cri-api v0.31.4
k8s.io/cri-client => k8s.io/cri-client v0.31.4
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.4
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.4
k8s.io/endpointslice => k8s.io/endpointslice v0.31.4
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.4
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.4
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20240812233141-91dab695df6f
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.4
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.4
k8s.io/kubectl => k8s.io/kubectl v0.31.4
k8s.io/kubelet => k8s.io/kubelet v0.31.4
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.4
k8s.io/metrics => k8s.io/metrics v0.31.4
k8s.io/mount-utils => k8s.io/mount-utils v0.31.4
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.4
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.4
kubevirt.io/client-go => github.com/kubeovn/kubevirt-client-go v0.0.0-20241128091559-882afb5db2f6
k8s.io/api => k8s.io/api v0.32.0
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.0
k8s.io/apimachinery => k8s.io/apimachinery v0.32.0
k8s.io/apiserver => k8s.io/apiserver v0.32.0
k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.0
k8s.io/client-go => k8s.io/client-go v0.32.0
k8s.io/cloud-provider => k8s.io/cloud-provider v0.32.0
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.32.0
k8s.io/code-generator => k8s.io/code-generator v0.32.0
k8s.io/component-base => k8s.io/component-base v0.32.0
k8s.io/component-helpers => k8s.io/component-helpers v0.32.0
k8s.io/controller-manager => k8s.io/controller-manager v0.32.0
k8s.io/cri-api => k8s.io/cri-api v0.32.0
k8s.io/cri-client => k8s.io/cri-client v0.32.0
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.32.0
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.32.0
k8s.io/endpointslice => k8s.io/endpointslice v0.32.0
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.32.0
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.32.0
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7
k8s.io/kube-proxy => k8s.io/kube-proxy v0.32.0
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.0
k8s.io/kubectl => k8s.io/kubectl v0.32.0
k8s.io/kubelet => k8s.io/kubelet v0.32.0
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.32.0
k8s.io/metrics => k8s.io/metrics v0.32.0
k8s.io/mount-utils => k8s.io/mount-utils v0.32.0
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.32.0
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.0
kubevirt.io/client-go => github.com/kubeovn/kubevirt-client-go v0.0.0-20241213030551-6db0aaa1c92e
)
Loading

0 comments on commit 6c48c2c

Please sign in to comment.