Skip to content

Commit 7339b5a

Browse files
zhangzujianzbb88888
authored andcommitted
ci/test: bump various versions (#3162)
Signed-off-by: 张祖建 <zhangzujian.7@gmail.com>
1 parent 094d136 commit 7339b5a

10 files changed

+15
-8
lines changed

.github/workflows/build-windows.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ concurrency:
2323

2424
env:
2525
GO_VERSION: ''
26-
GOSEC_VERSION: '2.16.0'
26+
GOSEC_VERSION: '2.17.0'
2727

2828
jobs:
2929
filter:

.github/workflows/build-x86-image.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ concurrency:
2222

2323
env:
2424
GO_VERSION: ''
25-
GOSEC_VERSION: '2.16.0'
26-
HELM_VERSION: v3.12.2
25+
GOSEC_VERSION: '2.17.0'
26+
HELM_VERSION: v3.12.3
2727
SUBMARINER_VERSION: '0.14.6'
2828

2929
jobs:

.github/workflows/scheduled-e2e.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ concurrency:
1111

1212
env:
1313
GO_VERSION: ''
14-
HELM_VERSION: v3.12.2
14+
HELM_VERSION: v3.12.3
1515
SUBMARINER_VERSION: '0.14.6'
1616

1717
jobs:

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ KUBEVIRT_OPERATOR_YAML = https://github.com/kubevirt/kubevirt/releases/download/
3737
KUBEVIRT_CR_YAML = https://github.com/kubevirt/kubevirt/releases/download/$(KUBEVIRT_VERSION)/kubevirt-cr.yaml
3838
KUBEVIRT_TEST_YAML = https://kubevirt.io/labs/manifests/vm.yaml
3939

40-
CILIUM_VERSION = 1.13.4
40+
CILIUM_VERSION = 1.14.1
4141
CILIUM_IMAGE_REPO = quay.io/cilium/cilium
4242

43-
CERT_MANAGER_VERSION = v1.12.2
43+
CERT_MANAGER_VERSION = v1.12.3
4444
CERT_MANAGER_CONTROLLER = quay.io/jetstack/cert-manager-controller:$(CERT_MANAGER_VERSION)
4545
CERT_MANAGER_CAINJECTOR = quay.io/jetstack/cert-manager-cainjector:$(CERT_MANAGER_VERSION)
4646
CERT_MANAGER_WEBHOOK = quay.io/jetstack/cert-manager-webhook:$(CERT_MANAGER_VERSION)
@@ -59,7 +59,7 @@ DEEPFLOW_CHART_REPO = https://deepflow-ce.oss-cn-beijing.aliyuncs.com/chart/stab
5959
DEEPFLOW_IMAGE_REPO = registry.cn-beijing.aliyuncs.com/deepflow-ce
6060
DEEPFLOW_GRAFANA_PORT = 30080
6161

62-
KWOK_VERSION = v0.3.0
62+
KWOK_VERSION = v0.4.0
6363
KWOK_IMAGE = registry.k8s.io/kwok/kwok:$(KWOK_VERSION)
6464

6565
VPC_NAT_GW_IMG = $(REGISTRY)/vpc-nat-gateway:$(VERSION)

pkg/ovs/ovn-nb-acl.go

+1
Original file line numberDiff line numberDiff line change
@@ -734,6 +734,7 @@ func (c *ovnNbClient) GetAcl(parent, direction, priority, match string, ignoreNo
734734
return nil, fmt.Errorf("more than one acl with same 'parent %s direction %s priority %s match %s'", parent, direction, priority, match)
735735
}
736736

737+
// #nosec G602
737738
return &aclList[0], nil
738739
}
739740

pkg/ovs/ovn-nb-load_balancer.go

+1
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ func (c *ovnNbClient) GetLoadBalancer(lbName string, ignoreNotFound bool) (*ovnn
211211
return nil, fmt.Errorf("more than one load balancer with same name %q", lbName)
212212
}
213213

214+
// #nosec G602
214215
return &lbList[0], nil
215216
}
216217

pkg/ovs/ovn-nb-logical_router.go

+1
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ func (c *ovnNbClient) GetLogicalRouter(lrName string, ignoreNotFound bool) (*ovn
109109
return nil, fmt.Errorf("more than one logical router with same name %q", lrName)
110110
}
111111

112+
// #nosec G602
112113
return &lrList[0], nil
113114
}
114115

pkg/ovs/ovn-nb-logical_switch.go

+1
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ func (c *ovnNbClient) GetLogicalSwitch(lsName string, ignoreNotFound bool) (*ovn
210210
return nil, fmt.Errorf("more than one logical switch with same name %q", lsName)
211211
}
212212

213+
// #nosec G602
213214
return &lsList[0], nil
214215
}
215216

pkg/ovs/ovn-sb-chassis.go

+2
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ func (c *ovnSbClient) GetChassisByHost(nodeName string) (*ovnsb.Chassis, error)
121121
klog.Error(err)
122122
return nil, err
123123
}
124+
125+
// #nosec G602
124126
return &chassisList[0], nil
125127
}
126128

pkg/util/net.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ import (
1717
kubeovnv1 "github.com/kubeovn/kube-ovn/pkg/apis/kubeovn/v1"
1818
)
1919

20-
var vpcExternalNet = "ovn-vpc-external-network"
20+
// #nosec G101
21+
const vpcExternalNet = "ovn-vpc-external-network"
2122

2223
const (
2324
IPv4Multicast = "224.0.0.0/4"

0 commit comments

Comments
 (0)