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

robot updated golang version #243

Closed
wants to merge 3 commits into from
Closed
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
2 changes: 1 addition & 1 deletion .github/workflows/auto-upgrade-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ jobs:
- name: Setup Golang
uses: actions/setup-go@v5
with:
go-version: 1.23.2
go-version: 1.23.3

- name: Install Tools
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-image-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ jobs:
# docker cache after the workflow "Image CI Cache Cleaner" was terminated.
push: ${{ env.push }}
platforms: linux/amd64
outputs: type=tar,dest=/tmp/${{ matrix.name }}-race.tar
outputs: type=docker,dest=/tmp/${{ matrix.name }}-race.tar
github-token: ${{ secrets.WELAN_PAT }}
tags: |
${{ env.ONLINE_REGISTER }}/${{ github.repository }}/${{ matrix.name }}-ci:${{ env.tag }}-race
Expand Down Expand Up @@ -231,7 +231,7 @@ jobs:
push: ${{ env.push }}
platforms: linux/amd64
github-token: ${{ secrets.WELAN_PAT }}
outputs: type=tar,dest=/tmp/${{ matrix.name }}-race.tar
outputs: type=docker,dest=/tmp/${{ matrix.name }}-race.tar
tags: |
${{ env.ONLINE_REGISTER }}/${{ github.repository }}/${{ matrix.name }}-ci:${{ env.tag }}-race
build-args: |
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/e2e-init.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
- name: Setup Golang
uses: actions/setup-go@v5
with:
go-version: 1.23.2
go-version: 1.23.3

- name: Install Tools
run: |
Expand All @@ -122,8 +122,13 @@ jobs:
for ITEM in $TAR_FILES ; do
IMAGE_NAME=${ITEM%*.tar}
echo ${IMAGE_NAME}
cat test/.download/${ITEM} | docker import - ${IMAGE_NAME}:${{ inputs.image_tag }}
docker load -i test/.download/${ITEM}
echo "list docker images" && docker images
ITEM_IMAGE_ID=$(docker images | grep ${IMAGE_NAME%*-race}| grep ${{ inputs.image_tag }} | awk '{print $3}')
docker tag ${ITEM_IMAGE_ID} ${IMAGE_NAME}:${{ inputs.image_tag }}
done
echo "list all docker images"
docker images

# test against commit version
# https://github.com/kubernetes-sigs/kind/issues/2863
Expand Down Expand Up @@ -164,7 +169,7 @@ jobs:
else
echo "RUN_SETUP_KIND_CLUSTER_PASS=false" >> $GITHUB_ENV
fi
if [ -f "test/e2edebugLog" ] ; then
if [ -f "test/e2edebugLog.txt" ] ; then
echo "UPLOAD_SETUP_KIND_CLUSTER_LOG=true" >> $GITHUB_ENV
else
echo "UPLOAD_SETUP_KIND_CLUSTER_LOG=false" >> $GITHUB_ENV
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint-golang.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: 1.23.2
go-version: 1.23.3

- name: Checkout code
uses: actions/checkout@v4
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: 1.23.2
go-version: 1.23.3

- name: Checkout code
uses: actions/checkout@v4
Expand Down Expand Up @@ -192,7 +192,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: 1.23.2
go-version: 1.23.3

- name: Checkout code
uses: actions/checkout@v4
Expand Down
38 changes: 18 additions & 20 deletions .github/workflows/trivy-scan-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,24 +35,22 @@ jobs:
name: image-tar-spiderpool-controller
path: test/.download

- name: Load And Scan Images
run: |
TAR_FILES=` ls test/.download `
echo $TAR_FILES
for ITEM in $TAR_FILES ; do
IMAGE_NAME=${ITEM%*.tar}
echo ${IMAGE_NAME}
cat test/.download/${ITEM} | docker import - ${IMAGE_NAME}:${{ inputs.image_tag }}
echo "---------trivy checkout image ${IMAGE_NAME}:${{ inputs.image_tag }} --------------------"
make lint_image_trivy -e IMAGE_NAME=${IMAGE_NAME}:${{ inputs.image_tag }} \
|| { echo "RUN_IMAGE_TRIVY_FAIL=true" >> $GITHUB_ENV ; echo "error, image ${IMAGE_NAME}:${{ inputs.image_tag }} is bad" ; }
done
- name: List downloaded files
run: ls -al test/.download

