From 7168dd32721792c477fcbfcb1ff3363fd860a5ad Mon Sep 17 00:00:00 2001 From: Ivy Gooch Date: Wed, 20 Nov 2024 10:45:05 -0800 Subject: [PATCH] Bumps versions --- cloudbuild.yaml | 3 ++- test/sdk/go/Makefile | 2 +- test/upgrade/Dockerfile | 2 +- test/upgrade/Makefile | 2 +- test/upgrade/main.go | 2 +- test/upgrade/versionMap.yaml | 33 ++++++++------------------------- 6 files changed, 14 insertions(+), 30 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 7748355d12..2151964d21 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -298,7 +298,7 @@ steps: trap 'rm -rf -- "$tmpdir"' EXIT SIGTERM # Update image tags to include the current build version. - DevVersion="1.45.0-dev-$(git rev-parse --short=7 HEAD)" + DevVersion="${_BASE_VERSION}-dev-$(git rev-parse --short=7 HEAD)" export DevVersion sed "s/\${DevVersion}/${DevVersion}/" upgradeTest.yaml > "${tmpdir}"/upgradeTest.yaml sed "s/\${DevVersion}/${DevVersion}/" versionMap.yaml > "${tmpdir}"/versionMap.yaml @@ -553,6 +553,7 @@ steps: done substitutions: + _BASE_VERSION: 1.46.0 _CACHE_BUCKET: agones-build-cache _HTMLTEST_CACHE_KEY: htmltest-0.10.1 _CPP_SDK_BUILD_CACHE_KEY: cpp-sdk-build diff --git a/test/sdk/go/Makefile b/test/sdk/go/Makefile index 45b8d7726a..86ba5dba7b 100644 --- a/test/sdk/go/Makefile +++ b/test/sdk/go/Makefile @@ -29,7 +29,7 @@ project_path := $(dir $(mkfile_path)) root_path = $(realpath $(project_path)/) # Because go mod init in the Dockerfile installs the most recently released version of Agones, this # will need to be built and pushed post-release. During DEV it will be built at DEV - 1. -release_version = 1.44.0 +release_version = 1.45.0 server_tag := $(REGISTRY)/sdk-client-test:$(release_version) # _____ _ diff --git a/test/upgrade/Dockerfile b/test/upgrade/Dockerfile index d62c84dee7..5a18afeeac 100644 --- a/test/upgrade/Dockerfile +++ b/test/upgrade/Dockerfile @@ -27,7 +27,7 @@ RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v${KUBECT mv ./kubectl /usr/local/bin/kubectl # install Helm package manager -ENV HELM_VER=3.14.3 +ENV HELM_VER=3.16.3 ENV HELM_URL=https://get.helm.sh/helm-v${HELM_VER}-linux-amd64.tar.gz RUN curl -L ${HELM_URL} > /tmp/helm.tar.gz \ && tar -zxvf /tmp/helm.tar.gz -C /tmp \ diff --git a/test/upgrade/Makefile b/test/upgrade/Makefile index 538ed501ee..0c09e69095 100644 --- a/test/upgrade/Makefile +++ b/test/upgrade/Makefile @@ -27,7 +27,7 @@ REGISTRY ?= mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST))) project_path := $(dir $(mkfile_path)) root_path = $(realpath $(project_path)/) -base_version = 1.45.0 +base_version = 1.46.0 # Version defaults to the short hash of the latest commit VERSION ?= $(base_version)-dev-$(shell git rev-parse --short=7 HEAD) server_tag := $(REGISTRY)/upgrade-test-controller:$(VERSION) diff --git a/test/upgrade/main.go b/test/upgrade/main.go index ab2b87b1c4..07d2d86134 100644 --- a/test/upgrade/main.go +++ b/test/upgrade/main.go @@ -150,7 +150,7 @@ func configTestSetup(ctx context.Context, kubeClient *kubernetes.Clientset) []*c // Get the mappings of valid Kubernetes, Agones, and Feature Gate versions from the configmap. err := json.Unmarshal([]byte(VersionMappings), &versionMap) if err != nil { - log.Fatal("Could not Unmarshal", err) + log.Fatal("Could not Unmarshal ", err) } // Find valid Agones versions and feature gates for the current version of Kubernetes. diff --git a/test/upgrade/versionMap.yaml b/test/upgrade/versionMap.yaml index 63f1b56bde..7c8a1724cd 100644 --- a/test/upgrade/versionMap.yaml +++ b/test/upgrade/versionMap.yaml @@ -19,7 +19,7 @@ metadata: name: version-map data: DevVersion: ${DevVersion} - ReleaseVersion: "1.44.0" + ReleaseVersion: "1.45.0" version-mappings.json: | { "k8sToAgonesVersions": { @@ -29,43 +29,22 @@ data: "1.42.0", "1.43.0", "1.44.0", + "1.45.0", "Dev" ], "1.30": [ "1.43.0", "1.44.0", + "1.45.0", "Dev" ], "1.31": [ "1.44.0", + "1.45.0", "Dev" ] }, "agonesVersionFeatureGates": { - "1.34.0": { - "alphaGates": ["PlayerAllocationFilter", "PlayerTracking"], - "betaGates": [] - }, - "1.35.0": { - "alphaGates": ["PlayerAllocationFilter", "PlayerTracking"], - "betaGates": [] - }, - "1.36.0": { - "alphaGates": ["PlayerAllocationFilter", "PlayerTracking"], - "betaGates": [] - }, - "1.37.0": { - "alphaGates": ["CountsAndLists", "DisableResyncOnSDKServer", "GKEAutopilotExtendedDurationPods", "PlayerAllocationFilter", "PlayerTracking"], - "betaGates": [] - }, - "1.38.0": { - "alphaGates": ["CountsAndLists", "DisableResyncOnSDKServer", "GKEAutopilotExtendedDurationPods", "PlayerAllocationFilter", "PlayerTracking"], - "betaGates": [] - }, - "1.39.0": { - "alphaGates": ["CountsAndLists", "DisableResyncOnSDKServer", "GKEAutopilotExtendedDurationPods", "PlayerAllocationFilter", "PlayerTracking"], - "betaGates": [] - }, "1.40.0": { "alphaGates": ["CountsAndLists", "GKEAutopilotExtendedDurationPods", "PlayerAllocationFilter", "PlayerTracking"], "betaGates": ["DisableResyncOnSDKServer"] @@ -86,6 +65,10 @@ data: "alphaGates": ["PlayerAllocationFilter", "PlayerTracking", "PortPolicyNone", "PortRanges", "RollingUpdateFix", "ScheduledAutoscaler"], "betaGates": ["AutopilotPassthroughPort", "CountsAndLists", "DisableResyncOnSDKServer", "GKEAutopilotExtendedDurationPods"] }, + "1.45.0": { + "alphaGates": ["PlayerAllocationFilter", "PlayerTracking", "PortPolicyNone", "PortRanges", "RollingUpdateFix", "ScheduledAutoscaler"], + "betaGates": ["AutopilotPassthroughPort", "CountsAndLists", "DisableResyncOnSDKServer", "GKEAutopilotExtendedDurationPods"] + }, "Dev": { "alphaGates": ["PlayerAllocationFilter", "PlayerTracking", "PortPolicyNone", "PortRanges", "RollingUpdateFix", "ScheduledAutoscaler"], "betaGates": ["AutopilotPassthroughPort", "CountsAndLists", "DisableResyncOnSDKServer", "GKEAutopilotExtendedDurationPods"]