Remove clusteringress from source (knative#5665)

* remove clusteringress resources in routereconcile loop * Remove clusteringress from source * Remove dead function 'ensureFinalizer' * re-run update-codegen.sh * Rollback DefaultIngressClassKey to 'clusteringress.class' since it is a breaking change. We will be depreciated in a follow up PR. * undo change to reinstate clusteringress role rules
danielqsj · Sep 28, 2019 · ec457ad · ec457ad
1 parent 3174fce
commit ec457ad
Show file tree

Hide file tree

Showing 76 changed files with 524 additions and 3,109 deletions.
diff --git a/cmd/networking/istio/main.go b/cmd/networking/istio/main.go
@@ -17,14 +17,12 @@ limitations under the License.
 package main
 
 import (
-	"knative.dev/serving/pkg/reconciler/clusteringress"
 	"knative.dev/serving/pkg/reconciler/ingress"
 
 	// This defines the shared main for injected controllers.
 	"knative.dev/pkg/injection/sharedmain"
 )
 
 func main() {
-	sharedmain.Main("istiocontroller",
-		clusteringress.NewController, ingress.NewController)
+	sharedmain.Main("istiocontroller", ingress.NewController)
 }
diff --git a/cmd/webhook/main.go b/cmd/webhook/main.go
@@ -156,7 +156,6 @@ func main() {
 		autoscalingv1alpha1.SchemeGroupVersion.WithKind("PodAutoscaler"): &autoscalingv1alpha1.PodAutoscaler{},
 		autoscalingv1alpha1.SchemeGroupVersion.WithKind("Metric"):        &autoscalingv1alpha1.Metric{},
 		net.SchemeGroupVersion.WithKind("Certificate"):                   &net.Certificate{},
-		net.SchemeGroupVersion.WithKind("ClusterIngress"):                &net.ClusterIngress{},
 		net.SchemeGroupVersion.WithKind("Ingress"):                       &net.Ingress{},
 		net.SchemeGroupVersion.WithKind("ServerlessService"):             &net.ServerlessService{},
 	}

diff --git a/config/200-clusterrole-istio.yaml b/config/200-clusterrole-istio.yaml
@@ -15,7 +15,7 @@
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  # These are the permissions needed by the Istio ClusterIngress implementation.
+  # These are the permissions needed by the Istio Ingress implementation.
   name: knative-serving-istio
   labels:
     serving.knative.dev/release: devel

diff --git a/config/300-clusteringress.yaml b/config/300-clusteringress.yaml
diff --git a/config/config-network.yaml b/config/config-network.yaml
@@ -74,12 +74,12 @@ data:
     #
     istio.sidecar.includeOutboundIPRanges: "*"
 
-    # clusteringress.class specifies the default cluster ingress class
+    # clusteringress.class specifies the default ingress class
     # to use when not dictated by Route annotation.
     #
     # If not specified, will use the Istio ingress.
     #
-    # Note that changing the ClusterIngress class of an existing Route
+    # Note that changing the Ingress class of an existing Route
     # will result in undefined behavior.  Therefore it is best to only
     # update this value during the setup of Knative, to avoid getting
     # undefined behavior.

diff --git a/pkg/apis/networking/register.go b/pkg/apis/networking/register.go
@@ -21,7 +21,7 @@ const (
 	GroupName = "networking.internal.knative.dev"
 
 	// IngressClassAnnotationKey is the annotation for the
-	// explicit class of ClusterIngress that a particular resource has
+	// explicit class of Ingress that a particular resource has
 	// opted into. For example,
 	//
 	//    networking.knative.dev/ingress.class: some-network-impl
@@ -30,15 +30,11 @@ const (
 	// user-facing.
 	//
 	// The parent resource may use its own annotations to choose the
-	// annotation value for the ClusterIngress it uses.  Based on such
+	// annotation value for the Ingress it uses.  Based on such
 	// value a different reconciliation logic may be used (for examples,
-	// Istio-based ClusterIngress will reconcile into a VirtualService).
+	// Istio-based Ingress will reconcile into a VirtualService).
 	IngressClassAnnotationKey = "networking.knative.dev/ingress.class"
 
-	// ClusterIngressLabelKey is the label key attached to underlying network programming
-	// resources to indicate which ClusterIngress triggered their creation.
-	ClusterIngressLabelKey = GroupName + "/clusteringress"
-
 	// IngressLabelKey is the label key attached to underlying network programming
 	// resources to indicate which Ingress triggered their creation.
 	IngressLabelKey = GroupName + "/ingress"

diff --git a/pkg/apis/networking/v1alpha1/clusteringress_accessors.go b/pkg/apis/networking/v1alpha1/clusteringress_accessors.go
diff --git a/pkg/apis/networking/v1alpha1/clusteringress_accessors_test.go b/pkg/apis/networking/v1alpha1/clusteringress_accessors_test.go
diff --git a/pkg/apis/networking/v1alpha1/clusteringress_defaults.go b/pkg/apis/networking/v1alpha1/clusteringress_defaults.go