Change the structure of kodata and read the yamls with the version (#115

)
knative · Jun 1, 2020 · d04dd33 · d04dd33
1 parent 722da9f
commit d04dd33
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 4 deletions.
diff --git a/...r/kodata/knative-eventing/1-eventing.yaml → ...a/knative-eventing/0.14.2/1-eventing.yaml b/...r/kodata/knative-eventing/1-eventing.yaml → ...a/knative-eventing/0.14.2/1-eventing.yaml
diff --git a/...native-eventing/2-upgrade-to-v0.14.2.yaml → ...eventing/0.14.2/2-upgrade-to-v0.14.2.yaml b/...native-eventing/2-upgrade-to-v0.14.2.yaml → ...eventing/0.14.2/2-upgrade-to-v0.14.2.yaml
diff --git a/...odata/knative-serving/1-serving-crds.yaml → ...native-serving/0.14.0/1-serving-crds.yaml b/...odata/knative-serving/1-serving-crds.yaml → ...native-serving/0.14.0/1-serving-crds.yaml
diff --git a/...odata/knative-serving/2-serving-core.yaml → ...native-serving/0.14.0/2-serving-core.yaml b/...odata/knative-serving/2-serving-core.yaml → ...native-serving/0.14.0/2-serving-core.yaml
diff --git a/...kodata/knative-serving/3-serving-hpa.yaml → ...knative-serving/0.14.0/3-serving-hpa.yaml b/...kodata/knative-serving/3-serving-hpa.yaml → ...knative-serving/0.14.0/3-serving-hpa.yaml
diff --git a/...r/kodata/knative-serving/4-net-istio.yaml → ...a/knative-serving/0.14.0/4-net-istio.yaml b/...r/kodata/knative-serving/4-net-istio.yaml → ...a/knative-serving/0.14.0/4-net-istio.yaml
diff --git a/pkg/reconciler/knativeeventing/controller.go b/pkg/reconciler/knativeeventing/controller.go
@@ -30,6 +30,7 @@ import (
 	knereconciler "knative.dev/operator/pkg/client/injection/reconciler/operator/v1alpha1/knativeeventing"
 	"knative.dev/operator/pkg/reconciler"
 	"knative.dev/operator/pkg/reconciler/common"
+	"knative.dev/operator/version"
 	kubeclient "knative.dev/pkg/client/injection/kube/client"
 	deploymentinformer "knative.dev/pkg/client/injection/kube/informers/apps/v1/deployment"
 	"knative.dev/pkg/configmap"
@@ -52,7 +53,7 @@ func NewController(ctx context.Context, cmw configmap.Watcher) *controller.Impl
 	}
 
 	koDataDir := os.Getenv("KO_DATA_PATH")
-	config, err := mfc.NewManifest(filepath.Join(koDataDir, "knative-eventing/"),
+	config, err := mfc.NewManifest(filepath.Join(koDataDir, "knative-eventing", version.EventingVersion),
 		injection.GetConfig(ctx),
 		mf.UseLogger(zapr.NewLogger(logger.Desugar()).WithName("manifestival")))
 	if err != nil {

diff --git a/pkg/reconciler/knativeserving/controller.go b/pkg/reconciler/knativeserving/controller.go
@@ -37,6 +37,7 @@ import (
 	"knative.dev/operator/pkg/reconciler"
 	"knative.dev/operator/pkg/reconciler/common"
 	servingcommon "knative.dev/operator/pkg/reconciler/knativeserving/common"
+	"knative.dev/operator/version"
 	deploymentinformer "knative.dev/pkg/client/injection/kube/informers/apps/v1/deployment"
 	"knative.dev/pkg/configmap"
 	"knative.dev/pkg/controller"
@@ -65,7 +66,7 @@ func NewController(ctx context.Context, cmw configmap.Watcher) *controller.Impl
 	}
 
 	koDataDir := os.Getenv("KO_DATA_PATH")
-	config, err := mfc.NewManifest(filepath.Join(koDataDir, "knative-serving/"),
+	config, err := mfc.NewManifest(filepath.Join(koDataDir, "knative-serving", version.ServingVersion),
 		injection.GetConfig(ctx),
 		mf.UseLogger(zapr.NewLogger(logger.Desugar()).WithName("manifestival")))
 	if err != nil {

diff --git a/version/version_test.go b/version/version_test.go
@@ -25,7 +25,7 @@ import (
 
 func TestManifestVersionServingSame(t *testing.T) {
 	_, b, _, _ := runtime.Caller(0)
-	manifest, err := mf.NewManifest(filepath.Join(filepath.Dir(b)+"/..", "cmd/operator/kodata/knative-serving/"))
+	manifest, err := mf.NewManifest(filepath.Join(filepath.Dir(b)+"/..", "cmd/operator/kodata/knative-serving", ServingVersion))
 	if err != nil {
 		t.Fatal("Failed to load manifest", err)
 	}
@@ -45,7 +45,7 @@ func TestManifestVersionServingSame(t *testing.T) {
 
 func TestManifestVersionEventingSame(t *testing.T) {
 	_, b, _, _ := runtime.Caller(0)
-	manifest, err := mf.NewManifest(filepath.Join(filepath.Dir(b)+"/..", "cmd/operator/kodata/knative-eventing/"))
+	manifest, err := mf.NewManifest(filepath.Join(filepath.Dir(b)+"/..", "cmd/operator/kodata/knative-eventing", EventingVersion))
 	if err != nil {
 		t.Fatal("Failed to load manifest", err)
 	}