Fix version issue for Knative Eventing after removing version directory

knative · May 28, 2020 · 7746d6b · 7746d6b
1 parent 2ac14e1
commit 7746d6b
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 12 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/pkg/reconciler/knativeeventing/controller.go b/pkg/reconciler/knativeeventing/controller.go
@@ -52,7 +52,12 @@ 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/"),
+	version, err := common.GetLatestRelease("knative-eventing")
+	if err != nil {
+		logger.Fatalw("Failed to find the latest release of Knative Eventing", zap.Error(err))
+		version = "0.14.2"
+	}
+	config, err := mfc.NewManifest(filepath.Join(koDataDir, "knative-eventing/"+version),
 		injection.GetConfig(ctx),
 		mf.UseLogger(zapr.NewLogger(logger.Desugar()).WithName("manifestival")))
 	if err != nil {

diff --git a/pkg/reconciler/knativeeventing/knativeeventing.go b/pkg/reconciler/knativeeventing/knativeeventing.go
@@ -31,7 +31,6 @@ import (
 	knereconciler "knative.dev/operator/pkg/client/injection/reconciler/operator/v1alpha1/knativeeventing"
 	"knative.dev/operator/pkg/reconciler/common"
 	kec "knative.dev/operator/pkg/reconciler/knativeeventing/common"
-	"knative.dev/operator/version"
 	"knative.dev/pkg/logging"
 	pkgreconciler "knative.dev/pkg/reconciler"
 )
@@ -148,7 +147,11 @@ func (r *Reconciler) ensureFinalizerRemoval(_ context.Context, _ *mf.Manifest, i
 func (r *Reconciler) install(ctx context.Context, manifest *mf.Manifest, ke *eventingv1alpha1.KnativeEventing) error {
 	logger := logging.FromContext(ctx)
 	logger.Debug("Installing manifest")
-	return common.Install(manifest, version.EventingVersion, &ke.Status)
+	version, err := common.GetLatestRelease("knative-eventing")
+	if err != nil {
+		return err
+	}
+	return common.Install(manifest, version, &ke.Status)
 }
 
 func (r *Reconciler) checkDeployments(ctx context.Context, manifest *mf.Manifest, ke *eventingv1alpha1.KnativeEventing) error {

diff --git a/pkg/reconciler/knativeserving/knativeserving.go b/pkg/reconciler/knativeserving/knativeserving.go
@@ -19,19 +19,20 @@ package knativeserving
 import (
 	"context"
 	"fmt"
-	mf "github.com/manifestival/manifestival"
-	clientset "knative.dev/operator/pkg/client/clientset/versioned"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes"
+
+	mf "github.com/manifestival/manifestival"
+
+	"knative.dev/pkg/logging"
+	pkgreconciler "knative.dev/pkg/reconciler"
 	servingv1alpha1 "knative.dev/operator/pkg/apis/operator/v1alpha1"
 	knsreconciler "knative.dev/operator/pkg/client/injection/reconciler/operator/v1alpha1/knativeserving"
+	clientset "knative.dev/operator/pkg/client/clientset/versioned"
 	"knative.dev/operator/pkg/reconciler/common"
 	ksc "knative.dev/operator/pkg/reconciler/knativeserving/common"
-	"knative.dev/pkg/logging"
-
-	pkgreconciler "knative.dev/pkg/reconciler"
 )
 
 const (
@@ -152,17 +153,18 @@ func (r *Reconciler) install(ctx context.Context, manifest *mf.Manifest, instanc
 	logger.Debug("Installing manifest")
 
 	version := instance.Spec.GetVersion()
-    var err error = nil
+
 	if version == "" {
 		version = instance.Status.GetVersion()
 	}
 
 	if version == "" {
+		var err error = nil
 		version, err = common.GetLatestRelease("knative-serving")
-	}
 
-	if err != nil {
-		return err
+		if err != nil {
+			return err
+		}
 	}
 
 	return common.Install(manifest, version, &instance.Status)