remove sprig

kubernetes · Jan 11, 2024 · c74686b · c74686b
1 parent 7403ebe
commit c74686b
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 63 deletions.
diff --git a/config/jobs/kubernetes-sigs/cluster-api/templates/cluster-api-periodics-upgrades.yaml.tpl b/config/jobs/kubernetes-sigs/cluster-api/templates/cluster-api-periodics-upgrades.yaml.tpl
@@ -1,6 +1,6 @@
 periodics:
 {{- range $_, $upgrade := $.config.Upgrades }}
-- name: periodic-cluster-api-e2e-workload-upgrade-{{ $upgrade.From | trimPrefix "stable-" | trimPrefix "ci/latest-" | replace "." "-" }}-{{ $upgrade.To | trimPrefix "stable-" | trimPrefix "ci/latest-" | replace "." "-" }}-{{ $.branch | replace "." "-" }}
+- name: periodic-cluster-api-e2e-workload-upgrade-{{ ReplaceAll (TrimPrefix (TrimPrefix $upgrade.From "stable-") "ci/latest-") "." "-" }}-{{ ReplaceAll (TrimPrefix (TrimPrefix $upgrade.To "stable-") "ci/latest-") "." "-" }}-{{ ReplaceAll $.branch "." "-" }}
   cluster: eks-prow-build-cluster
   interval: 24h
   decorate: true
@@ -30,13 +30,13 @@ periodics:
       - name: ALWAYS_BUILD_KIND_IMAGES
         value: "true"
       - name: KUBERNETES_VERSION_UPGRADE_FROM
-        value: "{{ versionMapperLookup $upgrade.From "k8sRelease" }}"
+        value: "{{ index (index $.versions $upgrade.From) "k8sRelease" }}"
       - name: KUBERNETES_VERSION_UPGRADE_TO
-        value: "{{ versionMapperLookup $upgrade.To "k8sRelease" }}"
+        value: "{{ index (index $.versions $upgrade.To) "k8sRelease" }}"
       - name: ETCD_VERSION_UPGRADE_TO
-        value: "{{ versionMapperLookup $upgrade.From "etcd" }}"
+        value: "{{ index (index $.versions $upgrade.From) "etcd" }}"
       - name: COREDNS_VERSION_UPGRADE_TO
-        value: "{{ versionMapperLookup $upgrade.From "coreDNS" }}"
+        value: "{{ index (index $.versions $upgrade.From) "coreDNS" }}"
       - name: GINKGO_FOCUS
         value: "\\[K8s-Upgrade\\]"
       # we need privileged mode in order to do docker in docker
@@ -50,8 +50,8 @@ periodics:
           cpu: 7300m
           memory: 32Gi
   annotations:
-    testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ $.branch | trimPrefix "release" }}{{- end }}
-    testgrid-tab-name: capi-e2e-{{ $.branch | replace "." "-" }}-{{ $upgrade.From | trimPrefix "stable-" | trimPrefix "ci/latest-" | replace "." "-" }}-{{ $upgrade.To | trimPrefix "stable-" | trimPrefix "ci/latest-" | replace "." "-" }}
+    testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ TrimPrefix $.branch "release" }}{{- end }}
+    testgrid-tab-name: capi-e2e-{{ ReplaceAll $.branch "." "-" }}-{{ ReplaceAll (TrimPrefix (TrimPrefix $upgrade.From "stable-") "ci/latest-") "." "-" }}-{{ ReplaceAll (TrimPrefix (TrimPrefix $upgrade.To "stable-") "ci/latest-") "." "-" }}
     testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
     testgrid-num-failures-to-alert: "4"
 {{ end -}}
diff --git a/config/jobs/kubernetes-sigs/cluster-api/templates/cluster-api-periodics.yaml.tpl b/config/jobs/kubernetes-sigs/cluster-api/templates/cluster-api-periodics.yaml.tpl
@@ -1,5 +1,5 @@
 periodics:
-- name: periodic-cluster-api-test-{{ $.branch | replace "." "-" }}
+- name: periodic-cluster-api-test-{{ ReplaceAll $.branch "." "-" }}
   cluster: eks-prow-build-cluster
   interval: {{ $.config.Interval }}
   decorate: true
