Skip to content

Commit aeac9f2

Browse files
authored
upgrade integration test versions and go 1.24 (#641)
1 parent a40cbc3 commit aeac9f2

File tree

17 files changed

+41
-22
lines changed

17 files changed

+41
-22
lines changed

.github/workflows/e2e-info.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set up Go
1717
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
1818
with:
19-
go-version: 1.22
19+
go-version: '1.24'
2020
- name: make
2121
run: make
2222
- name: Validate JSON

.github/workflows/integration-json.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set up Go
1717
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
1818
with:
19-
go-version: 1.22
19+
go-version: '1.24'
2020
- name: make
2121
run: make
2222
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2

.github/workflows/integration-per-language.yml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
overrideFiles: ./langtest/charts/values.yaml
101101
overrides: |
102102
replicas:2
103-
helm-version: "latest"
103+
helm-version: "v3.19.2"
104104
releaseName: "test-release"
105105
id: bake
106106
- name: Build and Push image
@@ -134,6 +134,13 @@ jobs:
134134
kubectl get po -o json
135135
kubectl get svc -o json
136136
kubectl get deploy -o json
137+
- name: Print Pod Logs
138+
if: always()
139+
run: |
140+
echo "=== Deployment Logs ==="
141+
kubectl logs -l app.kubernetes.io/instance=test-release --all-containers=true --ignore-errors=true || true
142+
echo "=== Pod Descriptions ==="
143+
kubectl describe pods -l app.kubernetes.io/instance=test-release || true
137144
- name: Curl Endpoint
138145
run: |
139146
kubectl get svc
@@ -307,6 +314,13 @@ jobs:
307314
kubectl get po -o json
308315
kubectl get svc -o json
309316
kubectl get deploy -o json
317+
- name: Print Pod Logs
318+
if: always()
319+
run: |
320+
echo "=== Deployment Logs ==="
321+
kubectl logs -l app=testapp --all-containers=true --ignore-errors=true || true
322+
echo "=== Pod Descriptions ==="
323+
kubectl describe pods -l app=testapp || true
310324
- name: Curl Endpoint
311325
run: |
312326
kubectl get svc
@@ -471,6 +485,13 @@ jobs:
471485
kubectl get po -o json
472486
kubectl get svc -o json
473487
kubectl get deploy -o json
488+
- name: Print Pod Logs
489+
if: always()
490+
run: |
491+
echo "=== Deployment Logs ==="
492+
kubectl logs -l app=testapp --all-containers=true --ignore-errors=true || true
493+
echo "=== Pod Descriptions ==="
494+
kubectl describe pods -l app=testapp || true
474495
- name: Curl Endpoint
475496
run: |
476497
kubectl get svc

.github/workflows/integration-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Set up Go
1414
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
1515
with:
16-
go-version: 1.22
16+
go-version: '1.24'
1717
- name: make
1818
run: make
1919
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
@@ -34,7 +34,7 @@ jobs:
3434
- name: Set up Go
3535
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
3636
with:
37-
go-version: 1.22
37+
go-version: '1.24'
3838
- name: make
3939
run: make
4040
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2

.github/workflows/release-and-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- name: Set up Go
3939
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
4040
with:
41-
go-version: 1.22
41+
go-version: '1.24'
4242
# Check if the newest tag already exists
4343
- name: Check if tag exist
4444
uses: mukunku/tag-exists-action@bdad1eaa119ce71b150b952c97351c75025c06a9 # v1.6.0

.github/workflows/unit-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ jobs:
1111
- name: Set up Go
1212
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
1313
with:
14-
go-version: 1.22
14+
go-version: '1.24'
1515
- name: make
1616
run: make run-unit-tests

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.23-alpine
1+
FROM golang:1.24-alpine
22

33
WORKDIR /draft
44

go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/Azure/draft
22

3-
go 1.23.0
4-
5-
toolchain go1.24.1
3+
go 1.24
64

75
require (
86
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0

pkg/fixtures/validatetemplate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func ValidateContentAgainstFixture(generatedContent []byte, fixturePath string)
2020
if normalizeWhitespace(want) != normalizeWhitespace(got) {
2121
if diff := cmp.Diff(string(want), string(got)); diff != "" {
2222
fmt.Println("Diff for file ", fixturePath, " (-want +got)")
23-
fmt.Printf(diff)
23+
fmt.Print(diff)
2424
return fmt.Errorf("generated content does not match fixture for file %s, check above for rich diff", fixturePath)
2525
}
2626

template/dockerfiles/python/draft.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ variables:
1717
type: "string"
1818
kind: "containerImageVersion"
1919
default:
20-
value: "3"
20+
value: "3.13"
2121
description: "the version of python used by the application"
22-
exampleValues: ["3.9", "3.8", "3.7", "3.6"]
22+
exampleValues: ["3.13", "3.12", "3.11", "3.10", "3.9"]
2323
versions: ">=0.0.1"
2424
- name: "ENTRYPOINT"
2525
type: "string"

0 commit comments

Comments
 (0)