Skip to content

Commit 513b12d

Browse files
Merge pull request openshift#231 from mrbarge/enable-fips
Enable FIPS and switch to golang-1.19
2 parents 4d5f3aa + ef744c6 commit 513b12d

File tree

3 files changed

+20
-4
lines changed

3 files changed

+20
-4
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ IMG_ORG ?= app-sre
1515
IMG ?= $(IMG_REGISTRY)/$(IMG_ORG)/${BASE_IMG}
1616
PKG_IMG ?= $(IMG_REGISTRY)/$(IMG_ORG)/${BASE_PKG_IMG}
1717

18-
SYNCSET_GENERATOR_IMAGE := registry.ci.openshift.org/openshift/release:golang-1.18
18+
SYNCSET_GENERATOR_IMAGE := registry.ci.openshift.org/openshift/release:golang-1.19
1919

2020
BINARY_FILE ?= build/_output/webhooks
2121

@@ -28,9 +28,9 @@ unexport GOFLAGS
2828
GOOS?=linux
2929
GOARCH?=amd64
3030
GOFLAGS_MOD?=-mod=mod
31-
GOENV=GOOS=${GOOS} GOARCH=${GOARCH} CGO_ENABLED=0 GOFLAGS=${GOFLAGS_MOD}
31+
GOENV=GOOS=${GOOS} GOARCH=${GOARCH} CGO_ENABLED=0 GOEXPERIMENT=boringcrypto GOFLAGS=${GOFLAGS_MOD}
3232

33-
GOBUILDFLAGS=-gcflags="all=-trimpath=${GOPATH}" -asmflags="all=-trimpath=${GOPATH}"
33+
GOBUILDFLAGS=-gcflags="all=-trimpath=${GOPATH}" -asmflags="all=-trimpath=${GOPATH}" -tags="fips_enabled"
3434

3535
# do not include this comma-separated list of hooks into the syncset
3636
SELECTOR_SYNC_SET_HOOK_EXCLUDES ?= debug-hook

build/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.18-openshift-4.12 AS builder
1+
FROM registry.ci.openshift.org/openshift/release:golang-1.19 AS builder
22

33
RUN mkdir -p /workdir
44
WORKDIR /workdir

cmd/fips.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
//go:build fips_enabled
2+
// +build fips_enabled
3+
4+
// BOILERPLATE GENERATED -- DO NOT EDIT
5+
// Run 'make ensure-fips' to regenerate
6+
7+
package main
8+
9+
import (
10+
_ "crypto/tls/fipsonly"
11+
"fmt"
12+
)
13+
14+
func init() {
15+
fmt.Println("***** Starting with FIPS crypto enabled *****")
16+
}

0 commit comments

Comments
 (0)