Merge pull request #161 from weaveworks/fix-sealed-secrets-installati…

…on-order Install Sealed Secrets CRD before controller
weaveworks · Mar 30, 2020 · 7fec655 · 7fec655
2 parents fbefdd4 + 6490948
commit 7fec655
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 15 deletions.
diff --git a/pkg/apis/wksprovider/controller/manifests/yaml/05_sealed_secret_crd.yaml b/pkg/apis/wksprovider/controller/manifests/yaml/05_sealed_secret_crd.yaml
@@ -0,0 +1,14 @@
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: sealedsecrets.bitnami.com
+spec:
+  group: bitnami.com
+  names:
+    kind: SealedSecret
+    listKind: SealedSecretList
+    plural: sealedsecrets
+    singular: sealedsecret
+  scope: Namespaced
+  version: v1alpha1
diff --git a/...sts/yaml/05_sealed_secret_controller.yaml → ...sts/yaml/06_sealed_secret_controller.yaml b/...sts/yaml/05_sealed_secret_controller.yaml → ...sts/yaml/06_sealed_secret_controller.yaml
@@ -104,20 +104,6 @@ spec:
       - emptyDir: {}
         name: tmp
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  name: sealedsecrets.bitnami.com
-spec:
-  group: bitnami.com
-  names:
-    kind: SealedSecret
-    listKind: SealedSecretList
-    plural: sealedsecrets
-    singular: sealedsecret
-  scope: Namespaced
-  version: v1alpha1
----
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: RoleBinding
 metadata:

diff --git a/pkg/plan/recipe/install_plans.go b/pkg/plan/recipe/install_plans.go
@@ -269,15 +269,29 @@ func BuildCNIPlan(cni string, manifests [][]byte) plan.Resource {
 //BuildSealedSecretPlan creates a sub-plan to install sealed secrets so we can check secrets into GitHub for GitOps
 func BuildSealedSecretPlan(sealedSecretVersion, ns string, manifest []byte) plan.Resource {
 	b := plan.NewBuilder()
+	fileCRD, err := manifests.Manifests.Open("05_sealed_secret_crd.yaml")
+	if err != nil {
+		log.Fatalf("%v", err)
+	}
+	manifestbytesCRD, err := ioutil.ReadAll(fileCRD)
+	if err != nil {
+		log.Fatalf("%v", err)
+	}
+
+	b.AddResource("install:sealed-secret-crd",
+		&resource.KubectlApply{Manifest: manifestbytesCRD, Filename: object.String("SealedSecretCRD.yaml"),
+			WaitCondition: "condition=Established"})
+
 	b.AddResource("install:sealed-secrets-key", &resource.KubectlApply{Manifest: manifest})
-	file, err := manifests.Manifests.Open("05_sealed_secret_controller.yaml")
+	file, err := manifests.Manifests.Open("06_sealed_secret_controller.yaml")
 	if err != nil {
 		log.Fatalf("%v", err)
 	}
 	manifestbytes, err := ioutil.ReadAll(file)
 	if err != nil {
 		log.Fatalf("%v", err)
 	}
+
 	b.AddResource("install:sealed-secrets-controller",
 		&resource.KubectlApply{Manifest: manifestbytes, Filename: object.String("SealedSecretController.yaml")},
 		plan.DependOn("install:sealed-secrets-key"))