Merge pull request #15 from RafalKorepta/rk/fix/cert-manager-version

Fix cert manager version
alenkacz · Feb 9, 2023 · e625e50 · e625e50
2 parents 7dec77a + 9c4f21a
commit e625e50
Show file tree

Hide file tree

Showing 36 changed files with 66,319 additions and 225,742 deletions.
diff --git a/pkg/cmd/verify/deployments.go b/pkg/cmd/verify/deployments.go
@@ -100,7 +100,7 @@ func (o *Options) Execute() error {
 	if result.CertificateError != nil {
 		logrus.
 			Infof("error when waiting for certificate to be ready: %v\n", result.CertificateError)
-		return err
+		return result.CertificateError
 	}
 	logrus.Info("ヽ(•‿•)ノ Cert-manager is READY!\n")
 	return nil

diff --git a/pkg/verify/certificate.go b/pkg/verify/certificate.go
@@ -3,9 +3,10 @@ package verify
 import (
 	"context"
 	"fmt"
-	"github.com/sirupsen/logrus"
 	"strings"
 
+	"github.com/sirupsen/logrus"
+
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -52,7 +53,7 @@ func WaitForTestCertificate(ctx context.Context, dynamicClient dynamic.Interface
 }
 
 func getGroupVersion(cmVersion string) (string, string) {
-	if strings.HasPrefix(cmVersion, "v1.0") {
+	if strings.HasPrefix(cmVersion, "v1.") {
 		return defaultGroup, defaultVersion
 	} else {
 		return defaultGroup, "v1alpha2"

diff --git a/test/e2e/verify-1.0.0/cert-manager/cert-manager.yaml b/test/e2e/verify-1.0.0/cert-manager/cert-manager.yaml
diff --git a/test/e2e/verify-1.10.0-alpha.0/01-verify.yaml b/test/e2e/verify-1.10.0-alpha.0/01-verify.yaml
diff --git a/test/e2e/verify-1.10.0-alpha.0/cert-manager/cert-manager.yaml b/test/e2e/verify-1.10.0-alpha.0/cert-manager/cert-manager.yaml
diff --git a/test/e2e/verify-1.0.0/00-install.yaml → test/e2e/verify-1.10.0/00-install.yaml b/test/e2e/verify-1.0.0/00-install.yaml → test/e2e/verify-1.10.0/00-install.yaml
diff --git a/test/e2e/verify-1.0.0/01-verify.yaml → test/e2e/verify-1.10.0/01-verify.yaml b/test/e2e/verify-1.0.0/01-verify.yaml → test/e2e/verify-1.10.0/01-verify.yaml
diff --git a/test/e2e/verify-1.0.0/02-delete.yaml → test/e2e/verify-1.10.0/02-delete.yaml b/test/e2e/verify-1.0.0/02-delete.yaml → test/e2e/verify-1.10.0/02-delete.yaml
diff --git a/test/e2e/verify-1.10.0/cert-manager/cert-manager.yaml b/test/e2e/verify-1.10.0/cert-manager/cert-manager.yaml
diff --git a/test/e2e/verify-1.1.0/00-install.yaml → test/e2e/verify-1.11.0/00-install.yaml b/test/e2e/verify-1.1.0/00-install.yaml → test/e2e/verify-1.11.0/00-install.yaml
diff --git a/test/e2e/verify-1.1.0/01-verify.yaml → test/e2e/verify-1.11.0/01-verify.yaml b/test/e2e/verify-1.1.0/01-verify.yaml → test/e2e/verify-1.11.0/01-verify.yaml
diff --git a/test/e2e/verify-1.1.0/02-delete.yaml → test/e2e/verify-1.11.0/02-delete.yaml b/test/e2e/verify-1.1.0/02-delete.yaml → test/e2e/verify-1.11.0/02-delete.yaml
diff --git a/test/e2e/verify-1.11.0/cert-manager/cert-manager.yaml b/test/e2e/verify-1.11.0/cert-manager/cert-manager.yaml
diff --git a/test/e2e/verify-1.2.0/cert-manager/cert-manager.yaml b/test/e2e/verify-1.2.0/cert-manager/cert-manager.yaml
diff --git a/...e2e/verify-1.10.0-alpha.0/00-install.yaml → test/e2e/verify-1.3.3/00-install.yaml b/...e2e/verify-1.10.0-alpha.0/00-install.yaml → test/e2e/verify-1.3.3/00-install.yaml
diff --git a/.../verify-1.7.3/verify-1.6.3/01-verify.yaml → test/e2e/verify-1.3.3/01-verify.yaml b/.../verify-1.7.3/verify-1.6.3/01-verify.yaml → test/e2e/verify-1.3.3/01-verify.yaml
@@ -1,4 +1,4 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
-  - command: ./../../../bin/cm-verifier
+  - command: ./../../../bin/cm-verifier --debug
diff --git a/.../e2e/verify-1.10.0-alpha.0/02-delete.yaml → test/e2e/verify-1.3.3/02-delete.yaml b/.../e2e/verify-1.10.0-alpha.0/02-delete.yaml → test/e2e/verify-1.3.3/02-delete.yaml
diff --git a/...rify-1.1.0/cert-manager/cert-manager.yaml → ...rify-1.3.3/cert-manager/cert-manager.yaml b/...rify-1.1.0/cert-manager/cert-manager.yaml → ...rify-1.3.3/cert-manager/cert-manager.yaml
diff --git a/test/e2e/verify-1.4.4/01-verify.yaml b/test/e2e/verify-1.4.4/01-verify.yaml
@@ -1,4 +1,4 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
-  - command: ./../../../bin/cm-verifier
+  - command: ./../../../bin/cm-verifier --debug
diff --git a/test/e2e/verify-1.4.4/cert-manager/cert-manager.yaml b/test/e2e/verify-1.4.4/cert-manager/cert-manager.yaml
diff --git a/test/e2e/verify-1.5.5/01-verify.yaml b/test/e2e/verify-1.5.5/01-verify.yaml
@@ -1,4 +1,4 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
-  - command: ./../../../bin/cm-verifier
+  - command: ./../../../bin/cm-verifier --debug
diff --git a/test/e2e/verify-1.5.5/cert-manager/cert-manager.yaml b/test/e2e/verify-1.5.5/cert-manager/cert-manager.yaml
diff --git a/test/e2e/verify-1.2.0/00-install.yaml → test/e2e/verify-1.6.3/00-install.yaml b/test/e2e/verify-1.2.0/00-install.yaml → test/e2e/verify-1.6.3/00-install.yaml
@@ -1,4 +1,8 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
+  - command: pwd
+  - command: ls -al cert-manager
+  - command: ls -al .
+  - command: cat cert-manager/cert-manager.yaml
   - command: kubectl apply --validate=false -f cert-manager/cert-manager.yaml
diff --git a/test/e2e/verify-1.2.0/01-verify.yaml → test/e2e/verify-1.6.3/01-verify.yaml b/test/e2e/verify-1.2.0/01-verify.yaml → test/e2e/verify-1.6.3/01-verify.yaml
@@ -1,4 +1,4 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
-  - command: ./../../../bin/cm-verifier
+  - command: ./../../../bin/cm-verifier --debug
diff --git a/test/e2e/verify-1.2.0/02-delete.yaml → test/e2e/verify-1.6.3/02-delete.yaml b/test/e2e/verify-1.2.0/02-delete.yaml → test/e2e/verify-1.6.3/02-delete.yaml
diff --git a/test/e2e/verify-1.6.3/cert-manager/cert-manager.yaml b/test/e2e/verify-1.6.3/cert-manager/cert-manager.yaml
diff --git a/test/e2e/verify-1.7.3/01-verify.yaml b/test/e2e/verify-1.7.3/01-verify.yaml
@@ -1,4 +1,4 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
-  - command: ./../../../bin/cm-verifier
+  - command: ./../../../bin/cm-verifier --debug
diff --git a/test/e2e/verify-1.7.3/cert-manager/cert-manager.yaml b/test/e2e/verify-1.7.3/cert-manager/cert-manager.yaml
diff --git a/test/e2e/verify-1.7.3/verify-1.6.3/00-install.yaml b/test/e2e/verify-1.7.3/verify-1.6.3/00-install.yaml
diff --git a/test/e2e/verify-1.7.3/verify-1.6.3/02-delete.yaml b/test/e2e/verify-1.7.3/verify-1.6.3/02-delete.yaml