@@ -26,11 +26,11 @@ periodics:
           cpu: 7300m
           memory: 9Gi
   annotations:
-    testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ $.branch | trimPrefix "release" }}{{- end }}
-    testgrid-tab-name: capi-test-{{ $.branch | replace "." "-" }}
+    testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ TrimPrefix $.branch "release" }}{{- end }}
+    testgrid-tab-name: capi-test-{{ ReplaceAll $.branch "." "-" }}
     testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
     testgrid-num-failures-to-alert: "4"
-- name: periodic-cluster-api-test-mink8s-{{ $.branch | replace "." "-" }}
+- name: periodic-cluster-api-test-mink8s-{{ ReplaceAll $.branch "." "-" }}
   cluster: eks-prow-build-cluster
   interval: {{ $.config.Interval }}
   decorate: true
@@ -67,11 +67,11 @@ periodics:
           cpu: 7300m
           memory: 9Gi
   annotations:
-    testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ $.branch | trimPrefix "release" }}{{- end }}
-    testgrid-tab-name: capi-test-mink8s-{{ $.branch | replace "." "-" }}
+    testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ TrimPrefix $.branch "release" }}{{- end }}
+    testgrid-tab-name: capi-test-mink8s-{{ ReplaceAll $.branch "." "-" }}
     testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
     testgrid-num-failures-to-alert: "4"
-- name: periodic-cluster-api-e2e-{{ $.branch | replace "." "-" }}
+- name: periodic-cluster-api-e2e-{{ ReplaceAll $.branch "." "-" }}
   cluster: eks-prow-build-cluster
   interval: {{ $.config.Interval }}
   decorate: true
@@ -111,12 +111,12 @@ periodics:
             cpu: 7300m
             memory: 32Gi
   annotations:
-    testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ $.branch | trimPrefix "release" }}{{- end }}
-    testgrid-tab-name: capi-e2e-{{ $.branch | replace "." "-" }}
+    testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ TrimPrefix $.branch "release" }}{{- end }}
+    testgrid-tab-name: capi-e2e-{{ ReplaceAll $.branch "." "-" }}
     testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
     testgrid-num-failures-to-alert: "4"
 {{ if eq $.branch "release-1.4" | not -}}
-- name: periodic-cluster-api-e2e-dualstack-and-ipv6-{{ $.branch | replace "." "-" }}
+- name: periodic-cluster-api-e2e-dualstack-and-ipv6-{{ ReplaceAll $.branch "." "-" }}
   cluster: eks-prow-build-cluster
   interval: {{ $.config.Interval }}
   decorate: true
@@ -159,12 +159,12 @@ periodics:
             cpu: 7300m
             memory: 32Gi
   annotations:
-    testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ $.branch | trimPrefix "release" }}{{- end }}
-    testgrid-tab-name: capi-e2e-dualstack-and-ipv6-{{ $.branch | replace "." "-" }}
+    testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ TrimPrefix $.branch "release" }}{{- end }}
+    testgrid-tab-name: capi-e2e-dualstack-and-ipv6-{{ ReplaceAll $.branch "." "-" }}
     testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
     testgrid-num-failures-to-alert: "4"
 {{ end -}}
-- name: periodic-cluster-api-e2e-mink8s-{{ $.branch | replace "." "-" }}
+- name: periodic-cluster-api-e2e-mink8s-{{ ReplaceAll $.branch "." "-" }}
   cluster: eks-prow-build-cluster
   interval: {{ $.config.Interval }}
   decorate: true
@@ -212,7 +212,7 @@ periodics:
           cpu: 7300m
           memory: 32Gi
   annotations:
-    testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ $.branch | trimPrefix "release" }}{{- end }}
-    testgrid-tab-name: capi-e2e-mink8s-{{ $.branch | replace "." "-" }}
+    testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ TrimPrefix $.branch "release" }}{{- end }}
+    testgrid-tab-name: capi-e2e-mink8s-{{ ReplaceAll $.branch "." "-" }}
     testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
     testgrid-num-failures-to-alert: "4"
