Add enablePreviewPolicies cli arg

Author: Dean-Coakley

deploy/crds/k8s.nginx.org_nginxingresscontrollers_crd.yaml

@@ -73,6 +73,9 @@ spec:
                 controller reporting the status of Ingress resources – only one replica
                 will report status.
               type: boolean
+            enablePreviewPolicies:
+              description: Enables preview policies. Requires enableCRDs set to true.
+              type: boolean
             enableSnippets:
               description: Enable custom NGINX configuration snippets in VirtualServer
                 and VirtualServerRoute resources. Requires enableCRDs set to true.

pkg/apis/k8s/v1alpha1/nginxingresscontroller_types.go

@@ -40,6 +40,11 @@ type NginxIngressControllerSpec struct {
 	// +kubebuilder:validation:Optional
 	// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
 	EnableSnippets bool `json:"enableSnippets"`
+	// Enables preview policies.
+	// Requires enableCRDs set to true.
+	// +kubebuilder:validation:Optional
+	// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
+	EnablePreviewPolicies bool `json:"enablePreviewPolicies"`
 	// +kubebuilder:validation:Optional
 	// 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”).

pkg/controller/nginxingresscontroller/utils.go

@@ -125,6 +125,10 @@ func generatePodArgs(instance *k8sv1alpha1.NginxIngressController) []string {
 		if instance.Spec.EnableSnippets {
 			args = append(args, "-enable-snippets")
 		}
+
+		if instance.Spec.EnablePreviewPolicies {
+			args = append(args, "-enable-preview-policies")
+		}
 	}
 
 	if instance.Spec.NginxReloadTimeout != 0 {

pkg/controller/nginxingresscontroller/utils_test.go

@@ -5,6 +5,7 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/google/go-cmp/cmp"
 	k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/pkg/apis/k8s/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -130,10 +131,11 @@ func TestGeneratePodArgs(t *testing.T) {
 					Namespace: namespace,
 				},
 				Spec: k8sv1alpha1.NginxIngressControllerSpec{
-					EnableCRDs:           true,
-					EnableSnippets:       true,
-					EnableTLSPassthrough: true,
-					GlobalConfiguration:  "my-nginx-ingress/globalconfiguration",
+					EnableCRDs:            true,
+					EnableSnippets:        true,
+					EnablePreviewPolicies: true,
+					EnableTLSPassthrough:  true,
+					GlobalConfiguration:   "my-nginx-ingress/globalconfiguration",
 				},
 			},
 			expected: []string{
@@ -142,6 +144,7 @@ func TestGeneratePodArgs(t *testing.T) {
 				"-enable-tls-passthrough",
 				"-global-configuration=my-nginx-ingress/globalconfiguration",
 				"-enable-snippets",
+				"-enable-preview-policies",
 			},
 		},
 		{
@@ -153,7 +156,6 @@ func TestGeneratePodArgs(t *testing.T) {
 				Spec: k8sv1alpha1.NginxIngressControllerSpec{
 					NginxPlus:           true,
 					DefaultSecret:       "my-nginx-ingress/my-secret",
-					EnableCRDs:          false,
 					IngressClass:        "ingressClass",
 					UseIngressClassOnly: true,
 					WatchNamespace:      "default",
@@ -180,12 +182,14 @@ func TestGeneratePodArgs(t *testing.T) {
 					},
 					EnableLatencyMetrics: true,
 					GlobalConfiguration:  "my-nginx-ingress/globalconfiguration",
-					EnableSnippets:       true,
 					EnableTLSPassthrough: true,
 					AppProtect: &k8sv1alpha1.AppProtect{
 						Enable: true,
 					},
-					NginxReloadTimeout: 5000,
+					NginxReloadTimeout:    5000,
+					EnableCRDs:            false,
+					EnableSnippets:        true,
+					EnablePreviewPolicies: true,
 				},
 			},
 			expected: []string{
@@ -218,8 +222,8 @@ func TestGeneratePodArgs(t *testing.T) {
 
 	for _, test := range tests {
 		result := generatePodArgs(test.instance)
-		if !reflect.DeepEqual(result, test.expected) {
-			t.Errorf("generatePodArgs(%+v) returned \n %v but expected \n %v", test.instance, result, test.expected)
+		if diff := cmp.Diff(test.expected, result); diff != "" {
+			t.Errorf("generatePodArgs(%+v) mismatch (-want +got):\n%s", test.instance, diff)
 		}
 	}
 }