Merge pull request #13537 from fabriziopandini/add-other-to-prow-job-generator

🌱 Add other to prow job generator

Author: k8s-ci-robot

hack/tools/prowjob-gen/config.go

@@ -33,12 +33,13 @@ type Config struct {
 
 // BranchConfig is the branch-based configuration struct.
 type BranchConfig struct {
-	Interval                            string     `json:"interval"`
-	UpgradesInterval                    string     `json:"upgradesInterval"`
-	TestImage                           string     `json:"testImage"`
-	KubernetesVersionManagement         string     `json:"kubernetesVersionManagement"`
-	KubebuilderEnvtestKubernetesVersion string     `json:"kubebuilderEnvtestKubernetesVersion"`
-	Upgrades                            []*Upgrade `json:"upgrades"`
+	Interval                            string                 `json:"interval"`
+	UpgradesInterval                    string                 `json:"upgradesInterval"`
+	TestImage                           string                 `json:"testImage"`
+	KubernetesVersionManagement         string                 `json:"kubernetesVersionManagement"`
+	KubebuilderEnvtestKubernetesVersion string                 `json:"kubebuilderEnvtestKubernetesVersion"`
+	Upgrades                            []*Upgrade             `json:"upgrades"`
+	Other                               map[string]interface{} `json:"other"`
 }
 
 // Template refers a template file and defines the target file name template.

hack/tools/prowjob-gen/test/test-configuration.yaml

@@ -9,7 +9,10 @@ prow_ignored:
       upgrades:
       - from: "1.29"
         to: "1.30"
-
+      other:
+        foo:
+        - from: "1.29"
+          to: "1.30"
   templates:
   - name: "test.yaml.tpl"
     template: "test-{{ .branch }}.yaml.tmp"

hack/tools/prowjob-gen/test/test-main.yaml.golden

@@ -3,4 +3,5 @@ main
 main
 bar
 foobar
+1.29
 1.29

hack/tools/prowjob-gen/test/test.yaml.tpl

@@ -2,4 +2,5 @@
 {{ ReplaceAll .branch "." "-" }}
 {{ TrimPrefix "foobar" "foo" }}
 {{ TrimPrefix "foobar" "bar" }}
-{{ (last $.config.Upgrades).From }}
+{{ (last $.config.Upgrades).From }}
+{{ (last $.config.Other.foo).from }}