Replave v1beta1 with v1 and remove uses of flag 'use-ingress-class (#151)

Author: soneillf5

api/v1alpha1/nginxingresscontroller_types.go

@@ -64,9 +64,7 @@ type NginxIngressControllerSpec struct {
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
 	EnablePreviewPolicies bool `json:"enablePreviewPolicies"`
 	// A class of the Ingress controller. The Ingress controller only processes Ingress resources that belong to its
-	// class (in other words, have the annotation “kubernetes.io/ingress.class”).
-	// Additionally, the Ingress controller processes Ingress resources that do not have that annotation,
-	// which can be disabled by setting UseIngressClassOnly to true. Default is `nginx`.
+	// class (in other words, have the annotation “kubernetes.io/ingress.class”). Default is `nginx`.
 	// +kubebuilder:validation:Optional
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
 	IngressClass string `json:"ingressClass"`
@@ -75,10 +73,6 @@ type NginxIngressControllerSpec struct {
 	// +nullable
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
 	Service *Service `json:"service"`
-	// Ignore Ingress resources without the “kubernetes.io/ingress.class” annotation.
-	// +kubebuilder:validation:Optional
-	// +operator-sdk:csv:customresourcedefinitions:type=spec
-	UseIngressClassOnly bool `json:"useIngressClassOnly"`
 	// Namespace to watch for Ingress resources. By default the Ingress controller watches all namespaces.
 	// +kubebuilder:validation:Optional
 	// +operator-sdk:csv:customresourcedefinitions:type=spec

bundle/manifests/k8s.nginx.org_nginxingresscontrollers.yaml

@@ -135,10 +135,7 @@ spec:
               ingressClass:
                 description: A class of the Ingress controller. The Ingress controller
                   only processes Ingress resources that belong to its class (in other
-                  words, have the annotation “kubernetes.io/ingress.class”). Additionally,
-                  the Ingress controller processes Ingress resources that do not have
-                  that annotation, which can be disabled by setting UseIngressClassOnly
-                  to true. Default is `nginx`.
+                  words, have the annotation “kubernetes.io/ingress.class”). Default is `nginx`.
                 type: string
               logLevel:
                 description: Log level for V logs. Format is 0 - 3
@@ -263,10 +260,6 @@ spec:
                 - deployment
                 - daemonset
                 type: string
-              useIngressClassOnly:
-                description: Ignore Ingress resources without the “kubernetes.io/ingress.class”
-                  annotation.
-                type: boolean
               watchNamespace:
                 description: Namespace to watch for Ingress resources. By default
                   the Ingress controller watches all namespaces.

bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml

@@ -104,10 +104,7 @@ spec:
         path: image
       - description: A class of the Ingress controller. The Ingress controller only
           processes Ingress resources that belong to its class (in other words, have
-          the annotation “kubernetes.io/ingress.class”). Additionally, the Ingress
-          controller processes Ingress resources that do not have that annotation,
-          which can be disabled by setting UseIngressClassOnly to true. Default is
-          `nginx`.
+          the annotation “kubernetes.io/ingress.class”). Default is `nginx`.
         displayName: Ingress Class
         path: ingressClass
       - description: Log level for V logs. Format is 0 - 3
@@ -157,10 +154,6 @@ spec:
           or daemonset.
         displayName: Type
         path: type
-      - description: Ignore Ingress resources without the “kubernetes.io/ingress.class”
-          annotation.
-        displayName: Use Ingress Class Only
-        path: useIngressClassOnly
       - description: Namespace to watch for Ingress resources. By default the Ingress
           controller watches all namespaces.
         displayName: Watch Namespace

config/crd/bases/k8s.nginx.org_nginxingresscontrollers.yaml

@@ -137,10 +137,8 @@ spec:
               ingressClass:
                 description: A class of the Ingress controller. The Ingress controller
                   only processes Ingress resources that belong to its class (in other
-                  words, have the annotation “kubernetes.io/ingress.class”). Additionally,
-                  the Ingress controller processes Ingress resources that do not have
-                  that annotation, which can be disabled by setting UseIngressClassOnly
-                  to true. Default is `nginx`.
+                  words, have the annotation “kubernetes.io/ingress.class”). Default
+                  is `nginx`.
                 type: string
               logLevel:
                 description: Log level for V logs. Format is 0 - 3
@@ -265,10 +263,6 @@ spec:
                 - deployment
                 - daemonset
                 type: string
-              useIngressClassOnly:
-                description: Ignore Ingress resources without the “kubernetes.io/ingress.class”
-                  annotation.
-                type: boolean
               watchNamespace:
                 description: Namespace to watch for Ingress resources. By default
                   the Ingress controller watches all namespaces.

config/manifests/bases/nginx-ingress-operator.clusterserviceversion.yaml

@@ -82,10 +82,7 @@ spec:
         path: image
       - description: A class of the Ingress controller. The Ingress controller only
           processes Ingress resources that belong to its class (in other words, have
-          the annotation “kubernetes.io/ingress.class”). Additionally, the Ingress
-          controller processes Ingress resources that do not have that annotation,
-          which can be disabled by setting UseIngressClassOnly to true. Default is
-          `nginx`.
+          the annotation “kubernetes.io/ingress.class”). Default is `nginx`.
         displayName: Ingress Class
         path: ingressClass
       - description: Log level for V logs. Format is 0 - 3
