Changes in 2025

.github/workflows/publish-images.yml

@@ -0,0 +1,52 @@
+name: Publish images
+
+on:
+  push:
+    branches:
+      - release
+    paths:
+      - "**/*.go"
+      - "**/*.html"
+      - go.mod
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: false
+
+jobs:
+  push-images:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.25"
+      - name: Log in to the Container registry
+        uses: ko-build/[email protected]
+      - name: Build & Push images
+        env:
+          REGISTRY: ghcr.io/ti-community-infra/prow
+        run: |
+          images=(
+            cmd/checkconfig
+            cmd/crier
+            cmd/deck
+            cmd/external-plugins/chatgpt
+            cmd/external-plugins/cherrypicker
+            cmd/external-plugins/refresh
+            cmd/hook
+            cmd/horologium
+            cmd/jenkins-operator
+            cmd/peribolos
+            cmd/prow-controller-manager
+            cmd/sinker
+            cmd/status-reconciler
+            cmd/tide
+          )
+          for image in "${images[@]}"; do
+            make push-single-image PROW_IMAGE=$image REGISTRY=${REGISTRY}
+          done

.go-version

@@ -1 +1 @@
-1.23.0
+1.24.0

.ko.yaml

@@ -285,6 +285,13 @@ builds:
       - -s -w
       - -X sigs.k8s.io/prow/pkg/version.Version={{.Env.VERSION}}
       - -X sigs.k8s.io/prow/pkg/version.Name=cherrypicker
+  - id: chatgpt
+    dir: .
+    main: cmd/external-plugins/chatgpt
+    ldflags:
+      - -s -w
+      - -X sigs.k8s.io/prow/version.Version={{.Env.VERSION}}
+      - -X sigs.k8s.io/prow/version.Name=chatgpt      
   - id: refresh
     dir: .
     main: cmd/external-plugins/refresh

.prow-images.yaml

@@ -39,4 +39,5 @@ images:
   - dir: cmd/external-plugins/needs-rebase
   - dir: cmd/external-plugins/cherrypicker
   - dir: cmd/external-plugins/refresh
+  - dir: cmd/external-plugins/chatgpt
   - dir: cmd/ghproxy

Makefile

@@ -57,12 +57,6 @@ update-go-deps:
 verify-go-deps:
 	hack/make-rules/verify/go-deps.sh
 ################################################################################
-# ================================== Dependencies ===================================
-# python deps
-ensure-py-requirements3:
-	hack/run-in-python-container.sh pip3 install -r requirements3.txt
-.PHONY: ensure-py-requirements3
-################################################################################
 # ================================== Linting ===================================
 # run linters, ensure generated code, etc.
 .PHONY: verify
@@ -97,7 +91,7 @@ update-codegen:
 verify-codegen:
 	hack/make-rules/verify/codegen.sh
 .PHONY: verify-boilerplate
-verify-boilerplate: ensure-py-requirements3
+verify-boilerplate:
 	hack/make-rules/verify/boilerplate.sh
 #################################################################################
 # Build and push specific variables.

cmd/admission/dev.yaml

@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: admission
-        image: gcr.io/k8s-testimages/admission:latest  # Note: not gcr.io/k8s-prow for dev
+        image: gcr.io/k8s-staging-test-infra/admission:latest  # Note: not gcr.io/k8s-prow for dev
         imagePullPolicy: Always  # Good practice for dev/debugging, bad for prod
         args:
         - --tls-cert-file=/etc/tls/tls.crt

cmd/branchprotector/OWNERS

@@ -1,4 +1,4 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
 labels:
- - area/prow/branchprotector
+ - area/branchprotector

cmd/branchprotector/oneshot-job.yaml

@@ -10,7 +10,7 @@ spec:
     spec:
       containers:
       - name: branchprotector
-        image: gcr.io/k8s-testimages/branchprotector:latest  # Note: not gcr.io/k8s-prow for dev
+        image: us-docker.pkg.dev/k8s-infra-prow/images/branchprotector:v20250704-ef29ebbe9  # Note: not gcr.io/k8s-prow for dev
         imagePullPolicy: Always  # Good practice for dev/debugging, bad for prod
         args:
         - --config-path=/etc/config/config.yaml

cmd/checkconfig/main.go

