feat: update controller versions (#90)

open-component-model · Sep 11, 2023 · 3644d70 · 3644d70
1 parent 515f24b
commit 3644d70
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 24 deletions.
diff --git a/e2e-cli/main_test.go b/e2e-cli/main_test.go
@@ -69,14 +69,15 @@ func retrieveBootStrapConfigVars() (string, string, error) {
 func bootstrapGithub(owner, token string) (*bootstrap.GithubCmd, error) {
 	ctx := context.Background()
 	bootstrapGithubCmd := bootstrap.GithubCmd{
-		Owner:              owner,
-		Repository:         repository,
-		Token:              token,
-		Path:               targetPath,
-		Registry:           registry,
-		Components:         env.Components,
-		DockerconfigPath:   cfg.DockerconfigPath,
-		DestructiveActions: true,
+		Owner:                         owner,
+		Repository:                    repository,
+		Token:                         token,
+		Path:                          targetPath,
+		Registry:                      registry,
+		Components:                    env.Components,
+		DockerconfigPath:              cfg.DockerconfigPath,
+		DestructiveActions:            true,
+		GenerateSelfSignedCertificate: true,
 	}
 
 	// set kubeconfig
@@ -107,17 +108,18 @@ func bootstrapGithub(owner, token string) (*bootstrap.GithubCmd, error) {
 func bootstrapGitea(owner, token, hostname string) (*bootstrap.GiteaCmd, error) {
 	ctx := context.Background()
 	bootstrapGiteaCmd := bootstrap.GiteaCmd{
-		Owner:              owner,
-		Repository:         repository,
-		Token:              token,
-		Hostname:           hostname,
-		Personal:           true,
-		Path:               targetPath,
-		Registry:           registry,
-		TestURL:            fmt.Sprintf("http://%s/%s/%s", defautHostname, owner, repository),
-		Components:         env.Components,
-		DockerconfigPath:   cfg.DockerconfigPath,
-		DestructiveActions: true,
+		Owner:                         owner,
+		Repository:                    repository,
+		Token:                         token,
+		Hostname:                      hostname,
+		Personal:                      true,
+		Path:                          targetPath,
+		Registry:                      registry,
+		TestURL:                       fmt.Sprintf("http://%s/%s/%s", defautHostname, owner, repository),
+		Components:                    env.Components,
+		DockerconfigPath:              cfg.DockerconfigPath,
+		DestructiveActions:            true,
+		GenerateSelfSignedCertificate: true,
 	}
 
 	// set kubeconfig

diff --git a/e2e-cli/suite_test.go b/e2e-cli/suite_test.go
@@ -66,6 +66,8 @@ func TestMain(m *testing.M) {
 
 	testEnv.Setup(
 		envfuncs.CreateKindCluster(kindClusterName),
+		envfuncs.CreateNamespace("ocm-system"),
+		envfuncs.CreateNamespace("mpas-system"),
 		envfuncs.CreateNamespace(namespace),
 		shared.StartGitServer(namespace),
 		shared.ForwardPortForAppName("gitea", 3000, stopChannelGitea),

diff --git a/internal/env/env.go b/internal/env/env.go
@@ -14,15 +14,15 @@ const (
 	// DefaultFluxVer is the default version of the flux component.
 	DefaultFluxVer = "v2.1.0"
 	// DefaultOcmControllerVer is the default version of the ocm-controller component.
-	DefaultOcmControllerVer = "v0.12.0"
+	DefaultOcmControllerVer = "v0.12.2"
 	// DefaultGitControllerVer is the default version of the git-controller component.
-	DefaultGitControllerVer = "v0.7.0"
+	DefaultGitControllerVer = "v0.7.1"
 	// DefaultReplicationVer is the default version of the replication-controller component.
-	DefaultReplicationVer = "v0.6.1"
+	DefaultReplicationVer = "v0.6.2"
 	// DefaultMpasProductControllerVer is the default version of the mpas-product-controller component.
-	DefaultMpasProductControllerVer = "v0.3.2"
+	DefaultMpasProductControllerVer = "v0.3.3"
 	// DefaultMpasProjectControllerVer is the default version of the mpas-project-controller component.
-	DefaultMpasProjectControllerVer = "v0.1.1"
+	DefaultMpasProjectControllerVer = "v0.1.2"
 	// DefaultOcmCliVer is the default version of the ocm-cli component.
 	DefaultOcmCliVer = "v0.3.0"
 )