Add custom resources

Gopkg.toml

@@ -1,3 +1,11 @@
+required = [
+  "k8s.io/code-generator/cmd/client-gen",
+  "k8s.io/code-generator/cmd/informer-gen",
+  "k8s.io/code-generator/cmd/lister-gen",
+  "k8s.io/code-generator/cmd/deepcopy-gen",
+  "k8s.io/code-generator/cmd/defaulter-gen",
+]
+
 [[constraint]]
   name = "k8s.io/api"
   version = "kubernetes-1.12.2"
@@ -6,6 +14,10 @@
   name = "k8s.io/apimachinery"
   version = "kubernetes-1.12.2"
 
+[[constraint]]
+  name = "k8s.io/code-generator"
+  version = "kubernetes-1.12.2"
+
 [[constraint]]
   name = "k8s.io/client-go"
   version = "9.0.0"

build/Dockerfile

@@ -6,7 +6,7 @@ RUN ln -sf /proc/1/fd/1 /var/log/nginx/access.log \
 	&& ln -sf /proc/1/fd/1 /var/log/nginx/stream-access.log \
 	&& ln -sf /proc/1/fd/2 /var/log/nginx/error.log
 
-COPY nginx-ingress internal/configs/version1/nginx.ingress.tmpl internal/configs/version1/nginx.tmpl /
+COPY nginx-ingress internal/configs/version1/nginx.ingress.tmpl internal/configs/version1/nginx.tmpl internal/configs/version2/nginx.virtualserver.tmpl /
 
 RUN rm /etc/nginx/conf.d/*
 

build/DockerfileForAlpine

@@ -6,7 +6,7 @@ RUN ln -sf /proc/1/fd/1 /var/log/nginx/access.log \
 	&& ln -sf /proc/1/fd/1 /var/log/nginx/stream-access.log \
 	&& ln -sf /proc/1/fd/2 /var/log/nginx/error.log
 
-COPY nginx-ingress internal/configs/version1/nginx.ingress.tmpl internal/configs/version1/nginx.tmpl /
+COPY nginx-ingress internal/configs/version1/nginx.ingress.tmpl internal/configs/version1/nginx.tmpl internal/configs/version2/nginx.virtualserver.tmpl /
 
 RUN rm /etc/nginx/conf.d/*
 

build/DockerfileForPlus

@@ -52,7 +52,7 @@ RUN ln -sf /proc/1/fd/1 /var/log/nginx/access.log \
 
 EXPOSE 80 443
 
-COPY nginx-ingress internal/configs/version1/nginx-plus.ingress.tmpl internal/configs/version1/nginx-plus.tmpl /
+COPY nginx-ingress internal/configs/version1/nginx-plus.ingress.tmpl internal/configs/version1/nginx-plus.tmpl internal/configs/version2/nginx-plus.virtualserver.tmpl  /
 
 RUN rm /etc/nginx/conf.d/* \
   && mkdir -p /etc/nginx/secrets

cmd/nginx-ingress/main.go

@@ -12,6 +12,7 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/nginxinc/kubernetes-ingress/internal/configs/version2"
 	"github.com/nginxinc/kubernetes-ingress/internal/metrics/collectors"
 
 	"github.com/golang/glog"
@@ -20,11 +21,14 @@ import (
 	"github.com/nginxinc/kubernetes-ingress/internal/k8s"
 	"github.com/nginxinc/kubernetes-ingress/internal/metrics"
 	"github.com/nginxinc/kubernetes-ingress/internal/nginx"
+	k8s_nginx "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned"
+	conf_scheme "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme"
 	"github.com/nginxinc/nginx-plus-go-sdk/client"
 	"github.com/prometheus/client_golang/prometheus"
 	api_v1 "k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
@@ -77,6 +81,10 @@ var (
 		`Path to the ingress NGINX configuration template for an ingress resource.
 	(default for NGINX "nginx.ingress.tmpl"; default for NGINX Plus "nginx-plus.ingress.tmpl")`)
 
+	virtualServerTemplatePath = flag.String("virtualserver-template-path", "",
+		`Path to the VirtualServer NGINX configuration template for a VirtualServer resource.
+	(default for NGINX "nginx.virtualserver.tmpl"; default for NGINX Plus "nginx-plus.virtualserver.tmpl")`)
+
 	externalService = flag.String("external-service", "",
 		`Specifies the name of the service with the type LoadBalancer through which the Ingress controller pods are exposed externally.
 The external address of the service is used when reporting the status of Ingress resources. Requires -report-ingress-status.`)
@@ -111,6 +119,9 @@ The external address of the service is used when reporting the status of Ingress
 
 	prometheusMetricsListenPort = flag.Int("prometheus-metrics-listen-port", 9113,
 		"Set the port where the Prometheus metrics are exposed. [1023 - 65535]")
+
+	enableCustomResources = flag.Bool("enable-custom-resources", false,
+		"Enable custom resources")
 )
 
 func main() {
@@ -166,11 +177,27 @@ func main() {
 		glog.Fatalf("Failed to create client: %v.", err)
 	}
 
+	var confClient k8s_nginx.Interface
+	if *enableCustomResources {
+		confClient, err = k8s_nginx.NewForConfig(config)
+		if err != nil {
+			glog.Fatalf("Failed to create a conf client: %v", err)
+		}
+
+		// required for emitting Events for VirtualServer
+		err = conf_scheme.AddToScheme(scheme.Scheme)
+		if err != nil {
+			glog.Fatalf("Failed to add configuration types to the scheme: %v", err)
+		}
+	}
+
 	nginxConfTemplatePath := "nginx.tmpl"
 	nginxIngressTemplatePath := "nginx.ingress.tmpl"
+	nginxVirtualServerTemplatePath := "nginx.virtualserver.tmpl"
 	if *nginxPlus {
 		nginxConfTemplatePath = "nginx-plus.tmpl"
 		nginxIngressTemplatePath = "nginx-plus.ingress.tmpl"
+		nginxVirtualServerTemplatePath = "nginx-plus.virtualserver.tmpl"
 	}
 
 	if *mainTemplatePath != "" {
@@ -179,6 +206,9 @@ func main() {
 	if *ingressTemplatePath != "" {
 		nginxIngressTemplatePath = *ingressTemplatePath
 	}
+	if *virtualServerTemplatePath != "" {
+		nginxVirtualServerTemplatePath = *virtualServerTemplatePath
+	}
 
 	nginxBinaryPath := "/usr/sbin/nginx"
 	if *nginxDebug {
@@ -190,6 +220,11 @@ func main() {
 		glog.Fatalf("Error creating TemplateExecutor: %v", err)
 	}
 
+	templateExecutorV2, err := version2.NewTemplateExecutor(nginxVirtualServerTemplatePath)
+	if err != nil {
+		glog.Fatalf("Error cresting TemplateExecutorV2: %v", err)
+	}
+
 	var registry *prometheus.Registry
 	var managerCollector collectors.ManagerCollector
 	var controllerCollector collectors.ControllerCollector
@@ -321,26 +356,28 @@ func main() {
 	}
 
 	isWildcardEnabled := *wildcardTLSSecret != ""
-	cnf := configs.NewConfigurator(nginxManager, staticCfgParams, cfgParams, templateExecutor, *nginxPlus, isWildcardEnabled)
+	cnf := configs.NewConfigurator(nginxManager, staticCfgParams, cfgParams, templateExecutor, templateExecutorV2, *nginxPlus, isWildcardEnabled)
 	controllerNamespace := os.Getenv("POD_NAMESPACE")
 
 	lbcInput := k8s.NewLoadBalancerControllerInput{
-		KubeClient:              kubeClient,
-		ResyncPeriod:            30 * time.Second,
-		Namespace:               *watchNamespace,
-		NginxConfigurator:       cnf,
-		DefaultServerSecret:     *defaultServerSecret,
-		IsNginxPlus:             *nginxPlus,
-		IngressClass:            *ingressClass,
-		UseIngressClassOnly:     *useIngressClassOnly,
-		ExternalServiceName:     *externalService,
-		ControllerNamespace:     controllerNamespace,
-		ReportIngressStatus:     *reportIngressStatus,
-		IsLeaderElectionEnabled: *leaderElectionEnabled,
-		LeaderElectionLockName:  *leaderElectionLockName,
-		WildcardTLSSecret:       *wildcardTLSSecret,
-		ConfigMaps:              *nginxConfigMaps,
-		MetricsCollector:        controllerCollector,
+		KubeClient:                kubeClient,
+		ConfClient:                confClient,
+		ResyncPeriod:              30 * time.Second,
+		Namespace:                 *watchNamespace,
+		NginxConfigurator:         cnf,
+		DefaultServerSecret:       *defaultServerSecret,
+		IsNginxPlus:               *nginxPlus,
+		IngressClass:              *ingressClass,
+		UseIngressClassOnly:       *useIngressClassOnly,
+		ExternalServiceName:       *externalService,
+		ControllerNamespace:       controllerNamespace,
+		ReportIngressStatus:       *reportIngressStatus,
+		IsLeaderElectionEnabled:   *leaderElectionEnabled,
+		LeaderElectionLockName:    *leaderElectionLockName,
+		WildcardTLSSecret:         *wildcardTLSSecret,
+		ConfigMaps:                *nginxConfigMaps,
+		AreCustomResourcesEnabled: *enableCustomResources,
+		MetricsCollector:          controllerCollector,
 	}
 
 	lbc := k8s.NewLoadBalancerController(lbcInput)

deployments/common/custom-resource-definitions.yaml

@@ -0,0 +1,35 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: virtualservers.k8s.nginx.org
+spec:
+  group: k8s.nginx.org
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+  scope: Namespaced
+  names:
+    plural: virtualservers
+    singular: virtualserver
+    kind: VirtualServer
+    shortNames:
+    - vs
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: virtualserverroutes.k8s.nginx.org
+spec:
+  group: k8s.nginx.org
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+  scope: Namespaced
+  names:
+    plural: virtualserverroutes
+    singular: virtualserverroute
+    kind: VirtualServerRoute
+    shortNames:
+    - vsr

deployments/daemon-set/nginx-ingress.yaml

@@ -46,3 +46,4 @@ spec:
          #- -external-service=nginx-ingress
          #- -enable-leader-election
          #- -enable-prometheus-metrics
+         #- -enable-custom-resources

deployments/daemon-set/nginx-plus-ingress.yaml

@@ -47,3 +47,4 @@ spec:
          #- -external-service=nginx-ingress
          #- -enable-leader-election
          #- -enable-prometheus-metrics
+         #- -enable-custom-resources

deployments/deployment/nginx-ingress.yaml

@@ -45,3 +45,4 @@ spec:
          #- -external-service=nginx-ingress
          #- -enable-leader-election
          #- -enable-prometheus-metrics
+         #- -enable-custom-resources

deployments/deployment/nginx-plus-ingress.yaml

@@ -46,3 +46,4 @@ spec:
          #- -external-service=nginx-ingress
          #- -enable-leader-election
          #- -enable-prometheus-metrics
+         #- -enable-custom-resources

deployments/helm-chart/Chart.yaml

@@ -1,5 +1,5 @@
 name: nginx-ingress
-version: 0.6.0
+version: 0.7.0
 appVersion: edge
 description: NGINX Ingress Controller
 icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/master/deployments/helm-chart/chart-icon.png

deployments/helm-chart/README.md

@@ -81,6 +81,7 @@ Parameter | Description | Default
 `controller.ingressClass` | A class of the Ingress controller. The Ingress controller only processes Ingress resources that belong to its class - i.e. have the annotation `"kubernetes.io/ingress.class"` equal to the class. Additionally, the Ingress controller processes Ingress resources that do not have that annotation which can be disabled by setting the "-use-ingress-class-only" flag. | nginx
 `controller.useIngressClassOnly` | Ignore Ingress resources without the `"kubernetes.io/ingress.class"` annotation. | false
 `controller.watchNamespace` | Namespace to watch for Ingress resources. By default the Ingress controller watches all namespaces. | ""
+`controller.enableCustomResources` | Enable the custom resources. | false
 `controller.healthStatus` | Add a location "/nginx-health" to the default server. The location responds with the 200 status code for any request. Useful for external health-checking of the Ingress controller. | false
 `controller.nginxStatus.enable` | Enable the NGINX stub_status, or the NGINX Plus API. | true
 `controller.nginxStatus.port` | Set the port where the NGINX stub_status or the NGINX Plus API is exposed. | 8080