@@ -135,10 +132,6 @@ spec:
           or daemonset.
         displayName: Type
         path: type
-      - description: Ignore Ingress resources without the “kubernetes.io/ingress.class”
-          annotation.
-        displayName: Use Ingress Class Only
-        path: useIngressClassOnly
       - description: Namespace to watch for Ingress resources. By default the Ingress
           controller watches all namespaces.
         displayName: Watch Namespace

controllers/ingressclass.go

@@ -2,7 +2,7 @@ package controllers
 
 import (
 	k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/api/v1alpha1"
-	networking "k8s.io/api/networking/v1beta1"
+	networking "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 

controllers/ingressclass_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/api/v1alpha1"
-	networking "k8s.io/api/networking/v1beta1"
+	networking "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 

controllers/utils.go

@@ -44,10 +44,6 @@ func generatePodArgs(instance *k8sv1alpha1.NginxIngressController) []string {
 		args = append(args, fmt.Sprintf("-ingress-class=%v", instance.Spec.IngressClass))
 	}
 
-	if instance.Spec.UseIngressClassOnly {
-		args = append(args, "-use-ingress-class-only")
-	}
-
 	if instance.Spec.WatchNamespace != "" {
 		args = append(args, fmt.Sprintf("-watch-namespace=%v", instance.Spec.WatchNamespace))
 	}

controllers/utils_test.go

@@ -199,11 +199,10 @@ func TestGeneratePodArgs(t *testing.T) {
 					Namespace: namespace,
 				},
 				Spec: k8sv1alpha1.NginxIngressControllerSpec{
-					NginxPlus:           true,
-					DefaultSecret:       "my-nginx-ingress/my-secret",
-					IngressClass:        "ingressClass",
-					UseIngressClassOnly: true,
-					WatchNamespace:      "default",
+					NginxPlus:      true,
+					DefaultSecret:  "my-nginx-ingress/my-secret",
+					IngressClass:   "ingressClass",
+					WatchNamespace: "default",
 					HealthStatus: &k8sv1alpha1.HealthStatus{
 						Enable: true,
 						URI:    "/healthz",
@@ -245,7 +244,6 @@ func TestGeneratePodArgs(t *testing.T) {
 				"-nginx-plus",
 				"-enable-app-protect",
 				"-ingress-class=ingressClass",
-				"-use-ingress-class-only",
 				"-watch-namespace=default",
 				"-health-status",
 				"-health-status-uri=/healthz",

docs/nginx-ingress-controller.md

@@ -46,7 +46,6 @@ spec:
    enablePreviewPolicies: false
    defaultSecret: my-nginx-ingress/default-secret
    ingressClass: my-nginx-ingress
-   useIngressClassOnly: true
    watchNamespace: default
    healthStatus:
      enable: true
@@ -87,9 +86,8 @@ spec:
 | `enableCRDs` | `boolean` | Enables the use of NGINX Ingress Resource Definitions (VirtualServer and VirtualServerRoute). Default is `true`. | No |
 | `enableSnippets` | `boolean` | Enable custom NGINX configuration snippets in VirtualServer, VirtualServerRoute and TransportServer resources. Requires `enableCRDs` set to `true`. | No |
 | `enablePreviewPolicies` | `boolean` | Enables preview policies. Requires `enableCRDs` set to `true`. | No |
-| `ingressClass` | `string` | A class of the Ingress controller. For Kubernetes >= 1.18, the Ingress controller only processes resources that belong to its class - i.e. have the "ingressClassName" field resource equal to the class. Additionally the Ingress Controller processes all the VirtualServer/VirtualServerRoute resources that do not have the "ingressClassName" field. For Kubernetes < 1.18, the Ingress Controller only processes resources that belong to its class - i.e have the annotation "kubernetes.io/ingress.class" (for Ingress resources) or field "ingressClassName" (for VirtualServer/VirtualServerRoute resources) equal to the class. Additionally, the Ingress Controller processes resources that do not have the class set, which can be disabled by setting `useIngressClassOnly` to `true`. Default is `nginx`. | No |
+| `ingressClass` | `string` | A class of the Ingress controller. The Ingress controller only processes resources that belong to its class - i.e. have the "ingressClassName" field resource equal to the class. Additionally the Ingress Controller processes all the VirtualServer/VirtualServerRoute resources that do not have the "ingressClassName" field. Additionally, the Ingress Controller processes resources that do not have the class set. Default is `nginx`. | No |
 | `service` | [service](#nginxingresscontrollerservice) | The service of the Ingress Controller. | No |
-| `useIngressClassOnly` | `boolean` | Ignore Ingress resources without the `"kubernetes.io/ingress.class"` annotation. For kubernetes versions >= 1.18 this flag will be IGNORED. | No |
 | `watchNamespace` | `boolean` | Namespace to watch for Ingress resources. By default the Ingress controller watches all namespaces. | No |
 | `healthStatus` | [healthStatus](#nginxingresscontrollerhealthstatus) | Adds a new location to the default server. The location responds with the 200 status code for any request. Useful for external health-checking of the Ingress Controller. | No |
 | `nginxDebug` | `boolean` | Enable debugging for NGINX. Uses the nginx-debug binary. Requires `error-log-level: debug` in the configMapData. | No |