Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ COSIGN := $(BIN_DIR)/cosign

# To automatically update, run this command:
# UPDATE_TYPE=<latest-version|latest-build> 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:
Expand Down
16 changes: 8 additions & 8 deletions e2e/testcases/private_cert_secret_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down
Loading