@@ -1289,7 +1289,7 @@ func validateCluster(cfg *config.Config, opener io.Opener) error {
 func validateAdditionalProwConfigIsInOrgRepoDirectoryStructure(filesystem fs.FS, supplementalProwConfigDirs, supplementalPluginsConfigDirs []string, supplementalProwConfigsFileNameSuffix, supplementalPluginsConfigFileNameSuffix string) error {
 	var errs []error
 
-	for _, supplementalProwConfigDir := range supplementalPluginsConfigDirs {
+	for _, supplementalProwConfigDir := range supplementalProwConfigDirs {
 		if err := validateAdditionalConfigIsInOrgRepoDirectoryStructure(supplementalProwConfigDir, filesystem, func() hierarchicalConfig { return &config.Config{} }, supplementalProwConfigsFileNameSuffix); err != nil {
 			errs = append(errs, err)
 		}

cmd/checkconfig/main_test.go

@@ -31,7 +31,6 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
-	"k8s.io/apimachinery/pkg/util/diff"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/utils/ptr"
@@ -1389,7 +1388,7 @@ func TestVerifyOwnersPresence(t *testing.T) {
 				errMessage = err.Error()
 			}
 			if errMessage != tc.expected {
-				t.Errorf("result differs:\n%s", diff.StringDiff(tc.expected, errMessage))
+				t.Errorf("result differs:\n%s", cmp.Diff(tc.expected, errMessage))
 			}
 		})
 	}
@@ -1998,6 +1997,9 @@ plugins:
 		name string
 		fs   fstest.MapFS
 
+		root       string
+		pluginRoot string
+
 		expectedErrorMessage string
 	}{
 		{
@@ -2082,17 +2084,49 @@ plugins:
 
 			expectedErrorMessage: `[config root/my-org/my-repo/nest/cfg.yaml is at an invalid location. All configs must be below root. If they are org-specific, they must be in a folder named like the org. If they are repo-specific, they must be in a folder named like the repo below a folder named like the org., config root/my-org/my-repo/nest/plugins.yaml is at an invalid location. All configs must be below root. If they are org-specific, they must be in a folder named like the org. If they are repo-specific, they must be in a folder named like the repo below a folder named like the org.]`,
 		},
+		{
+			name:       "Valid repo config in separate hierarchy",
+			pluginRoot: "plugins",
+			fs: testfs(map[string]string{
+				root + "/my-org/my-repo/cfg.yaml":     validRepoConfig,
+				"plugins/my-org/my-repo/plugins.yaml": validRepoPluginsConfig,
+			}),
+		},
+		{
+			name:       "Invalid repo Prow config in separate hierarchy",
+			pluginRoot: "plugins",
+			fs: testfs(map[string]string{
+				root + "/my-org/my-repo/cfg.yaml":     invalidConfig,
+				"plugins/my-org/my-repo/plugins.yaml": validRepoPluginsConfig,
+			}),
+			expectedErrorMessage: `failed to unmarshal root/my-org/my-repo/cfg.yaml into *config.Config: error unmarshaling JSON: while decoding JSON: json: cannot unmarshal array into Go value of type config.Config`,
+		},
+		{
+			name:       "Invalid repo Plugin config in separate hierarchy",
+			pluginRoot: "plugins",
+			fs: testfs(map[string]string{
+				root + "/my-org/my-repo/cfg.yaml":     validRepoConfig,
+				"plugins/my-org/my-repo/plugins.yaml": invalidConfig,
+			}),
+			expectedErrorMessage: `failed to unmarshal plugins/my-org/my-repo/plugins.yaml into *plugins.Configuration: error unmarshaling JSON: while decoding JSON: json: cannot unmarshal array into Go value of type plugins.Configuration`,
+		},
 	}
 
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
+			if tc.root == "" {
+				tc.root = root
+			}
+			if tc.pluginRoot == "" {
+				tc.pluginRoot = root
+			}
 			var errMsg string
-			err := validateAdditionalProwConfigIsInOrgRepoDirectoryStructure(tc.fs, []string{root}, []string{root}, "cfg.yaml", "plugins.yaml")
+			err := validateAdditionalProwConfigIsInOrgRepoDirectoryStructure(tc.fs, []string{tc.root}, []string{tc.pluginRoot}, "cfg.yaml", "plugins.yaml")
 			if err != nil {
 				errMsg = err.Error()
 			}
 			if tc.expectedErrorMessage != errMsg {
-				t.Errorf("expected error %s, got %s", tc.expectedErrorMessage, errMsg)
+				t.Errorf("unexpected error (-want +got):\n%s", cmp.Diff(tc.expectedErrorMessage, errMsg))
 			}
 		})
 	}

cmd/checkconfig/testdata/combined.yaml

@@ -23,10 +23,6 @@ deck:
           - (FAIL|Failure \[)\b
           - panic\b
           - ^E\d{4} \d\d:\d\d:\d\d\.\d\d\d]
-          iframe_sandbox_permissions:
-          - allow-scripts
-          - allow-popups
-          - allow-popups-to-escape-sandbox
       required_files:
       - build-log.txt
     - lens:

cmd/clonerefs/OWNERS

@@ -5,5 +5,4 @@ reviewers:
 approvers:
 - stevekuznetsov
 labels:
- - area/prow/clonerefs
- - area/prow/pod-utilities
+ - area/podutils/clonerefs

cmd/config-bootstrapper/OWNERS

@@ -6,5 +6,3 @@ reviewers:
 approvers:
 - chases2
 - stevekuznetsov
-labels:
- - area/prow/config-bootstrapper

cmd/crier/OWNERS

@@ -8,4 +8,4 @@ emeritus_approvers:
 - fejta
 - krzyzacy
 labels:
-- area/prow/crier
+- area/crier

cmd/deck/.ts-packages

@@ -32,6 +32,9 @@ packages:
 - dir: cmd/deck/static/command-help
   entrypoint: command-help.ts
   dst: ../command_help_bundle.min.js
+- dir: cmd/deck/static/configured-jobs
+  entrypoint: configured-jobs.ts
+  dst: ../configured_jobs_bundle.min.js
 - dir: cmd/deck/static/tide-history
   entrypoint: tide-history.ts
   dst: ../tide_history_bundle.min.js

cmd/deck/OWNERS

@@ -10,4 +10,4 @@ emeritus_approvers:
 - Katharine
 - mpherman2
 labels:
- - area/prow/deck
+ - area/deck