Deploy action fix (#219)

* fix deploy * test * revert change for test * Debug install * better debug * sleep * set namespace * test this * check deployment status * remove duplicate check * sleep again * back to pod check * app-crd fix * try this * fix crd * namespace * fix deploy Co-authored-by: Justin Thompson <[email protected]>
weaveworks · May 28, 2021 · 37b179f · 37b179f
1 parent 9b4a857
commit 37b179f
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 35 deletions.
diff --git a/config/crd/app-crd.yaml b/config/crd/app-crd.yaml
@@ -1,4 +1,4 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: wego.app.crd
@@ -10,20 +10,22 @@ spec:
     listKind: AppList
     plural: apps
     singular: app
-  subresources:
-    status: {}
-  validation:
-    openAPIV3Schema:
-      required: ["spec"]
-      properties:
-        spec:
-          required: ["url"]
-          properties:
-            url:
-              type: "string"
-              minimum: 1
-              maximum: 1
   versions:
     - name: v1alpha1
+      subresources:
+        status: {}
+      schema:
+        openAPIV3Schema:
+          required: ["spec"]
+          properties:
+            spec:
+              type: object
+              required: ["url"]
+              properties:
+                url:
+                  type: "string"
+                  minimum: 1
+                  maximum: 1
+          type: object
       served: true
       storage: true
diff --git a/pkg/cmdimpl/manifests/app-crd.yaml b/pkg/cmdimpl/manifests/app-crd.yaml
@@ -1,4 +1,4 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: apps.wego.weave.works
@@ -10,26 +10,27 @@ spec:
     listKind: ApplicationList
     plural: apps
     singular: app
-  subresources:
-    status: {}
-  validation:
-    openAPIV3Schema:
-      required: ["spec"]
-      properties:
-        spec:
-          required: ["url", "path"]
-          properties:
-            url:
-              type: "string"
-              minimum: 1
-              maximum: 1
-            path:
-              type: "string"
-              minimum: 1
-              maximum: 1
-  version: v1alpha1
   versions:
     - name: v1alpha1
+      subresources:
+        status: {}
+      schema:
+        openAPIV3Schema:
+          required: ["spec"]
+          properties:
+            spec:
+              type: object
+              required: ["url", "path"]
+              properties:
+                url:
+                  type: "string"
+                  minimum: 1
+                  maximum: 1
+                path:
+                  type: "string"
+                  minimum: 1
+                  maximum: 1
+          type: object
       served: true
       storage: true
 ---
diff --git a/test/acceptance/test/core_operations_test.go b/test/acceptance/test/core_operations_test.go
@@ -76,6 +76,7 @@ var _ = Describe("WEGO Acceptance Tests", func() {
 		})
 
 		By("And I have a brand new cluster", func() {
+			namespace = "wego-system"
 			_, err := ResetOrCreateCluster(namespace)
 			Expect(err).ShouldNot(HaveOccurred())
 		})
@@ -84,7 +85,7 @@ var _ = Describe("WEGO Acceptance Tests", func() {
 			Expect(setupTest()).Should(Succeed())
 			Expect(ensureWegoRepoIsAbsent()).Should(Succeed())
 
-			//Install wego
+			// Install wego
 			command := exec.Command("sh", "-c", fmt.Sprintf("%s install | kubectl apply -f -", WEGO_BIN_PATH))
 			session, err = gexec.Start(command, GinkgoWriter, GinkgoWriter)
 			Expect(err).ShouldNot(HaveOccurred())
@@ -254,7 +255,7 @@ func waitForNginxDeployment() error {
 func waitForFluxInstall() error {
 	for i := 1; i < 11; i++ {
 		log.Infof("Waiting for flux... try: %d of 10\n", i)
-		err := utils.CallCommandForEffectWithDebug("kubectl get customresourcedefinition buckets.source.toolkit.fluxcd.io")
+		err := utils.CallCommandForEffect("kubectl get customresourcedefinition buckets.source.toolkit.fluxcd.io")
 		if err == nil {
 			return nil
 		}