File tree Expand file tree Collapse file tree 4 files changed +11
-9
lines changed
Expand file tree Collapse file tree 4 files changed +11
-9
lines changed Original file line number Diff line number Diff line change @@ -22,9 +22,9 @@ concurrency:
2222
2323env :
2424 KIND_VERSION : v0.27.0
25- GOLANGCI_LINT_VERSION : ' v2.1.1 '
25+ GOLANGCI_LINT_VERSION : ' v2.1.2 '
2626 HELM_VERSION : v3.17.3
27- SUBMARINER_VERSION : ' 0.19.3 '
27+ SUBMARINER_VERSION : ' 0.19.4 '
2828
2929jobs :
3030 build-kube-ovn-base :
@@ -236,6 +236,7 @@ jobs:
236236 CGO_ENABLED : " 0"
237237 GO_INSTALL : " go install -v -mod=mod -trimpath"
238238 run : |
239+ go mod tidy
239240 cat trivy-result.json
240241 dockerfile=${{ github.workspace }}/dist/images/Dockerfile
241242 export GOBIN=`dirname "$dockerfile"`
@@ -255,7 +256,6 @@ jobs:
255256 echo "COPY $bin /$f" >> "$dockerfile"
256257 ;;
257258 kubectl)
258- go mod tidy
259259 version=`go list -m -f '{{.Version}}' k8s.io/kubernetes`
260260 mod_dir=`go list -m -f '{{.Dir}}' k8s.io/kubernetes`
261261 source "$mod_dir/hack/lib/util.sh"
@@ -281,6 +281,8 @@ jobs:
281281 echo "COPY $bin /$f" >> "$dockerfile"
282282 ;;
283283 gobgp)
284+ version=`go list -m -f '{{.Version}}' github.com/osrg/gobgp/v3`
285+ echo "Building $bin@$version from source..."
284286 $GO_INSTALL github.com/osrg/gobgp/v3/cmd/$bin
285287 echo "COPY $bin /$f" >> "$dockerfile"
286288 ;;
Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ CONTROL_PLANE_TAINTS = node-role.kubernetes.io/master node-role.kubernetes.io/co
1818FRR_VERSION = 9.1.3
1919FRR_IMAGE = quay.io/frrouting/frr:$(FRR_VERSION )
2020
21- CLAB_IMAGE = ghcr.io/srl-labs/clab:0.66 .0
21+ CLAB_IMAGE = ghcr.io/srl-labs/clab:0.67 .0
2222
2323MULTUS_VERSION = v4.2.0
2424MULTUS_IMAGE = ghcr.io/k8snetworkplumbingwg/multus-cni:$(MULTUS_VERSION ) -thick
@@ -38,16 +38,16 @@ KUBEVIRT_LAUNCHER_IMAGE = quay.io/kubevirt/virt-launcher:$(KUBEVIRT_VERSION)
3838KUBEVIRT_OPERATOR_YAML = https://github.com/kubevirt/kubevirt/releases/download/$(KUBEVIRT_VERSION ) /kubevirt-operator.yaml
3939KUBEVIRT_CR_YAML = https://github.com/kubevirt/kubevirt/releases/download/$(KUBEVIRT_VERSION ) /kubevirt-cr.yaml
4040
41- CILIUM_VERSION = 1.17.2
41+ CILIUM_VERSION = 1.17.3
4242CILIUM_IMAGE_REPO = quay.io/cilium
4343
44- CERT_MANAGER_VERSION = v1.17.1
44+ CERT_MANAGER_VERSION = v1.17.2
4545CERT_MANAGER_CONTROLLER = quay.io/jetstack/cert-manager-controller:$(CERT_MANAGER_VERSION )
4646CERT_MANAGER_CAINJECTOR = quay.io/jetstack/cert-manager-cainjector:$(CERT_MANAGER_VERSION )
4747CERT_MANAGER_WEBHOOK = quay.io/jetstack/cert-manager-webhook:$(CERT_MANAGER_VERSION )
4848CERT_MANAGER_YAML = https://github.com/cert-manager/cert-manager/releases/download/$(CERT_MANAGER_VERSION ) /cert-manager.yaml
4949
50- SUBMARINER_VERSION = $(shell echo $${SUBMARINER_VERSION:-0.19.3 })
50+ SUBMARINER_VERSION = $(shell echo $${SUBMARINER_VERSION:-0.19.4 })
5151SUBMARINER_OPERATOR = quay.io/submariner/submariner-operator:$(SUBMARINER_VERSION )
5252SUBMARINER_GATEWAY = quay.io/submariner/submariner-gateway:$(SUBMARINER_VERSION )
5353SUBMARINER_LIGHTHOUSE_AGENT = quay.io/submariner/lighthouse-agent:$(SUBMARINER_VERSION )
Original file line number Diff line number Diff line change @@ -117,7 +117,7 @@ RUN mkdir /packages/ && \
117117FROM ghcr.io/aquasecurity/trivy:latest AS trivy
118118
119119ARG ARCH
120- ENV CNI_PLUGINS_VERSION="v1.6.2 "
120+ ENV CNI_PLUGINS_VERSION="v1.7.1 "
121121ENV KUBECTL_VERSION="v1.32.4"
122122ENV GOBGP_VERSION="3.36.0"
123123ENV TRIVY_DB_REPOSITORY="public.ecr.aws/aquasecurity/trivy-db:2"
Original file line number Diff line number Diff line change 33set -e
44
55ARCH=${ARCH:- amd64}
6- CNI_PLUGINS_VERSION=${CNI_PLUGINS_VERSION:- v1.6.2 }
6+ CNI_PLUGINS_VERSION=${CNI_PLUGINS_VERSION:- v1.7.1 }
77KUBECTL_VERSION=${KUBECTL_VERSION:- v1.32.4}
88GOBGP_VERSION=${GOBGP_VERSION:- 3.36.0}
99
You can’t perform that action at this time.
0 commit comments