Skip to content

Commit ce0d26e

Browse files
baijumclaude
andcommitted
Prepare for Red Hat release: update OWNERS, FIPS flags, Go 1.26
- Update OWNERS to current team members (baijum, martinszuc) - Add FIPS 140-3 support: TAGS=no_openssl, GODEBUG=fips140=auto on build-cross targets - Update go.mod to go 1.26 - Remove obsolete GO111MODULE=on prefixes Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent fa38452 commit ce0d26e

3 files changed

Lines changed: 16 additions & 20 deletions

File tree

Makefile

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ACCEPTANCE_RUN_TESTS=.
1919

2020
# go option
2121
PKG := ./...
22-
TAGS :=
22+
TAGS := no_openssl
2323
TESTS := .
2424
TESTFLAGS :=
2525
LDFLAGS := -w -s
@@ -78,7 +78,7 @@ all: build
7878
build: $(BINDIR)/$(BINNAME)
7979

8080
$(BINDIR)/$(BINNAME): $(SRC)
81-
GO111MODULE=on CGO_ENABLED=$(CGO_ENABLED) go build $(GOFLAGS) -trimpath -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -o '$(BINDIR)'/$(BINNAME) ./cmd/helm
81+
CGO_ENABLED=$(CGO_ENABLED) go build $(GOFLAGS) -trimpath -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -o '$(BINDIR)'/$(BINNAME) ./cmd/helm
8282

8383
# ------------------------------------------------------------------------------
8484
# install
@@ -104,7 +104,7 @@ test: test-unit
104104
test-unit:
105105
@echo
106106
@echo "==> Running unit tests <=="
107-
GO111MODULE=on go test $(GOFLAGS) -run $(TESTS) $(PKG) $(TESTFLAGS)
107+
go test $(GOFLAGS) -run $(TESTS) $(PKG) $(TESTFLAGS)
108108

109109
.PHONY: test-coverage
110110
test-coverage:
@@ -142,7 +142,7 @@ coverage:
142142

143143
.PHONY: format
144144
format: $(GOIMPORTS)
145-
GO111MODULE=on go list -f '{{.Dir}}' ./... | xargs $(GOIMPORTS) -w -local helm.sh/helm
145+
go list -f '{{.Dir}}' ./... | xargs $(GOIMPORTS) -w -local helm.sh/helm
146146

147147
# Generate golden files used in unit tests
148148
.PHONY: gen-test-golden
@@ -159,24 +159,24 @@ gen-test-golden: test-unit
159159
# without a go.mod file when downloading the following dependencies
160160

161161
$(GOX):
162-
(cd /; GO111MODULE=on go install github.com/mitchellh/gox@v1.0.2-0.20220701044238-9f712387e2d2)
162+
(cd /; go install github.com/mitchellh/gox@v1.0.2-0.20220701044238-9f712387e2d2)
163163

164164
$(GOIMPORTS):
165-
(cd /; GO111MODULE=on go install golang.org/x/tools/cmd/goimports@latest)
165+
(cd /; go install golang.org/x/tools/cmd/goimports@latest)
166166

167167
# ------------------------------------------------------------------------------
168168
# release
169169

170170
.PHONY: build-cross
171171
build-cross: LDFLAGS += -extldflags "-static"
172172
build-cross:
173-
GO111MODULE=on CGO_ENABLED=0 GOARCH=amd64 GOOS=linux go build -o "_dist/linux-amd64/$(BINNAME)" $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' ./cmd/helm
174-
GO111MODULE=on CGO_ENABLED=0 GOARCH=amd64 GOOS=darwin go build -o "_dist/darwin-amd64/$(BINNAME)" $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' ./cmd/helm
175-
GO111MODULE=on CGO_ENABLED=0 GOARCH=arm64 GOOS=darwin go build -o "_dist/darwin-arm64/$(BINNAME)" $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' ./cmd/helm
176-
GO111MODULE=on CGO_ENABLED=0 GOARCH=amd64 GOOS=windows go build -o "_dist/windows-amd64/$(BINNAME).exe" $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' ./cmd/helm
177-
GO111MODULE=on CGO_ENABLED=0 GOARCH=arm64 GOOS=linux go build -o "_dist/linux-arm64/$(BINNAME)" $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' ./cmd/helm
178-
GO111MODULE=on CGO_ENABLED=0 GOARCH=ppc64le GOOS=linux go build -o "_dist/linux-ppc64le/$(BINNAME)" $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' ./cmd/helm
179-
GO111MODULE=on CGO_ENABLED=0 GOARCH=s390x GOOS=linux go build -o "_dist/linux-s390x/$(BINNAME)" $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' ./cmd/helm
173+
GODEBUG=fips140=auto CGO_ENABLED=0 GOARCH=amd64 GOOS=linux go build -o "_dist/linux-amd64/$(BINNAME)" $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' ./cmd/helm
174+
GODEBUG=fips140=auto CGO_ENABLED=0 GOARCH=amd64 GOOS=darwin go build -o "_dist/darwin-amd64/$(BINNAME)" $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' ./cmd/helm
175+
GODEBUG=fips140=auto CGO_ENABLED=0 GOARCH=arm64 GOOS=darwin go build -o "_dist/darwin-arm64/$(BINNAME)" $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' ./cmd/helm
176+
GODEBUG=fips140=auto CGO_ENABLED=0 GOARCH=amd64 GOOS=windows go build -o "_dist/windows-amd64/$(BINNAME).exe" $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' ./cmd/helm
177+
GODEBUG=fips140=auto CGO_ENABLED=0 GOARCH=arm64 GOOS=linux go build -o "_dist/linux-arm64/$(BINNAME)" $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' ./cmd/helm
178+
GODEBUG=fips140=auto CGO_ENABLED=0 GOARCH=ppc64le GOOS=linux go build -o "_dist/linux-ppc64le/$(BINNAME)" $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' ./cmd/helm
179+
GODEBUG=fips140=auto CGO_ENABLED=0 GOARCH=s390x GOOS=linux go build -o "_dist/linux-s390x/$(BINNAME)" $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' ./cmd/helm
180180

181181
.PHONY: dist
182182
dist:

OWNERS

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@
22

33
approvers:
44
- baijum
5-
- kpiwko
6-
- webbnh
5+
- martinszuc
76

87
reviewers:
98
- baijum
10-
- kpiwko
11-
- webbnh
12-
- SecKatie
13-
- tisutisu
9+
- martinszuc

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module helm.sh/helm/v3
22

3-
go 1.22.0
3+
go 1.26
44

55
require (
66
github.com/BurntSushi/toml v1.3.2

0 commit comments

Comments
 (0)