- name: Show Trivy Scan Report
run: |
if [ "${{ env.RUN_IMAGE_TRIVY_FAIL }}" == "true" ] ; then
echo "error, image is not secure, see detail on Step 'Load And Scan Images' "
exit 1
else
exit 0
fi
# https://github.com/aquasecurity/trivy-action/issues/389
- name: load and scan spiderpool-agent image
uses: aquasecurity/[email protected]
env:
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db,ghcr.io/aquasecurity/trivy-db
with:
input: test/.download/spiderpool-agent-race.tar
severity: 'CRITICAL,HIGH'

- name: load and scan spiderpool-controller image
uses: aquasecurity/[email protected]
env:
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db,ghcr.io/aquasecurity/trivy-db
with:
input: test/.download/spiderpool-controller-race.tar
severity: 'CRITICAL,HIGH'
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -501,4 +501,3 @@ lint_chart_trivy:
.PHONY: build-chart
build-chart:
@ cd charts ; make

2 changes: 1 addition & 1 deletion Makefile.version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
GO_VERSION := 1.23.2
GO_VERSION := 1.23.3
GINKGO_VERSION := 2.1.3
2 changes: 1 addition & 1 deletion images/spiderpool-agent/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0

ARG BASE_IMAGE=ghcr.io/spidernet-io/spiderpool/spiderpool-base:4316032f53c3753c5fa4f9fa2911415af5fd76b7
ARG GOLANG_IMAGE=docker.io/library/golang:1.23.2@sha256:adee809c2d0009a4199a11a1b2618990b244c6515149fe609e2788ddf164bd10
ARG GOLANG_IMAGE=docker.io/library/golang:1.23.3@sha256:73f06be4578c9987ce560087e2e2ea6485fb605e3910542cadd8fa09fc5f3e31

#======= build bin ==========
FROM --platform=${BUILDPLATFORM} ${GOLANG_IMAGE} AS builder
Expand Down
2 changes: 1 addition & 1 deletion images/spiderpool-base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# docker buildx build -t testbase:latest --platform=linux/arm64,linux/amd64 --output type=docker .

ARG GOLANG_IMAGE=docker.io/library/golang:1.23.2@sha256:adee809c2d0009a4199a11a1b2618990b244c6515149fe609e2788ddf164bd10
ARG GOLANG_IMAGE=docker.io/library/golang:1.23.3@sha256:73f06be4578c9987ce560087e2e2ea6485fb605e3910542cadd8fa09fc5f3e31
ARG UBUNTU_IMAGE=docker.io/library/ubuntu:20.04@sha256:bea6d19168bbfd6af8d77c2cc3c572114eb5d113e6f422573c93cb605a0e2ffb


Expand Down
2 changes: 1 addition & 1 deletion images/spiderpool-controller/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0

ARG BASE_IMAGE=ghcr.io/spidernet-io/spiderpool/spiderpool-base:1f8330482d25b58d2ae26bc6252e20384bac92ad
ARG GOLANG_IMAGE=docker.io/library/golang:1.23.2@sha256:adee809c2d0009a4199a11a1b2618990b244c6515149fe609e2788ddf164bd10
ARG GOLANG_IMAGE=docker.io/library/golang:1.23.3@sha256:73f06be4578c9987ce560087e2e2ea6485fb605e3910542cadd8fa09fc5f3e31

#======= build bin ==========
FROM --platform=${BUILDPLATFORM} ${GOLANG_IMAGE} AS builder
Expand Down
2 changes: 1 addition & 1 deletion images/spiderpool-plugins/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright 2023 Authors of spidernet-io
# SPDX-License-Identifier: Apache-2.0

ARG GOLANG_IMAGE=docker.io/library/golang:1.23.2@sha256:adee809c2d0009a4199a11a1b2618990b244c6515149fe609e2788ddf164bd10
ARG GOLANG_IMAGE=docker.io/library/golang:1.23.3@sha256:73f06be4578c9987ce560087e2e2ea6485fb605e3910542cadd8fa09fc5f3e31

#======= build plugins ==========
FROM --platform=${BUILDPLATFORM} ${GOLANG_IMAGE} AS builder
Expand Down
Loading