From b545344edfd2c18211daed3066b76920e4481cd9 Mon Sep 17 00:00:00 2001 From: Drew Gonzales Date: Mon, 25 Nov 2024 09:01:30 -0800 Subject: [PATCH] add fips check --- .gitlab-ci.yml | 6 ++---- Makefile | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8bab686971..c681c28c17 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,11 +15,9 @@ test: verify-fips: stage: build tags: [ "runner:main" ] - image: $CURRENT_CI_IMAGE + image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/k8s-volume-manager:4 script: - - *export-github-token - - git config --global url."https://${GITHUB_TOKEN}@github.com/DataDog".insteadOf https://github.com/DataDog - - make verify-fips + - go tool nm bin/aws-ebs-csi-driver | grep -E 'sig.FIPSOnly|sig.BoringCrypto|sig.StandardCrypto' build-docker-image: extends: .build-docker-image diff --git a/Makefile b/Makefile index e96f993b90..61b0f61881 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ VERSION?=v1.36.0 PKG=github.com/kubernetes-sigs/aws-ebs-csi-driver GIT_COMMIT?=$(shell git rev-parse HEAD) BUILD_DATE?=$(shell date -u -Iseconds) -LDFLAGS?="-X ${PKG}/pkg/driver.driverVersion=${VERSION} -X ${PKG}/pkg/cloud.driverVersion=${VERSION} -X ${PKG}/pkg/driver.gitCommit=${GIT_COMMIT} -X ${PKG}/pkg/driver.buildDate=${BUILD_DATE} -s -w" +LDFLAGS?="-X ${PKG}/pkg/driver.driverVersion=${VERSION} -X ${PKG}/pkg/cloud.driverVersion=${VERSION} -X ${PKG}/pkg/driver.gitCommit=${GIT_COMMIT} -X ${PKG}/pkg/driver.buildDate=${BUILD_DATE}" OS?=$(shell go env GOHOSTOS) ARCH?=$(shell go env GOHOSTARCH)