Fix apache#497: upgrade to knative eventing 0.3.0

jboss-fuse · May 21, 2019 · ef0d3b7 · ef0d3b7
1 parent d682f65
commit ef0d3b7
Show file tree

Hide file tree

Showing 1,294 changed files with 88,319 additions and 37,678 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -6,10 +6,37 @@ required = [
   "k8s.io/code-generator/cmd/client-gen",
   "k8s.io/code-generator/cmd/lister-gen",
   "k8s.io/code-generator/cmd/informer-gen",
-  "k8s.io/code-generator/cmd/openapi-gen",
+  "k8s.io/kube-openapi/cmd/openapi-gen",
   "k8s.io/gengo/args",
 ]
 
+# Align K8S resources to operator-sdk
+[[override]]
+  name = "k8s.io/api"
+  version = "kubernetes-1.13.1"
+
+[[override]]
+  name = "k8s.io/apimachinery"
+  version = "kubernetes-1.13.1"
+
+[[override]]
+  name = "k8s.io/code-generator"
+  version = "kubernetes-1.13.1"
+
+[[override]]
+  name = "k8s.io/client-go"
+  version = "kubernetes-1.13.1"
+
+# Align controller-runtime to operator-sdk
+[[override]]
+  name = "sigs.k8s.io/controller-runtime"
+  version = "=v0.1.10"
+
+# Override prometheus client to match version required by controller-runtime
+[[override]]
+  name = "github.com/prometheus/client_golang"
+  version = "=0.9.0"
+
 [[constraint]]
   name = "github.com/operator-framework/operator-sdk"
   # The version rule is used for a specific release and the master branch for in between releases.
@@ -20,6 +47,10 @@ required = [
   name = "github.com/coreos/prometheus-operator"
   version = "0.27.0"
 
+[[constraint]]
+  name = "github.com/knative/eventing"
+  version = "0.3.0"
+
 [prune]
   go-tests = true
   non-go = true

diff --git a/pkg/util/kubernetes/collection.go b/pkg/util/kubernetes/collection.go
@@ -219,10 +219,6 @@ func (c *Collection) VisitKnativeConfigurationSpec(visitor func(container *servi
 			c := &s.Spec.RunLatest.Configuration
 			visitor(c)
 		}
-		if s.Spec.Pinned != nil {
-			c := &s.Spec.Pinned.Configuration
-			visitor(c)
-		}
 		if s.Spec.Release != nil {
 			c := &s.Spec.Release.Configuration
 			visitor(c)

diff --git a/pkg/util/kubernetes/replace.go b/pkg/util/kubernetes/replace.go
@@ -95,7 +95,7 @@ func mapRequiredRouteData(from runtime.Object, to runtime.Object) {
 func mapRequiredKnativeData(from runtime.Object, to runtime.Object) {
 	if fromC, ok := from.(*eventing.Subscription); ok {
 		if toC, ok := to.(*eventing.Subscription); ok {
-			toC.Spec.Generation = fromC.Spec.Generation
+			toC.Spec.DeprecatedGeneration = fromC.Spec.DeprecatedGeneration
 		}
 	}
 }

diff --git a/vendor/cloud.google.com/go/asset/apiv1beta1/asset_client.go b/vendor/cloud.google.com/go/asset/apiv1beta1/asset_client.go
diff --git a/vendor/cloud.google.com/go/asset/apiv1beta1/doc.go b/vendor/cloud.google.com/go/asset/apiv1beta1/doc.go
diff --git a/vendor/cloud.google.com/go/asset/v1beta1/asset_client.go b/vendor/cloud.google.com/go/asset/v1beta1/asset_client.go
diff --git a/vendor/cloud.google.com/go/asset/v1beta1/doc.go b/vendor/cloud.google.com/go/asset/v1beta1/doc.go
diff --git a/vendor/cloud.google.com/go/bigquery/bigquery.go b/vendor/cloud.google.com/go/bigquery/bigquery.go
diff --git a/vendor/cloud.google.com/go/bigquery/datatransfer/apiv1/data_transfer_client.go b/vendor/cloud.google.com/go/bigquery/datatransfer/apiv1/data_transfer_client.go
diff --git a/vendor/cloud.google.com/go/bigquery/datatransfer/apiv1/doc.go b/vendor/cloud.google.com/go/bigquery/datatransfer/apiv1/doc.go
diff --git a/vendor/cloud.google.com/go/bigquery/doc.go b/vendor/cloud.google.com/go/bigquery/doc.go
diff --git a/vendor/cloud.google.com/go/bigquery/job.go b/vendor/cloud.google.com/go/bigquery/job.go
diff --git a/vendor/cloud.google.com/go/bigquery/params.go b/vendor/cloud.google.com/go/bigquery/params.go