Skip to content

Commit 12b3c39

Browse files
committed
chore: downgrade terraform-exec
Signed-off-by: Ricardo Gonçalves <rikardo.goncalves@gmail.com> Signed-off-by: Ricardo Gonçalves <rikardo.miguel@gmail.com>
1 parent 9ee6c74 commit 12b3c39

File tree

5 files changed

+26
-30
lines changed

5 files changed

+26
-30
lines changed

Dockerfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.24 as builder
2+
FROM golang:1.25 as builder
33

44
ARG TARGETARCH
55
ARG BUILD_SHA
@@ -30,9 +30,9 @@ COPY utils/ utils/
3030

3131
# Build
3232
RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
33-
go build -gcflags=all="-N -l" \
34-
-ldflags "-X main.BuildSHA='${BUILD_SHA}' -X main.BuildVersion='${BUILD_VERSION}'" \
35-
-a -o tofu-controller ./cmd/manager
33+
go build -gcflags=all="-N -l" \
34+
-ldflags "-X main.BuildSHA='${BUILD_SHA}' -X main.BuildVersion='${BUILD_VERSION}'" \
35+
-a -o tofu-controller ./cmd/manager
3636

3737
FROM alpine:3.22
3838

@@ -41,12 +41,12 @@ LABEL org.opencontainers.image.source="https://github.com/flux-iac/tofu-controll
4141
ARG LIBCRYPTO_VERSION
4242

4343
RUN apk update && \
44-
apk add --no-cache \
45-
libcrypto3=${LIBCRYPTO_VERSION} \
46-
libssl3=${LIBCRYPTO_VERSION} \
47-
ca-certificates tini git openssh-client gnupg \
48-
libretls \
49-
busybox
44+
apk add --no-cache \
45+
libcrypto3=${LIBCRYPTO_VERSION} \
46+
libssl3=${LIBCRYPTO_VERSION} \
47+
ca-certificates tini git openssh-client gnupg \
48+
libretls \
49+
busybox
5050

5151
COPY --from=builder /workspace/tofu-controller /usr/local/bin/
5252

go.mod

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ require (
2828
github.com/hashicorp/go-cleanhttp v0.5.2
2929
github.com/hashicorp/go-retryablehttp v0.7.8
3030
github.com/hashicorp/hcl2 v0.0.0-20191002203319-fb75b3253c80
31-
github.com/hashicorp/terraform-exec v0.23.0
31+
github.com/hashicorp/terraform-exec v0.16.1
3232
github.com/hashicorp/terraform-json v0.25.0
3333
github.com/jenkins-x/go-scm v1.15.1
3434
github.com/kubescape/go-git-url v0.0.30
@@ -234,9 +234,5 @@ replace (
234234
sigs.k8s.io/kustomize/kyaml => sigs.k8s.io/kustomize/kyaml v0.16.0
235235
)
236236

237-
// Pin terraform-exec to v0.17.3
238-
// breaking changes in terraform-exec v0.18.0 - https://github.com/hashicorp/terraform-exec/blob/main/CHANGELOG.md#0180-february-20-2023
239-
replace github.com/hashicorp/terraform-exec => github.com/hashicorp/terraform-exec v0.17.3
240-
241237
// indirect - breaking changes in v1.0.x
242238
replace github.com/olekukonko/tablewriter => github.com/olekukonko/tablewriter v0.0.5

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,6 @@ github.com/hashicorp/hc-install v0.9.2 h1:v80EtNX4fCVHqzL9Lg/2xkp62bbvQMnvPQ0G+O
290290
github.com/hashicorp/hc-install v0.9.2/go.mod h1:XUqBQNnuT4RsxoxiM9ZaUk0NX8hi2h+Lb6/c0OZnC/I=
291291
github.com/hashicorp/hcl2 v0.0.0-20191002203319-fb75b3253c80 h1:PFfGModn55JA0oBsvFghhj0v93me+Ctr3uHC/UmFAls=
292292
github.com/hashicorp/hcl2 v0.0.0-20191002203319-fb75b3253c80/go.mod h1:Cxv+IJLuBiEhQ7pBYGEuORa0nr4U994pE8mYLuFd7v0=
293-
github.com/hashicorp/terraform-exec v0.17.3 h1:MX14Kvnka/oWGmIkyuyvL6POx25ZmKrjlaclkx3eErU=
294-
github.com/hashicorp/terraform-exec v0.17.3/go.mod h1:+NELG0EqQekJzhvikkeQsOAZpsw0cv/03rbeQJqscAI=
295293
github.com/hashicorp/terraform-json v0.25.0 h1:rmNqc/CIfcWawGiwXmRuiXJKEiJu1ntGoxseG1hLhoQ=
296294
github.com/hashicorp/terraform-json v0.25.0/go.mod h1:sMKS8fiRDX4rVlR6EJUMudg1WcanxCMoWwTLkgZP/vc=
297295
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
@@ -460,6 +458,8 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
460458
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
461459
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
462460
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
461+
github.com/tf-controller/terraform-exec v0.15.1-0.20220809152546-4850a69faedb h1:erdYHB6ginMrQNREnRDkPjjkU7Bb6tm67exkX+0SJsw=
462+
github.com/tf-controller/terraform-exec v0.15.1-0.20220809152546-4850a69faedb/go.mod h1:aj0lVshy8l+MHhFNoijNHtqTJQI3Xlowv5EOsEaGO7M=
463463
github.com/theckman/yacspin v0.13.12 h1:CdZ57+n0U6JMuh2xqjnjRq5Haj6v1ner2djtLQRzJr4=
464464
github.com/theckman/yacspin v0.13.12/go.mod h1:Rd2+oG2LmQi5f3zC3yeZAOl245z8QOvrH4OPOJNZxLg=
465465
github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=

planner.Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.24 as builder
2+
FROM golang:1.25 as builder
33

44
ARG TARGETARCH
55
ARG BUILD_SHA
@@ -28,12 +28,12 @@ COPY internal internal
2828

2929
# Build
3030
RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
31-
go build \
32-
-gcflags=all="-N -l" \
33-
-ldflags "-X main.BuildSHA=${BUILD_SHA} -X main.BuildVersion=${BUILD_VERSION}" \
34-
-a \
35-
-o branch-planner \
36-
./cmd/branch-planner
31+
go build \
32+
-gcflags=all="-N -l" \
33+
-ldflags "-X main.BuildSHA=${BUILD_SHA} -X main.BuildVersion=${BUILD_VERSION}" \
34+
-a \
35+
-o branch-planner \
36+
./cmd/branch-planner
3737

3838
FROM alpine:3.22
3939

runner-base.Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.24 as builder
2+
FROM golang:1.25 as builder
33

44
ARG TARGETARCH
55
ARG BUILD_SHA
@@ -32,11 +32,11 @@ COPY utils/ utils/
3232
# Build
3333
RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
3434
go build \
35-
-gcflags=all="-N -l" \
36-
-ldflags "-X main.BuildSHA=${BUILD_SHA} -X main.BuildVersion=${BUILD_VERSION}" \
37-
-a \
38-
-o tf-runner \
39-
./cmd/runner/main.go
35+
-gcflags=all="-N -l" \
36+
-ldflags "-X main.BuildSHA=${BUILD_SHA} -X main.BuildVersion=${BUILD_VERSION}" \
37+
-a \
38+
-o tf-runner \
39+
./cmd/runner/main.go
4040

4141
FROM alpine:3.22
4242

0 commit comments

Comments
 (0)