diff --git a/config/jobs/kubernetes-sigs/cluster-api/templates/cluster-api-presubmits.yaml.tpl b/config/jobs/kubernetes-sigs/cluster-api/templates/cluster-api-presubmits.yaml.tpl
@@ -1,6 +1,6 @@
 presubmits:
   kubernetes-sigs/cluster-api:
-  - name: pull-cluster-api-build-{{ $.branch | replace "." "-" }}
+  - name: pull-cluster-api-build-{{ ReplaceAll $.branch "." "-" }}
     cluster: eks-prow-build-cluster
     decorate: true
     path_alias: sigs.k8s.io/cluster-api
@@ -22,9 +22,9 @@ presubmits:
             cpu: 7300m
             memory: 9Gi
     annotations:
-      testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ $.branch | trimPrefix "release" }}{{- end }}
-      testgrid-tab-name: capi-pr-build-{{ $.branch | replace "." "-" }}
-  - name: pull-cluster-api-apidiff-{{ $.branch | replace "." "-" }}
+      testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ TrimPrefix $.branch "release" }}{{- end }}
+      testgrid-tab-name: capi-pr-build-{{ ReplaceAll $.branch "." "-" }}
+  - name: pull-cluster-api-apidiff-{{ ReplaceAll $.branch "." "-" }}
     cluster: eks-prow-build-cluster
     decorate: true
     path_alias: sigs.k8s.io/cluster-api
@@ -47,9 +47,9 @@ presubmits:
             cpu: 7300m
             memory: 9Gi
     annotations:
-      testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ $.branch | trimPrefix "release" }}{{- end }}
-      testgrid-tab-name: capi-pr-apidiff-{{ $.branch | replace "." "-" }}
-  - name: pull-cluster-api-verify-{{ $.branch | replace "." "-" }}
+      testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ TrimPrefix $.branch "release" }}{{- end }}
+      testgrid-tab-name: capi-pr-apidiff-{{ ReplaceAll $.branch "." "-" }}
+  - name: pull-cluster-api-verify-{{ ReplaceAll $.branch "." "-" }}
     cluster: eks-prow-build-cluster
     decorate: true
     path_alias: sigs.k8s.io/cluster-api
@@ -75,9 +75,9 @@ presubmits:
         securityContext:
           privileged: true
     annotations:
-      testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ $.branch | trimPrefix "release" }}{{- end }}
-      testgrid-tab-name: capi-pr-verify-{{ $.branch | replace "." "-" }}
-  - name: pull-cluster-api-test-{{ $.branch | replace "." "-" }}
+      testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ TrimPrefix $.branch "release" }}{{- end }}
+      testgrid-tab-name: capi-pr-verify-{{ ReplaceAll $.branch "." "-" }}
+  - name: pull-cluster-api-test-{{ ReplaceAll $.branch "." "-" }}
     cluster: eks-prow-build-cluster
     decorate: true
     path_alias: sigs.k8s.io/cluster-api
@@ -99,9 +99,9 @@ presubmits:
             cpu: 7300m
             memory: 9Gi
     annotations:
-      testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ $.branch | trimPrefix "release" }}{{- end }}
-      testgrid-tab-name: capi-pr-test-{{ $.branch | replace "." "-" }}
-  - name: pull-cluster-api-test-mink8s-{{ $.branch | replace "." "-" }}
+      testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ TrimPrefix $.branch "release" }}{{- end }}
+      testgrid-tab-name: capi-pr-test-{{ ReplaceAll $.branch "." "-" }}
+  - name: pull-cluster-api-test-mink8s-{{ ReplaceAll $.branch "." "-" }}
     cluster: eks-prow-build-cluster
     decorate: true
     path_alias: sigs.k8s.io/cluster-api
@@ -133,10 +133,10 @@ presubmits:
             cpu: 7300m
             memory: 9Gi
     annotations:
-      testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ $.branch | trimPrefix "release" }}{{- end }}
-      testgrid-tab-name: capi-pr-test-mink8s-{{ $.branch | replace "." "-" }}
+      testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ TrimPrefix $.branch "release" }}{{- end }}
+      testgrid-tab-name: capi-pr-test-mink8s-{{ ReplaceAll $.branch "." "-" }}
 {{- if eq $.branch "release-1.4" | not }}
