Gatewayclass controller

build/Dockerfile

@@ -9,6 +9,8 @@ COPY go.mod go.sum /go/src/github.com/nginxinc/nginx-gateway-kubernetes
 RUN go mod download
 
 COPY cmd /go/src/github.com/nginxinc/nginx-gateway-kubernetes/cmd
+COPY internal /go/src/github.com/nginxinc/nginx-gateway-kubernetes/internal
+COPY pkg /go/src/github.com/nginxinc/nginx-gateway-kubernetes/pkg
 RUN CGO_ENABLED=0 GOOS=linux go build -trimpath -a -ldflags "-s -w -X main.version=${VERSION} -X main.commit=${GIT_COMMIT} -X main.date=${DATE}" -o gateway .
 
 FROM scratch as common

cmd/gateway/main.go

@@ -1,18 +1,17 @@
 package main
 
 import (
-	"context"
 	"flag"
 	"fmt"
 	"os"
-	"os/signal"
-	"syscall"
-	"time"
 
-	"go.uber.org/zap"
-	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"github.com/nginxinc/nginx-gateway-kubernetes/internal/implementation"
+	"github.com/nginxinc/nginx-gateway-kubernetes/pkg/sdk"
 	"k8s.io/client-go/rest"
-	"sigs.k8s.io/gateway-api/pkg/client/clientset/gateway/versioned"
+	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+	"sigs.k8s.io/controller-runtime/pkg/manager"
+	"sigs.k8s.io/controller-runtime/pkg/manager/signals"
+	"sigs.k8s.io/gateway-api/apis/v1alpha2"
 )
 
 var (
@@ -33,58 +32,44 @@ func main() {
 		os.Exit(1)
 	}
 
-	logger, err := zap.NewProduction()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Failed to initialize logging: %v\n", err)
-		os.Exit(1)
-	}
-	sugar := logger.Sugar()
+	logger := zap.New()
 
-	sugar.Infow("Starting NGINX Gateway",
+	logger.Info("Starting NGINX Gateway",
 		"version", version,
 		"commit", commit,
 		"date", date)
 
 	config, err := rest.InClusterConfig()
 	if err != nil {
-		sugar.Fatalw("Failed to create InClusterConfig",
-			"error", err)
+		logger.Error(err, "Failed to create InClusterConfig")
+		os.Exit(1)
 	}
 
-	gatewayClient, err := versioned.NewForConfig(config)
+	mgr, err := manager.New(config, manager.Options{
+		Logger: logger,
+	})
 	if err != nil {
-		sugar.Fatalw("Failed to create a client for Gateway APIs",
-			"error", err)
+		logger.Error(err, "Failed to create Manager")
+		os.Exit(1)
 	}
 
-	gc, err := gatewayClient.GatewayV1alpha2().GatewayClasses().Get(context.TODO(), *gatewayClass, meta_v1.GetOptions{})
+	err = v1alpha2.AddToScheme(mgr.GetScheme())
 	if err != nil {
-		sugar.Fatalw("Failed to get the GatewayClass",
-			"name", *gatewayClass,
-			"error", err)
+		logger.Error(err, "Failed to add Gateway API scheme")
+		os.Exit(1)
 	}
 
-	if gc.Spec.ControllerName != "k8s-gateway.nginx.org/gateway" {
-		sugar.Fatalw("Wrong ControllerName in the GatewayClass resource",
-			"expected", "k8s-gateway.nginx.org/gateway",
-			"got", "gc.Spec.ControllerName")
+	err = sdk.RegisterGatewayClassController(mgr, implementation.NewGatewayClassImplementation(logger))
+	if err != nil {
+		logger.Error(err, "Failed to register GatewayClassController")
+		os.Exit(1)
 	}
 
-	sugar.Infow("Gateway class info",
-		"name", gc.Name,
-		"creation timestamp", gc.CreationTimestamp)
-
-	signalChan := make(chan os.Signal, 1)
-	signal.Notify(signalChan, os.Interrupt, syscall.SIGTERM)
-	go func() {
-		sugar.Infow("Terminating because of the signal",
-			"signal", <-signalChan)
+	logger.Info("Starting manager")
 
-		os.Exit(0)
-	}()
-
-	for {
-		sugar.Infow("Gateway is running")
-		time.Sleep(30 * time.Second)
+	err = mgr.Start(signals.SetupSignalHandler())
+	if err != nil {
+		logger.Error(err, "Failed to start Manager")
+		os.Exit(1)
 	}
 }

deploy/manifests/nginx-gateway.yaml

@@ -19,7 +19,8 @@ rules:
   resources:
   - gatewayclasses
   verbs:
-  - get
+  - list
+  - watch
 ---
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1

go.mod

@@ -3,38 +3,58 @@ module github.com/nginxinc/nginx-gateway-kubernetes
 go 1.17
 
 require (
+	github.com/go-logr/logr v0.4.0
 	go.uber.org/zap v1.19.1
-	k8s.io/apimachinery v0.22.1
-	k8s.io/client-go v0.22.1
+	golang.org/x/net v0.0.0-20210520170846-37e1c6afe023
+	k8s.io/apimachinery v0.22.2
+	k8s.io/client-go v0.22.2
+	sigs.k8s.io/controller-runtime v0.10.2
 	sigs.k8s.io/gateway-api v0.4.0
 )
 
 require (
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.1.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/go-logr/logr v0.4.0 // indirect
+	github.com/evanphx/json-patch v4.11.0+incompatible // indirect
+	github.com/fsnotify/fsnotify v1.4.9 // indirect
+	github.com/go-logr/zapr v0.4.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.6 // indirect
 	github.com/google/gofuzz v1.1.0 // indirect
+	github.com/google/uuid v1.1.2 // indirect
 	github.com/googleapis/gnostic v0.5.5 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
 	github.com/json-iterator/go v1.1.11 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.1 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/prometheus/client_golang v1.11.0 // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/prometheus/common v0.26.0 // indirect
+	github.com/prometheus/procfs v0.6.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.7.0 // indirect
-	golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect
 	golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602 // indirect
-	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
+	golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 // indirect
 	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
 	golang.org/x/text v0.3.6 // indirect
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
+	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.26.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
-	k8s.io/api v0.22.1 // indirect
+	k8s.io/api v0.22.2 // indirect
+	k8s.io/apiextensions-apiserver v0.22.2 // indirect
+	k8s.io/component-base v0.22.2 // indirect
 	k8s.io/klog/v2 v2.10.0 // indirect
+	k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
 	k8s.io/utils v0.0.0-20210820185131-d34e5cb4466e // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
 	sigs.k8s.io/yaml v1.2.0 // indirect