diff --git a/.github/workflows/e2e-info.yml b/.github/workflows/e2e-info.yml index f645f39b2..dc754c46e 100644 --- a/.github/workflows/e2e-info.yml +++ b/.github/workflows/e2e-info.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Go uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: - go-version: 1.22 + go-version: '1.24' - name: make run: make - name: Validate JSON diff --git a/.github/workflows/integration-json.yml b/.github/workflows/integration-json.yml index 3cd233275..2dd54e759 100644 --- a/.github/workflows/integration-json.yml +++ b/.github/workflows/integration-json.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Go uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: - go-version: 1.22 + go-version: '1.24' - name: make run: make - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 diff --git a/.github/workflows/integration-per-language.yml b/.github/workflows/integration-per-language.yml index 0c9545c0c..6141bb3a5 100644 --- a/.github/workflows/integration-per-language.yml +++ b/.github/workflows/integration-per-language.yml @@ -100,7 +100,7 @@ jobs: overrideFiles: ./langtest/charts/values.yaml overrides: | replicas:2 - helm-version: "latest" + helm-version: "v3.19.2" releaseName: "test-release" id: bake - name: Build and Push image @@ -134,6 +134,13 @@ jobs: kubectl get po -o json kubectl get svc -o json kubectl get deploy -o json + - name: Print Pod Logs + if: always() + run: | + echo "=== Deployment Logs ===" + kubectl logs -l app.kubernetes.io/instance=test-release --all-containers=true --ignore-errors=true || true + echo "=== Pod Descriptions ===" + kubectl describe pods -l app.kubernetes.io/instance=test-release || true - name: Curl Endpoint run: | kubectl get svc @@ -307,6 +314,13 @@ jobs: kubectl get po -o json kubectl get svc -o json kubectl get deploy -o json + - name: Print Pod Logs + if: always() + run: | + echo "=== Deployment Logs ===" + kubectl logs -l app=testapp --all-containers=true --ignore-errors=true || true + echo "=== Pod Descriptions ===" + kubectl describe pods -l app=testapp || true - name: Curl Endpoint run: | kubectl get svc @@ -471,6 +485,13 @@ jobs: kubectl get po -o json kubectl get svc -o json kubectl get deploy -o json + - name: Print Pod Logs + if: always() + run: | + echo "=== Deployment Logs ===" + kubectl logs -l app=testapp --all-containers=true --ignore-errors=true || true + echo "=== Pod Descriptions ===" + kubectl describe pods -l app=testapp || true - name: Curl Endpoint run: | kubectl get svc diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 8c2c1c7d3..fe8475b71 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -13,7 +13,7 @@ jobs: - name: Set up Go uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: - go-version: 1.22 + go-version: '1.24' - name: make run: make - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 @@ -34,7 +34,7 @@ jobs: - name: Set up Go uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: - go-version: 1.22 + go-version: '1.24' - name: make run: make - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 diff --git a/.github/workflows/release-and-publish.yml b/.github/workflows/release-and-publish.yml index 770131169..3893c8fba 100644 --- a/.github/workflows/release-and-publish.yml +++ b/.github/workflows/release-and-publish.yml @@ -38,7 +38,7 @@ jobs: - name: Set up Go uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: - go-version: 1.22 + go-version: '1.24' # Check if the newest tag already exists - name: Check if tag exist uses: mukunku/tag-exists-action@bdad1eaa119ce71b150b952c97351c75025c06a9 # v1.6.0 diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index e75fd3e9a..7d0bfaf3e 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -11,6 +11,6 @@ jobs: - name: Set up Go uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: - go-version: 1.22 + go-version: '1.24' - name: make run: make run-unit-tests diff --git a/Dockerfile b/Dockerfile index f77ed1f3e..d9b6af000 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23-alpine +FROM golang:1.24-alpine WORKDIR /draft diff --git a/go.mod b/go.mod index 8eaa23ee4..18eb0d79b 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/Azure/draft -go 1.23.0 - -toolchain go1.24.1 +go 1.24 require ( github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0 diff --git a/pkg/fixtures/validatetemplate.go b/pkg/fixtures/validatetemplate.go index ab10b189f..88808a227 100644 --- a/pkg/fixtures/validatetemplate.go +++ b/pkg/fixtures/validatetemplate.go @@ -20,7 +20,7 @@ func ValidateContentAgainstFixture(generatedContent []byte, fixturePath string) if normalizeWhitespace(want) != normalizeWhitespace(got) { if diff := cmp.Diff(string(want), string(got)); diff != "" { fmt.Println("Diff for file ", fixturePath, " (-want +got)") - fmt.Printf(diff) + fmt.Print(diff) return fmt.Errorf("generated content does not match fixture for file %s, check above for rich diff", fixturePath) } diff --git a/template/dockerfiles/python/draft.yaml b/template/dockerfiles/python/draft.yaml index 178fceffa..7e13d386d 100644 --- a/template/dockerfiles/python/draft.yaml +++ b/template/dockerfiles/python/draft.yaml @@ -17,9 +17,9 @@ variables: type: "string" kind: "containerImageVersion" default: - value: "3" + value: "3.13" description: "the version of python used by the application" - exampleValues: ["3.9", "3.8", "3.7", "3.6"] + exampleValues: ["3.13", "3.12", "3.11", "3.10", "3.9"] versions: ">=0.0.1" - name: "ENTRYPOINT" type: "string" diff --git a/template/dockerfiles/rust/draft.yaml b/template/dockerfiles/rust/draft.yaml index 912c492b5..1c9e491b0 100644 --- a/template/dockerfiles/rust/draft.yaml +++ b/template/dockerfiles/rust/draft.yaml @@ -17,9 +17,9 @@ variables: type: "string" kind: "containerImageVersion" default: - value: "1.82.0" + value: "1.83.0" description: "the version of rust used by the application" - exampleValues: ["1.70.0", "1.65.0", "1.60", "1.54", "1.53"] + exampleValues: ["1.83.0", "1.82.0", "1.70.0", "1.65.0", "1.60"] versions: ">=0.0.1" - name: "DOCKERFILENAME" type: "string" diff --git a/test/integration/python/helm.yaml b/test/integration/python/helm.yaml index 544ec8d75..252f3a0af 100644 --- a/test/integration/python/helm.yaml +++ b/test/integration/python/helm.yaml @@ -12,7 +12,7 @@ deployVariables: value: "host.minikube.internal:5001/testapp" languageVariables: - name: "VERSION" - value: "3" + value: "3.13" - name: "BUILDERVERSION" value: "null" - name: "PORT" diff --git a/test/integration/python/kustomize.yaml b/test/integration/python/kustomize.yaml index a4c5afbd2..83dcbb4d8 100644 --- a/test/integration/python/kustomize.yaml +++ b/test/integration/python/kustomize.yaml @@ -12,7 +12,7 @@ deployVariables: value: "host.minikube.internal:5001/testapp" languageVariables: - name: "VERSION" - value: "3" + value: "3.13" - name: "BUILDERVERSION" value: "null" - name: "PORT" diff --git a/test/integration/python/manifest.yaml b/test/integration/python/manifest.yaml index 430888033..65fd3b016 100644 --- a/test/integration/python/manifest.yaml +++ b/test/integration/python/manifest.yaml @@ -12,7 +12,7 @@ deployVariables: value: "host.minikube.internal:5001/testapp" languageVariables: - name: "VERSION" - value: "3" + value: "3.13" - name: "BUILDERVERSION" value: "null" - name: "PORT" diff --git a/test/integration/rust/helm.yaml b/test/integration/rust/helm.yaml index 41feec586..18a2bffcd 100644 --- a/test/integration/rust/helm.yaml +++ b/test/integration/rust/helm.yaml @@ -12,7 +12,7 @@ deployVariables: value: "host.minikube.internal:5001/testapp" languageVariables: - name: "VERSION" - value: "1.82.0" + value: "1.83.0" - name: "BUILDERVERSION" value: "null" - name: "PORT" diff --git a/test/integration/rust/kustomize.yaml b/test/integration/rust/kustomize.yaml index a2fa38648..8bd61b09c 100644 --- a/test/integration/rust/kustomize.yaml +++ b/test/integration/rust/kustomize.yaml @@ -12,7 +12,7 @@ deployVariables: value: "host.minikube.internal:5001/testapp" languageVariables: - name: "VERSION" - value: "1.82.0" + value: "1.83.0" - name: "BUILDERVERSION" value: "null" - name: "PORT" diff --git a/test/integration/rust/manifest.yaml b/test/integration/rust/manifest.yaml index 05c186cc8..4f3dae2c3 100644 --- a/test/integration/rust/manifest.yaml +++ b/test/integration/rust/manifest.yaml @@ -12,7 +12,7 @@ deployVariables: value: "host.minikube.internal:5001/testapp" languageVariables: - name: "VERSION" - value: "1.82.0" + value: "1.83.0" - name: "BUILDERVERSION" value: "null" - name: "PORT"