-  - name: pull-cluster-api-e2e-mink8s-{{ $.branch | replace "." "-" }}
+  - name: pull-cluster-api-e2e-mink8s-{{ ReplaceAll $.branch "." "-" }}
     cluster: eks-prow-build-cluster
     labels:
       preset-dind-enabled: "true"
@@ -175,10 +175,10 @@ presubmits:
             cpu: 7300m
             memory: 32Gi
     annotations:
-      testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ $.branch | trimPrefix "release" }}{{- end }}
-      testgrid-tab-name: capi-pr-e2e-mink8s-{{ $.branch | replace "." "-" }}
+      testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ TrimPrefix $.branch "release" }}{{- end }}
+      testgrid-tab-name: capi-pr-e2e-mink8s-{{ ReplaceAll $.branch "." "-" }}
 {{- end }}
-  - name: pull-cluster-api-e2e-{{ $.branch | replace "." "-" }}
+  - name: pull-cluster-api-e2e-{{ ReplaceAll $.branch "." "-" }}
     cluster: eks-prow-build-cluster
     labels:
       preset-dind-enabled: "true"
@@ -209,10 +209,10 @@ presubmits:
             cpu: 7300m
             memory: 32Gi
     annotations:
-      testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ $.branch | trimPrefix "release" }}{{- end }}
-      testgrid-tab-name: capi-pr-e2e-{{ $.branch | replace "." "-" }}
-{{- if has $.branch (list "release-1.4" "release-1.5") }}
-  - name: pull-cluster-api-e2e-informing-{{ $.branch | replace "." "-" }}
+      testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ TrimPrefix $.branch "release" }}{{- end }}
+      testgrid-tab-name: capi-pr-e2e-{{ ReplaceAll $.branch "." "-" }}
+{{- if eq $.branch "release-1.4" "release-1.5" }}
+  - name: pull-cluster-api-e2e-informing-{{ ReplaceAll $.branch "." "-" }}
     cluster: eks-prow-build-cluster
     labels:
       preset-dind-enabled: "true"
@@ -248,11 +248,11 @@ presubmits:
             cpu: 7300m
             memory: 32Gi
     annotations:
-      testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ $.branch | trimPrefix "release" }}{{- end }}
-      testgrid-tab-name: capi-pr-e2e-informing-{{ $.branch | replace "." "-" }}
+      testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ TrimPrefix $.branch "release" }}{{- end }}
+      testgrid-tab-name: capi-pr-e2e-informing-{{ ReplaceAll $.branch "." "-" }}
 {{- end }}
 {{- if eq $.branch "release-1.4" | not }}
-  - name: pull-cluster-api-e2e-full-dualstack-and-ipv6-{{ $.branch | replace "." "-" }}
+  - name: pull-cluster-api-e2e-full-dualstack-and-ipv6-{{ ReplaceAll $.branch "." "-" }}
     cluster: eks-prow-build-cluster
     labels:
       preset-dind-enabled: "true"
@@ -289,10 +289,10 @@ presubmits:
               cpu: 7300m
               memory: 32Gi
     annotations:
-      testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ $.branch | trimPrefix "release" }}{{- end }}
-      testgrid-tab-name: capi-pr-e2e-full-dualstack-and-ipv6-{{ $.branch | replace "." "-" }}
+      testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ TrimPrefix $.branch "release" }}{{- end }}
+      testgrid-tab-name: capi-pr-e2e-full-dualstack-and-ipv6-{{ ReplaceAll $.branch "." "-" }}
 {{ else }}
-  - name: pull-cluster-api-e2e-informing-ipv6-{{ $.branch | replace "." "-" }}
+  - name: pull-cluster-api-e2e-informing-ipv6-{{ ReplaceAll $.branch "." "-" }}
     cluster: eks-prow-build-cluster
     labels:
       preset-dind-enabled: "true"
