Skip to content

Commit 174f329

Browse files
authored
Merge pull request #7221 from oscr/fix-tiltfile
🌱 Update Tiltfile kubectl version (v1.23.3 -> v1.25.0)
2 parents a86df71 + 4696ff3 commit 174f329

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

Tiltfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
envsubst_cmd = "./hack/tools/bin/envsubst"
44
clusterctl_cmd = "./bin/clusterctl"
55
kubectl_cmd = "kubectl"
6+
kubernetes_version = "v1.25.0"
67

78
if str(local("command -v " + kubectl_cmd + " || true", quiet = True)) == "":
89
fail("Required command '" + kubectl_cmd + "' not found in PATH")
@@ -103,8 +104,9 @@ providers = {
103104
"internal",
104105
"third_party",
105106
],
106-
"additional_docker_helper_commands": "RUN curl -LO https://dl.k8s.io/release/v1.23.3/bin/linux/{ARCH}/kubectl && chmod +x ./kubectl && mv ./kubectl /usr/bin/kubectl".format(
107+
"additional_docker_helper_commands": "RUN curl -LO https://dl.k8s.io/release/{KUBE}/bin/linux/{ARCH}/kubectl && chmod +x ./kubectl && mv ./kubectl /usr/bin/kubectl".format(
107108
ARCH = os_arch,
109+
KUBE = kubernetes_version,
108110
),
109111
"additional_docker_build_commands": """
110112
COPY --from=tilt-helper /usr/bin/kubectl /usr/bin/kubectl
@@ -506,7 +508,7 @@ def cluster_templates():
506508

507509
# Ensure we have default values for a small set of well-known variables
508510
substitutions["NAMESPACE"] = substitutions.get("NAMESPACE", "default")
509-
substitutions["KUBERNETES_VERSION"] = substitutions.get("KUBERNETES_VERSION", "v1.25.0")
511+
substitutions["KUBERNETES_VERSION"] = substitutions.get("KUBERNETES_VERSION", kubernetes_version)
510512
substitutions["CONTROL_PLANE_MACHINE_COUNT"] = substitutions.get("CONTROL_PLANE_MACHINE_COUNT", "1")
511513
substitutions["WORKER_MACHINE_COUNT"] = substitutions.get("WORKER_MACHINE_COUNT", "3")
512514

0 commit comments

Comments
 (0)