From c4a8ca84ecfd6d34d34d5ec186b0590a61a104be Mon Sep 17 00:00:00 2001 From: tiffanny29631 Date: Mon, 21 Sep 2026 22:47:35 +0000 Subject: [PATCH 1/2] chore: bump git-sync to 4.5.0-gke.1 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index bd20ac6e57..8e15482b9b 100644 --- a/Makefile +++ b/Makefile @@ -95,7 +95,7 @@ COSIGN := $(BIN_DIR)/cosign # To automatically update, run this command: # UPDATE_TYPE= make update-git-sync-image -GIT_SYNC_VERSION := v4.4.2-gke.35__linux_amd64 +GIT_SYNC_VERSION := v4.5.0-gke.1__linux_amd64 GIT_SYNC_IMAGE_NAME := gcr.io/config-management-release/git-sync:$(GIT_SYNC_VERSION) # To automatically update, run this command: From bcb464de87f7536067a743c488ce1aa35f206edc Mon Sep 17 00:00:00 2001 From: tiffanny29631 Date: Tue, 22 Sep 2026 00:11:25 +0000 Subject: [PATCH 2/2] update test predicates for error message --- e2e/testcases/private_cert_secret_test.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/e2e/testcases/private_cert_secret_test.go b/e2e/testcases/private_cert_secret_test.go index 4932ca1c08..e146817fea 100644 --- a/e2e/testcases/private_cert_secret_test.go +++ b/e2e/testcases/private_cert_secret_test.go @@ -97,7 +97,7 @@ func TestCACertSecretRefV1Alpha1(t *testing.T) { rootSyncHTTPS := "https://test-git-server.config-management-system-test/git/config-management-system/root-sync" nt.MustMergePatch(rootSync, syncURLHTTPSPatch(rootSyncHTTPS)) // RootSync should fail without caCertSecret - nt.Must(nt.Watcher.WatchForRootSyncSourceError(configsync.RootSyncName, status.SourceErrorCode, "server certificate verification failed")) + nt.Must(nt.Watcher.WatchForRootSyncSourceError(configsync.RootSyncName, status.SourceErrorCode, "server verification failed")) err = nt.Validate(rootSyncReconcilerName, configsync.ControllerNamespace, &appsv1.Deployment{}, testpredicates.DeploymentHasEnvVar(reconcilermanager.GitSync, controllers.GitSyncRepo, rootSyncHTTPS)) if err != nil { nt.T.Fatal(err) @@ -120,7 +120,7 @@ func TestCACertSecretRefV1Alpha1(t *testing.T) { nt.Must(rootSyncGitRepo.Add(nomostest.StructuredNSPath(repoSyncID.Namespace, repoSyncID.Name), repoSyncBackend)) nt.Must(rootSyncGitRepo.CommitAndPush("Update backend RepoSync use HTTPS")) // RepoSync should fail without caCertSecret - nt.Must(nt.Watcher.WatchForRepoSyncSourceError(repoSyncID.Namespace, repoSyncID.Name, status.SourceErrorCode, "server certificate verification failed")) + nt.Must(nt.Watcher.WatchForRepoSyncSourceError(repoSyncID.Namespace, repoSyncID.Name, status.SourceErrorCode, "server verification failed")) err = nt.Validate(repoSyncReconcilerName, configsync.ControllerNamespace, &appsv1.Deployment{}, testpredicates.DeploymentHasEnvVar(reconcilermanager.GitSync, controllers.GitSyncRepo, repoSyncHTTPS)) if err != nil { nt.T.Fatal(err) @@ -139,7 +139,7 @@ func TestCACertSecretRefV1Alpha1(t *testing.T) { // Unset caCertSecret for RootSync nt.MustMergePatch(rootSync, caCertSecretPatch(configsync.GitSource, "")) // RootSync should fail without caCertSecret - nt.Must(nt.Watcher.WatchForRootSyncSourceError(configsync.RootSyncName, status.SourceErrorCode, "server certificate verification failed")) + nt.Must(nt.Watcher.WatchForRootSyncSourceError(configsync.RootSyncName, status.SourceErrorCode, "server verification failed")) err = nt.Validate(rootSyncReconcilerName, configsync.ControllerNamespace, &appsv1.Deployment{}, testpredicates.DeploymentMissingEnvVar(reconcilermanager.GitSync, key)) if err != nil { nt.T.Fatal(err) @@ -159,7 +159,7 @@ func TestCACertSecretRefV1Alpha1(t *testing.T) { nt.Must(rootSyncGitRepo.Add(nomostest.StructuredNSPath(repoSyncID.Namespace, repoSyncID.Name), repoSyncBackend)) nt.Must(rootSyncGitRepo.CommitAndPush("Update backend RepoSync unset caCertSecret")) // RepoSync should fail without caCertSecret - nt.Must(nt.Watcher.WatchForRepoSyncSourceError(repoSyncID.Namespace, repoSyncID.Name, status.SourceErrorCode, "server certificate verification failed")) + nt.Must(nt.Watcher.WatchForRepoSyncSourceError(repoSyncID.Namespace, repoSyncID.Name, status.SourceErrorCode, "server verification failed")) err = nt.Validate(repoSyncReconcilerName, configsync.ControllerNamespace, &appsv1.Deployment{}, testpredicates.DeploymentMissingEnvVar(reconcilermanager.GitSync, key)) if err != nil { nt.T.Fatal(err) @@ -211,7 +211,7 @@ func TestCACertSecretRefV1Beta1(t *testing.T) { rootSyncHTTPS := "https://test-git-server.config-management-system-test/git/config-management-system/root-sync" nt.MustMergePatch(rootSync, syncURLHTTPSPatch(rootSyncHTTPS)) // RootSync should fail without caCertSecret - nt.Must(nt.Watcher.WatchForRootSyncSourceError(configsync.RootSyncName, status.SourceErrorCode, "server certificate verification failed")) + nt.Must(nt.Watcher.WatchForRootSyncSourceError(configsync.RootSyncName, status.SourceErrorCode, "server verification failed")) err = nt.Validate(rootSyncReconcilerName, configsync.ControllerNamespace, &appsv1.Deployment{}, testpredicates.DeploymentHasEnvVar(reconcilermanager.GitSync, controllers.GitSyncRepo, rootSyncHTTPS)) if err != nil { nt.T.Fatal(err) @@ -233,7 +233,7 @@ func TestCACertSecretRefV1Beta1(t *testing.T) { nt.Must(rootSyncGitRepo.Add(nomostest.StructuredNSPath(repoSyncID.Namespace, repoSyncID.Name), repoSyncBackend)) nt.Must(rootSyncGitRepo.CommitAndPush("Update backend RepoSync use HTTPS")) // RepoSync should fail without caCertSecret - nt.Must(nt.Watcher.WatchForRepoSyncSourceError(repoSyncID.Namespace, repoSyncID.Name, status.SourceErrorCode, "server certificate verification failed")) + nt.Must(nt.Watcher.WatchForRepoSyncSourceError(repoSyncID.Namespace, repoSyncID.Name, status.SourceErrorCode, "server verification failed")) err = nt.Validate(reconcilerName, configsync.ControllerNamespace, &appsv1.Deployment{}, testpredicates.DeploymentHasEnvVar(reconcilermanager.GitSync, controllers.GitSyncRepo, repoSyncHTTPS)) if err != nil { nt.T.Fatal(err) @@ -258,7 +258,7 @@ func TestCACertSecretRefV1Beta1(t *testing.T) { // Unset caCertSecret for RootSync nt.MustMergePatch(rootSync, caCertSecretPatch(configsync.GitSource, "")) // RootSync should fail without caCertSecret - nt.Must(nt.Watcher.WatchForRootSyncSourceError(configsync.RootSyncName, status.SourceErrorCode, "server certificate verification failed")) + nt.Must(nt.Watcher.WatchForRootSyncSourceError(configsync.RootSyncName, status.SourceErrorCode, "server verification failed")) err = nt.Validate(rootSyncReconcilerName, configsync.ControllerNamespace, &appsv1.Deployment{}, testpredicates.DeploymentMissingEnvVar(reconcilermanager.GitSync, key)) if err != nil { nt.T.Fatal(err) @@ -278,7 +278,7 @@ func TestCACertSecretRefV1Beta1(t *testing.T) { nt.Must(rootSyncGitRepo.Add(nomostest.StructuredNSPath(repoSyncID.Namespace, repoSyncID.Name), repoSyncBackend)) nt.Must(rootSyncGitRepo.CommitAndPush("Update backend RepoSync unset caCertSecret")) // RepoSync should fail without caCertSecret - nt.Must(nt.Watcher.WatchForRepoSyncSourceError(repoSyncID.Namespace, repoSyncID.Name, status.SourceErrorCode, "server certificate verification failed")) + nt.Must(nt.Watcher.WatchForRepoSyncSourceError(repoSyncID.Namespace, repoSyncID.Name, status.SourceErrorCode, "server verification failed")) err = nt.Validate(reconcilerName, configsync.ControllerNamespace, &appsv1.Deployment{}, testpredicates.DeploymentMissingEnvVar(reconcilermanager.GitSync, key)) if err != nil { nt.T.Fatal(err)