new file, fix, more updates

Signed-off-by: David Fridrich <fridrich.david19@gmail.com>

Author: gauron99

.github/workflows/update-knative-hack.yaml

@@ -10,10 +10,10 @@ permissions:
 jobs:
   update:
     name: Update to latest
-    runs-on: ubuntu
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-go@v4
+    - uses: actions/setup-go@v5
       with:
         go-version: 1.23.4
     - name: Run script

hack/allocate.sh

@@ -21,17 +21,8 @@ set -o nounset
 set -o pipefail
 
 source "$(dirname "$(realpath "$0")")/common.sh"
-
-
-set_versions() {
-  # Note: Kubernetes Version node image per Kind releases (full hash is suggested):
-  # https://github.com/kubernetes-sigs/kind/releases
-  kind_node_version=v1.32.0@sha256:c48c62eac5da28cdadcf560d1d8616cfa6783b58f0d94cf63ad1bf49600cb027
-  # Updated programatically via 'hack/update-knative-hack.go'
-  knative_serving_version="v1.16.0"
-  knative_eventing_versio="v1.16.0"
-  contour_version="v1.16.0"
-}
+# this is where versions of common components are (like knative)
+source "$(dirname "$(realpath "$0")")/components-versions.sh"
 
 main() {
   echo "${blue}Allocating${reset}"
@@ -63,46 +54,6 @@ main() {
   echo -e "\n${green}🎉 DONE${reset}\n"
 }
 
-# Retrieve latest version from given Knative repository tags
-# On 'main' branch the latest released version is returned
-# On 'release-x.y' branch the latest patch version for 'x.y.*' is returned
-# Similar to hack/library.sh get_latest_knative_yaml_source()
-function get_latest_release_version() {
-    local org_name="$1"
-    local repo_name="$2"
-    local major_minor=""
-    if is_release_branch; then
-      local branch_name
-      branch_name="$(current_branch)"
-      major_minor="${branch_name##release-}"
-    fi
-    local version
-    version="$(git ls-remote --tags --ref https://github.com/"${org_name}"/"${repo_name}".git \
-      | grep "${major_minor}" \
-      | cut -d '-' -f2 \
-      | cut -d 'v' -f2 \
-      | sort -Vr \
-      | head -n 1)"
-    echo "${version}"
-}
-
-# Returns whether the current branch is a release branch.
-function is_release_branch() {
-  [[ $(current_branch) =~ ^release-[0-9\.]+$ ]]
-}
-
-# Returns the current branch.
-# Taken from knative/hack. The function covers Knative CI use cases and local variant.
-function current_branch() {
-  local branch_name=""
-  # Get the branch name from Prow's env var, see https://github.com/kubernetes/test-infra/blob/master/prow/jobs.md.
-  # Otherwise, try getting the current branch from git.
-  (( ${IS_PROW:-} )) && branch_name="${PULL_BASE_REF:-}"
-  [[ -z "${branch_name}" ]] && branch_name="${GITHUB_BASE_REF:-}"
-  [[ -z "${branch_name}" ]] && branch_name="$(git rev-parse --abbrev-ref HEAD)"
-  echo "${branch_name}"
-}
-
 kubernetes() {
   cat <<EOF | $KIND create cluster --name=func --kubeconfig="${KUBECONFIG}" --wait=60s --config=-
 kind: Cluster

hack/component-versions.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+ 
+set_versions() {
+  # Note: Kubernetes Version node image per Kind releases (full hash is suggested):
+  # https://github.com/kubernetes-sigs/kind/releases
+  kind_node_version=v1.32.0@sha256:c48c62eac5da28cdadcf560d1d8616cfa6783b58f0d94cf63ad1bf49600cb027
+
+  # Can be updated programatically 
+  knative_serving_version="v1.16.0"
+  knative_eventing_versio="v1.16.0"
+  contour_version="v1.16.0"
+}

hack/update-knative-components.go

@@ -16,8 +16,22 @@ var (
 	knSrvPrefix = "knative_serving_version="
 	knEvtPrefix = "knative_eventing_version="
 	knCtrPrefix = "contour_version="
+
+	file = "hack/component-versions.sh"
 )
 
+// if running on branch "release-*" return the current branch version
+// (for possible fixups) otherwise, return latest as standard
+// func getLatestOrReleaseVersion() (v string, err error) {
+// 	cmd := exec.Command("git", "rev-parse", "--abbrev-ref", "HEAD")
+// 	o, err := cmd.Output()
+// 	if err != nil {
+// 		return "", fmt.Errorf("error running git rev-parse: %v", err)
+// 	}
+// 	fmt.Printf("out: %s\n", string(o))
+// 	return string(o), nil
+// }
+
 // get latest version of owner/repo via GH API
 func getLatestVersion(ctx context.Context, client *github.Client, owner string, repo string) (v string, err error) {
 	fmt.Printf("get latest repo %s/%s\n", owner, repo)
@@ -45,15 +59,13 @@ func getVersionsFromFile() (srv string, evt string, ctr string, err error) {
 	evt = "" //eventing
 	ctr = "" //net-contour (knative-extensions)
 
-	var f = "hack/allocate.sh"
-
-	file, err := os.OpenFile(f, os.O_RDWR, 0600)
+	f, err := os.OpenFile(file, os.O_RDWR, 0600)
 	if err != nil {
-		err = fmt.Errorf("cant open file '%s': %v", f, err)
+		err = fmt.Errorf("cant open file '%s': %v", file, err)
 	}
-	defer file.Close()
+	defer f.Close()
 	// read file line by line
-	fs := bufio.NewScanner(file)
+	fs := bufio.NewScanner(f)
 	fs.Split(bufio.ScanLines)
 	for fs.Scan() {
 		// Look for a prefix in a trimmed line.
@@ -83,10 +95,10 @@ func getVersionsFromFile() (srv string, evt string, ctr string, err error) {
 	return
 }
 
-// Update version in file if new releases of eventing/serving/net-concour exist
-// if applicable.
+// Update version in file if new releases of any component exist
 func tryUpdateFile(upstreams []struct{ owner, repo, version string }) (updated bool, err error) {
-	file := "hack/allocate.sh"
+	quoteWrap := func(s string) string { return "\"" + s + "\"" }
+	file := "hack/component-versions.sh"
 	updated = false
 
 	// get current versions used. Get all together to limit opening/closing
@@ -98,25 +110,26 @@ func tryUpdateFile(upstreams []struct{ owner, repo, version string }) (updated b
 
 	// update files to latest release where applicable
 	for _, upstream := range upstreams {
+		uv := quoteWrap(upstream.version)
 		var cmd *exec.Cmd
 		switch upstream.repo {
 		case "serving":
 			if upstream.version != oldSrv {
 				fmt.Printf("update serving from '%s' to '%s'\n", oldSrv, upstream.version)
-				cmd = exec.Command("sed", "-i", "-e", "s/"+knSrvPrefix+oldSrv+"/"+knSrvPrefix+upstream.version+"/g", file)
+				cmd = exec.Command("sed", "-i", "-e", "s/"+knSrvPrefix+quoteWrap(oldSrv)+"/"+knSrvPrefix+uv+"/g", file)
 			}
 		case "eventing":
 			if upstream.version != oldEvt {
 				fmt.Printf("update eventing from '%s' to '%s'\n", oldEvt, upstream.version)
-				cmd = exec.Command("sed", "-i", "-e", "s/"+knEvtPrefix+oldEvt+"/"+knEvtPrefix+upstream.version+"/g", file)
+				cmd = exec.Command("sed", "-i", "-e", "s/"+knEvtPrefix+quoteWrap(oldEvt)+"/"+knEvtPrefix+uv+"/g", file)
 			}
-		case "net-concour":
+		case "net-contour":
 			if upstream.version != oldCntr {
 				fmt.Printf("update contour from '%s' to '%s'\n", oldCntr, upstream.version)
-				cmd = exec.Command("sed", "-i", "-e", "s/"+knCtrPrefix+oldCntr+"/"+knCtrPrefix+upstream.version+"/g", file)
+				cmd = exec.Command("sed", "-i", "-e", "s/"+knCtrPrefix+quoteWrap(oldCntr)+"/"+knCtrPrefix+uv+"/g", file)
 			}
 		default:
-			err = fmt.Errorf("unkown upstream.repo '%s' in for loop, exiting", upstream.repo)
+			err = fmt.Errorf("internal error: unknown upstream.repo '%s' in for loop, exiting", upstream.repo)
 			return false, err
 		}
 		err = cmd.Run()