added installedCRDs

esierra-stratio · May 24, 2024 · 2cfdc44 · 2cfdc44
1 parent f02ed95
commit 2cfdc44
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 2 deletions.
diff --git a/...er/internal/create/actions/createworker/templates/common/28/cert-manager-helm-values.tmpl b/...er/internal/create/actions/createworker/templates/common/28/cert-manager-helm-values.tmpl
@@ -1,3 +1,4 @@
+installCRDs: true
 image:
   repository: {{ if $.Private }}{{ $.KeosRegUrl }}{{ else }}quay.io{{ end }}/jetstack/cert-manager-controller
 acmesolver:

diff --git a/...er/internal/create/actions/createworker/templates/common/29/cert-manager-helm-values.tmpl b/...er/internal/create/actions/createworker/templates/common/29/cert-manager-helm-values.tmpl
@@ -1,3 +1,4 @@
+installCRDs: true
 image:
   repository: {{ if $.Private }}{{ $.KeosRegUrl }}{{ else }}quay.io{{ end }}/jetstack/cert-manager-controller
 acmesolver:

diff --git a/...er/internal/create/actions/createworker/templates/common/30/cert-manager-helm-values.tmpl b/...er/internal/create/actions/createworker/templates/common/30/cert-manager-helm-values.tmpl
@@ -1,3 +1,4 @@
+installCRDs: true
 image:
   repository: {{ if $.Private }}{{ $.KeosRegUrl }}{{ else }}quay.io{{ end }}/jetstack/cert-manager-controller
 acmesolver:

diff --git a/pkg/commons/cluster.go b/pkg/commons/cluster.go
@@ -461,7 +461,6 @@ func GetClusterDescriptor(descriptorPath string) (*KeosCluster, *ClusterConfig,
 				if err != nil {
 					return nil, nil, err
 				}
-
 				err = validate.Struct(clusterConfig)
 				if err != nil {
 					return nil, nil, err

diff --git a/pkg/commons/utils.go b/pkg/commons/utils.go
@@ -246,7 +246,7 @@ func ExecuteCommand(n nodes.Node, command string, timeout int, retries int, envV
 	if len(envVars) > 0 {
 		cmd.SetEnv(envVars[0]...)
 	}
-	retryConditions := []string{"dial tcp: lookup", "NotFound", "context deadline exceeded", "timed out waiting for the condition on"}
+	retryConditions := []string{"dial tcp: lookup", "NotFound", "context deadline exceeded", "timed out waiting for the condition"}
 	provisionCommands := strings.Contains(command, "kubectl") || strings.Contains(command, "helm") || strings.Contains(command, "clusterctl")
 	for i := 0; i < retries; i++ {
 		raw = bytes.Buffer{}