Bump Go to 1.18.3 for Tiltfile, Container Images, Netlify, GH Action workflows

Also, updates the book.

Signed-off-by: Nabarun Pal <[email protected]>

Author: palnabarun

.github/workflows/dependabot.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v3
       with:
-        go-version: '1.17'
+        go-version: '1.18'
       id: go
     - name: Check out code into the Go module directory
       uses: actions/checkout@v3

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Install go
         uses: actions/setup-go@v3
         with:
-          go-version: '^1.17'
+          go-version: '^1.18'
       - name: generate release artifacts
         run: |
           make release

Makefile

@@ -23,7 +23,7 @@ SHELL:=/usr/bin/env bash
 #
 # Go.
 #
-GO_VERSION ?= 1.17.3
+GO_VERSION ?= 1.18.3
 GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION)
 
 # Use GOPROXY environment variable if set

Tiltfile

@@ -13,7 +13,9 @@ settings = {
 }
 
 # global settings
-tilt_file = "./tilt-settings.yaml" if os.path.exists("./tilt-settings.yaml") else "./tilt-settings.json"
+tilt_file = "./tilt-settings.yaml" if os.path.exists(
+    "./tilt-settings.yaml",
+) else "./tilt-settings.json"
 settings.update(read_yaml(
     tilt_file,
     default = {},
@@ -119,21 +121,27 @@ COPY --from=tilt-helper /usr/bin/kubectl /usr/bin/kubectl
 #         ]
 #     }
 # }
+
 def load_provider_tiltfiles():
     provider_repos = settings.get("provider_repos", [])
 
     for repo in provider_repos:
-        file = repo + "/tilt-provider.yaml" if os.path.exists(repo + "/tilt-provider.yaml") else repo + "/tilt-provider.json"
+        file = repo + "/tilt-provider.yaml" if os.path.exists(
+            repo + "/tilt-provider.yaml",
+        ) else repo + "/tilt-provider.json"
         if not os.path.exists(file):
-            fail("Failed to load provider. No tilt-provider.{yaml|json} file found in " + repo)
+            fail(
+                "Failed to load provider. No tilt-provider.{yaml|json} file found in " + repo,
+            )
         provider_details = read_yaml(file, default = {})
         if type(provider_details) != type([]):
             provider_details = [provider_details]
         for item in provider_details:
             provider_name = item["name"]
             provider_config = item["config"]
             if "context" in provider_config:
-                provider_config["context"] = repo + "/" + provider_config["context"]
+                provider_config["context"] = repo + \
+                                             "/" + provider_config["context"]
             else:
                 provider_config["context"] = repo
             if "kustomize_config" not in provider_config:
@@ -144,7 +152,7 @@ def load_provider_tiltfiles():
 
 tilt_helper_dockerfile_header = """
 # Tilt image
-FROM golang:1.17.3 as tilt-helper
+FROM golang:1.18.3 as tilt-helper
 # Support live reloading with Tilt
 RUN go get github.com/go-delve/delve/cmd/dlv
 RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/restart.sh  && \
@@ -166,6 +174,7 @@ COPY manager .
 # 1. Enables a local_resource go build of the provider's manager binary
 # 2. Configures a docker build for the provider, with live updating of the manager binary
 # 3. Runs kustomize for the provider's config/default and applies it
+
 def enable_provider(name, debug):
     p = providers.get(name)
     context = p.get("context")
@@ -224,8 +233,14 @@ def enable_provider(name, debug):
         labels = [label, "ALL.binaries"],
     )
 
-    additional_docker_helper_commands = p.get("additional_docker_helper_commands", "")
-    additional_docker_build_commands = p.get("additional_docker_build_commands", "")
+    additional_docker_helper_commands = p.get(
+        "additional_docker_helper_commands",
+        "",
+    )
+    additional_docker_build_commands = p.get(
+        "additional_docker_build_commands",
+        "",
+    )
 
     dockerfile_contents = "\n".join([
         tilt_helper_dockerfile_header,
@@ -244,11 +259,13 @@ def enable_provider(name, debug):
     profiler_port = int(debug.get("profiler_port", 0))
     if metrics_port != 0:
         port_forwards.append(port_forward(metrics_port, 8080))
-        links.append(link("http://localhost:" + str(metrics_port) + "/metrics", "metrics"))
+        links.append(link("http://localhost:" +
+                          str(metrics_port) + "/metrics", "metrics"))
 
     if profiler_port != 0:
         port_forwards.append(port_forward(profiler_port, 6060))
-        links.append(link("http://localhost:" + str(profiler_port) + "/debug/pprof", "profiler"))
+        links.append(link("http://localhost:" +
+                          str(profiler_port) + "/debug/pprof", "profiler"))
 
     # Set up an image build for the provider. The live update configuration syncs the output from the local_resource
     # build into the container.
@@ -292,12 +309,14 @@ def find_object_qualified_name(objs, kind):
 
 # Users may define their own Tilt customizations in tilt.d. This directory is excluded from git and these files will
 # not be checked in to version control.
+
 def include_user_tilt_files():
     user_tiltfiles = listdir("tilt.d")
     for f in user_tiltfiles:
         include(f)
 
 # Enable core cluster-api plus everything listed in 'enable_providers' in tilt-settings.json
+
 def enable_providers():
     for name in get_providers():
         enable_provider(name, settings.get("debug").get(name, {}))
@@ -311,46 +330,79 @@ def deploy_provider_crds():
     # it is required to control precedence between creating this CRDs and creating providers.
     k8s_yaml(read_file("./.tiltbuild/yaml/clusterctl.crd.yaml"))
     k8s_resource(
-        objects = ["providers.clusterctl.cluster.x-k8s.io:CustomResourceDefinition:default"],
+        objects = [
+            "providers.clusterctl.cluster.x-k8s.io:CustomResourceDefinition:default",
+        ],
         new_name = "provider_crd",
     )
 
 def deploy_observability():
     if "promtail" in settings.get("deploy_observability", []):
-        k8s_yaml(read_file("./.tiltbuild/yaml/promtail.observability.yaml"), allow_duplicates = True)
-        k8s_resource(workload = "promtail", extra_pod_selectors = [{"app": "promtail"}], labels = ["observability"], resource_deps = ["loki"])
+        k8s_yaml(read_file(
+            "./.tiltbuild/yaml/promtail.observability.yaml",
+        ), allow_duplicates = True)
+        k8s_resource(workload = "promtail", extra_pod_selectors = [
+            {"app": "promtail"},
+        ], labels = ["observability"], resource_deps = ["loki"])
 
     if "loki" in settings.get("deploy_observability", []):
-        k8s_yaml(read_file("./.tiltbuild/yaml/loki.observability.yaml"), allow_duplicates = True)
-        k8s_resource(workload = "loki", port_forwards = "3100", extra_pod_selectors = [{"app": "loki"}], labels = ["observability"])
+        k8s_yaml(
+            read_file("./.tiltbuild/yaml/loki.observability.yaml"),
+            allow_duplicates = True,
+        )
+        k8s_resource(workload = "loki", port_forwards = "3100", extra_pod_selectors = [
+            {"app": "loki"},
+        ], labels = ["observability"])
 
         cmd_button(
             "loki:import logs",
-            argv = ["sh", "-c", "cd ./hack/tools/log-push && go run ./main.go --log-path=$LOG_PATH"],
+            argv = [
+                "sh",
+                "-c",
+                "cd ./hack/tools/log-push && go run ./main.go --log-path=$LOG_PATH",
+            ],
             resource = "loki",
             icon_name = "import_export",
             text = "Import logs",
             inputs = [
-                text_input("LOG_PATH", label = "Log path, one of: GCS path, ProwJob URL or local folder"),
+                text_input(
+                    "LOG_PATH",
+                    label = "Log path, one of: GCS path, ProwJob URL or local folder",
+                ),
             ],
         )
 
     if "grafana" in settings.get("deploy_observability", []):
-        k8s_yaml(read_file("./.tiltbuild/yaml/grafana.observability.yaml"), allow_duplicates = True)
-        k8s_resource(workload = "grafana", port_forwards = "3001:3000", extra_pod_selectors = [{"app": "grafana"}], labels = ["observability"])
+        k8s_yaml(read_file(
+            "./.tiltbuild/yaml/grafana.observability.yaml",
+        ), allow_duplicates = True)
+        k8s_resource(workload = "grafana", port_forwards = "3001:3000", extra_pod_selectors = [
+            {"app": "grafana"},
+        ], labels = ["observability"])
 
     if "prometheus" in settings.get("deploy_observability", []):
-        k8s_yaml(read_file("./.tiltbuild/yaml/prometheus.observability.yaml"), allow_duplicates = True)
-        k8s_resource(workload = "prometheus-server", new_name = "prometheus", port_forwards = "9090", extra_pod_selectors = [{"app": "prometheus"}], labels = ["observability"])
+        k8s_yaml(read_file(
+            "./.tiltbuild/yaml/prometheus.observability.yaml",
+        ), allow_duplicates = True)
+        k8s_resource(
+            workload = "prometheus-server",
+            new_name = "prometheus",
+            port_forwards = "9090",
+            extra_pod_selectors = [{"app": "prometheus"}],
+            labels = ["observability"],
+        )
 
 def prepare_all():
     allow_k8s_arg = ""
     if settings.get("allowed_contexts"):
         if type(settings.get("allowed_contexts")) == "string":
-            allow_k8s_arg = "--allow-k8s-contexts={} ".format(settings.get("allowed_contexts"))
+            allow_k8s_arg = "--allow-k8s-contexts={} ".format(
+                settings.get("allowed_contexts"),
+            )
         if type(settings.get("allowed_contexts")) == "list":
             for context in settings.get("allowed_contexts"):
-                allow_k8s_arg = allow_k8s_arg + "--allow-k8s-contexts={} ".format(context)
+                allow_k8s_arg = allow_k8s_arg + \
+                                "--allow-k8s-contexts={} ".format(context)
 
     tools_arg = "--tools kustomize,envsubst "
     cert_manager_arg = ""
@@ -361,7 +413,10 @@ def prepare_all():
     # a dependency between these resources and provider resources.
     kustomize_build_arg = "--kustomize-builds clusterctl.crd:./cmd/clusterctl/config/crd/ "
     for tool in settings.get("deploy_observability", []):
-        kustomize_build_arg = kustomize_build_arg + "--kustomize-builds {tool}.observability:./hack/observability/{tool}/ ".format(tool = tool)
+        kustomize_build_arg = kustomize_build_arg + \
+                              "--kustomize-builds {tool}.observability:./hack/observability/{tool}/ ".format(
+                                  tool = tool,
+                              )
     providers_arg = ""
     for name in get_providers():
         p = providers.get(name)

docs/book/src/developer/providers/v1.1-to-v1.2.md

@@ -9,7 +9,7 @@ maintainers of providers and consumers of our Go API.
 
 ## Minimum Go version
 
-* The Go version used by Cluster API is now Go 1.17.x
+* The Go version used by Cluster API is now Go 1.18.x
 
 ## Dependencies
 

hack/ensure-go.sh

@@ -31,7 +31,7 @@ EOF
   local go_version
   IFS=" " read -ra go_version <<< "$(go version)"
   local minimum_go_version
-  minimum_go_version=go1.16.0
+  minimum_go_version=go1.18.3
   if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then
     cat <<EOF
 Detected go version: ${go_version[*]}.

netlify.toml

@@ -4,7 +4,7 @@
     publish = "docs/book/book"
 
 [build.environment]
-    GO_VERSION = "1.17"
+    GO_VERSION = "1.18"
 
 # Standard Netlify redirects
 [[redirects]]

test/infrastructure/docker/Makefile

@@ -19,7 +19,7 @@ ROOT = ../../..
 
 .DEFAULT_GOAL:=help
 
-GO_VERSION ?= 1.17.3
+GO_VERSION ?= 1.18.3
 GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION)
 
 # Use GOPROXY environment variable if set