@@ -329,10 +329,10 @@ presubmits:
               cpu: 7300m
               memory: 32Gi
     annotations:
-      testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ $.branch | trimPrefix "release" }}{{- end }}
-      testgrid-tab-name: capi-pr-e2e-informing-ipv6-{{ $.branch | replace "." "-" }}
+      testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ TrimPrefix $.branch "release" }}{{- end }}
+      testgrid-tab-name: capi-pr-e2e-informing-ipv6-{{ ReplaceAll $.branch "." "-" }}
 {{- end }}
-  - name: pull-cluster-api-e2e-full-{{ $.branch | replace "." "-" }}
+  - name: pull-cluster-api-e2e-full-{{ ReplaceAll $.branch "." "-" }}
     cluster: eks-prow-build-cluster
     labels:
       preset-dind-enabled: "true"
@@ -366,9 +366,9 @@ presubmits:
             cpu: 7300m
             memory: 32Gi
     annotations:
-      testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ $.branch | trimPrefix "release" }}{{- end }}
-      testgrid-tab-name: capi-pr-e2e-full-{{ $.branch | replace "." "-" }}
-  - name: pull-cluster-api-e2e-workload-upgrade-{{ (lastUpgradeVersion $.branch).From | replace "." "-" }}-{{ (lastUpgradeVersion $.branch).To | replace "." "-" }}-{{ $.branch | replace "." "-" }}
+      testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ TrimPrefix $.branch "release" }}{{- end }}
+      testgrid-tab-name: capi-pr-e2e-full-{{ ReplaceAll $.branch "." "-" }}
+  - name: pull-cluster-api-e2e-workload-upgrade-{{ ReplaceAll (last $.config.Upgrades).From "." "-" }}-{{ ReplaceAll (last $.config.Upgrades).To "." "-" }}-{{ ReplaceAll $.branch "." "-" }}
     cluster: eks-prow-build-cluster
     labels:
       preset-dind-enabled: "true"
@@ -394,13 +394,13 @@ presubmits:
           - name: ALWAYS_BUILD_KIND_IMAGES
             value: "true"
           - name: KUBERNETES_VERSION_UPGRADE_FROM
-            value: "{{ versionMapperLookup ((lastUpgradeVersion $.branch).From) "k8sRelease" }}"
+            value: "{{ index (index $.versions ((last $.config.Upgrades).From)) "k8sRelease" }}"
           - name: KUBERNETES_VERSION_UPGRADE_TO
-            value: "{{ versionMapperLookup ((lastUpgradeVersion $.branch).To) "k8sRelease" }}"
+            value: "{{ index (index $.versions ((last $.config.Upgrades).To)) "k8sRelease" }}"
           - name: ETCD_VERSION_UPGRADE_TO
-            value: "{{ versionMapperLookup ((lastUpgradeVersion $.branch).From) "etcd" }}"
+            value: "{{ index (index $.versions ((last $.config.Upgrades).From)) "etcd" }}"
           - name: COREDNS_VERSION_UPGRADE_TO
-            value: "{{ versionMapperLookup ((lastUpgradeVersion $.branch).From) "coreDNS" }}"
+            value: "{{ index (index $.versions ((last $.config.Upgrades).From)) "coreDNS" }}"
           - name: GINKGO_FOCUS
             value: "\\[K8s-Upgrade\\]"
         # we need privileged mode in order to do docker in docker
@@ -414,5 +414,5 @@ presubmits:
             cpu: 7300m
             memory: 32Gi
     annotations:
-      testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ $.branch | trimPrefix "release" }}{{- end }}
-      testgrid-tab-name: capi-pr-e2e-{{ $.branch | replace "." "-" }}-{{ (lastUpgradeVersion $.branch).From | replace "." "-" }}-{{ (lastUpgradeVersion $.branch).To | replace "." "-" }}
+      testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ TrimPrefix $.branch "release" }}{{- end }}
+      testgrid-tab-name: capi-pr-e2e-{{ ReplaceAll $.branch "." "-" }}-{{ ReplaceAll (last $.config.Upgrades).From "." "-" }}-{{ ReplaceAll (last $.config.Upgrades).To "." "-" }}