From bb47b559994552b43b5089f4b1fa457aeb39bc3c Mon Sep 17 00:00:00 2001 From: Adrian Vladu Date: Fri, 17 May 2024 16:54:04 +0300 Subject: [PATCH 1/2] arm64: build image for arm v8 Fixes: https://github.com/k8snetworkplumbingwg/multus-cni/issues/1281 Signed-off-by: Adrian Vladu --- .github/workflows/image-build.yml | 2 +- .github/workflows/image-push-master.yml | 4 ++-- .github/workflows/image-push-release.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/image-build.yml b/.github/workflows/image-build.yml index 22afe163c..c6318c68d 100644 --- a/.github/workflows/image-build.yml +++ b/.github/workflows/image-build.yml @@ -31,7 +31,7 @@ jobs: push: false tags: ghcr.io/${{ github.repository }}:latest file: images/Dockerfile.debug - platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/ppc64le,linux/s390x + platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8,linux/ppc64le,linux/s390x sbom: false provenance: false diff --git a/.github/workflows/image-push-master.yml b/.github/workflows/image-push-master.yml index 499668272..bfa8b4b2f 100644 --- a/.github/workflows/image-push-master.yml +++ b/.github/workflows/image-push-master.yml @@ -64,7 +64,7 @@ jobs: ghcr.io/${{ github.repository }}:latest ghcr.io/${{ github.repository }}:snapshot file: images/Dockerfile - platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/ppc64le,linux/s390x + platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8,linux/ppc64le,linux/s390x sbom: false provenance: false @@ -78,7 +78,7 @@ jobs: ghcr.io/${{ github.repository }}:latest-debug ghcr.io/${{ github.repository }}:snapshot-debug file: images/Dockerfile.debug - platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/ppc64le,linux/s390x + platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8,linux/ppc64le,linux/s390x sbom: false provenance: false diff --git a/.github/workflows/image-push-release.yml b/.github/workflows/image-push-release.yml index d787ad64b..868aa97f8 100644 --- a/.github/workflows/image-push-release.yml +++ b/.github/workflows/image-push-release.yml @@ -80,7 +80,7 @@ jobs: ghcr.io/${{ github.repository }}:stable ${{ steps.docker_meta.outputs.tags }} file: images/Dockerfile - platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/ppc64le,linux/s390x + platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8,linux/ppc64le,linux/s390x sbom: false provenance: false @@ -94,7 +94,7 @@ jobs: ghcr.io/${{ github.repository }}:stable-debug ${{ steps.docker_meta.outputs.tags }}-debug file: images/Dockerfile.debug - platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/ppc64le,linux/s390x + platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8,linux/ppc64le,linux/s390x sbom: false provenance: false From d23856b784e5d8e6c08cc49987bf67791c7c61c8 Mon Sep 17 00:00:00 2001 From: Tomofumi Hayashi Date: Sat, 25 May 2024 01:40:12 +0900 Subject: [PATCH 2/2] Not exposed APIReadyCheckFunc to outside of package APIReadyCheckFunc is used only in api, hence it can be decapitalize to make its scope only in this package. This fix changes its scope. In addition, api.APIReadyCheckFunc seems to be redundant so the name is changed. Change the comment to fit to golang style, too. --- pkg/server/api/shim.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/server/api/shim.go b/pkg/server/api/shim.go index 497a9e5ae..b7568da58 100644 --- a/pkg/server/api/shim.go +++ b/pkg/server/api/shim.go @@ -40,8 +40,8 @@ type ShimNetConf struct { LogToStderr bool `json:"logToStderr,omitempty"` } -// Define a type for API readiness check functions -type APIReadyCheckFunc func(string) error +// readyCheckFunc defines a type for API readiness check functions +type readyCheckFunc func(string) error // CmdAdd implements the CNI spec ADD command handler func CmdAdd(args *skel.CmdArgs) error { @@ -74,7 +74,7 @@ func CmdDel(args *skel.CmdArgs) error { return nil } -func postRequest(args *skel.CmdArgs, readinessCheck APIReadyCheckFunc) (*Response, string, error) { +func postRequest(args *skel.CmdArgs, readinessCheck readyCheckFunc) (*Response, string, error) { multusShimConfig, err := shimConfig(args.StdinData) if err != nil { return nil, "", fmt.Errorf("invalid CNI configuration passed to multus-shim: %w", err)