From bd5f34c1211994a21410e43a4835b94a2f771add Mon Sep 17 00:00:00 2001 From: Matthew Yacobucci Date: Tue, 16 Nov 2021 14:19:16 -0700 Subject: [PATCH 1/2] Update codegen to produce proper packages We had mistakenly left off the CRD name leading to invalid golang being generated. Tag along, "gateway" removed from .gitignore. Moving artifacts to build/.out so files don't get hidden and ignored. --- .gitignore | 4 +- Makefile | 15 +- build/Dockerfile | 4 +- hack/update-codegen.sh | 5 +- internal/controller/controller.go | 2 +- .../gatewayconfig/gatewayconfig.go | 2 +- pkg/apis/gateway/register.go | 5 + pkg/apis/{ => gateway}/v1alpha1/doc.go | 0 pkg/apis/{ => gateway}/v1alpha1/register.go | 4 +- pkg/apis/{ => gateway}/v1alpha1/types.go | 0 .../v1alpha1/zz_generated.deepcopy.go | 0 pkg/client/clientset/versioned/clientset.go | 2 +- .../versioned/fake/clientset_generated.go | 4 +- .../clientset/versioned/fake/register.go | 2 +- .../clientset/versioned/scheme/register.go | 2 +- .../typed/{ => gateway}/v1alpha1/doc.go | 0 .../typed/{ => gateway}/v1alpha1/fake/doc.go | 0 .../v1alpha1/fake/fake_gateway_client.go} | 2 +- .../v1alpha1/fake/fake_gatewayconfig.go | 2 +- .../v1alpha1/gateway_client.go} | 2 +- .../{ => gateway}/v1alpha1/gatewayconfig.go | 2 +- .../v1alpha1/generated_expansion.go | 0 .../gateway/clientset/versioned/clientset.go | 81 +++++++++ pkg/client/gateway/clientset/versioned/doc.go | 4 + .../versioned/fake/clientset_generated.go | 69 ++++++++ .../gateway/clientset/versioned/fake/doc.go | 4 + .../clientset/versioned/fake/register.go | 40 +++++ .../gateway/clientset/versioned/scheme/doc.go | 4 + .../clientset/versioned/scheme/register.go | 40 +++++ .../versioned/typed/gateway/v1alpha1/doc.go | 4 + .../typed/gateway/v1alpha1/fake/doc.go | 4 + .../v1alpha1/fake/fake_gateway_client.go | 24 +++ .../v1alpha1/fake/fake_gatewayconfig.go | 106 +++++++++++ .../typed/gateway/v1alpha1/gateway_client.go | 73 ++++++++ .../typed/gateway/v1alpha1/gatewayconfig.go | 152 ++++++++++++++++ .../gateway/v1alpha1/generated_expansion.go | 5 + .../informers/externalversions/factory.go | 164 ++++++++++++++++++ .../externalversions/gateway/interface.go | 30 ++++ .../gateway/v1alpha1/gatewayconfig.go | 73 ++++++++ .../gateway/v1alpha1/interface.go | 29 ++++ .../informers/externalversions/generic.go | 46 +++++ .../internalinterfaces/factory_interfaces.go | 24 +++ .../gateway/v1alpha1/expansion_generated.go | 7 + .../listers/gateway/v1alpha1/gatewayconfig.go | 52 ++++++ pkg/sdk/gatewayconfig_controller.go | 2 +- pkg/sdk/interfaces.go | 2 +- 46 files changed, 1075 insertions(+), 23 deletions(-) create mode 100644 pkg/apis/gateway/register.go rename pkg/apis/{ => gateway}/v1alpha1/doc.go (100%) rename pkg/apis/{ => gateway}/v1alpha1/register.go (86%) rename pkg/apis/{ => gateway}/v1alpha1/types.go (100%) rename pkg/apis/{ => gateway}/v1alpha1/zz_generated.deepcopy.go (100%) rename pkg/client/clientset/versioned/typed/{ => gateway}/v1alpha1/doc.go (100%) rename pkg/client/clientset/versioned/typed/{ => gateway}/v1alpha1/fake/doc.go (100%) rename pkg/client/clientset/versioned/typed/{v1alpha1/fake/fake__client.go => gateway/v1alpha1/fake/fake_gateway_client.go} (92%) rename pkg/client/clientset/versioned/typed/{ => gateway}/v1alpha1/fake/fake_gatewayconfig.go (99%) rename pkg/client/clientset/versioned/typed/{v1alpha1/_client.go => gateway/v1alpha1/gateway_client.go} (99%) rename pkg/client/clientset/versioned/typed/{ => gateway}/v1alpha1/gatewayconfig.go (99%) rename pkg/client/clientset/versioned/typed/{ => gateway}/v1alpha1/generated_expansion.go (100%) create mode 100644 pkg/client/gateway/clientset/versioned/clientset.go create mode 100644 pkg/client/gateway/clientset/versioned/doc.go create mode 100644 pkg/client/gateway/clientset/versioned/fake/clientset_generated.go create mode 100644 pkg/client/gateway/clientset/versioned/fake/doc.go create mode 100644 pkg/client/gateway/clientset/versioned/fake/register.go create mode 100644 pkg/client/gateway/clientset/versioned/scheme/doc.go create mode 100644 pkg/client/gateway/clientset/versioned/scheme/register.go create mode 100644 pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/doc.go create mode 100644 pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/fake/doc.go create mode 100644 pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/fake/fake_gateway_client.go create mode 100644 pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/fake/fake_gatewayconfig.go create mode 100644 pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/gateway_client.go create mode 100644 pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/gatewayconfig.go create mode 100644 pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/generated_expansion.go create mode 100644 pkg/client/gateway/informers/externalversions/factory.go create mode 100644 pkg/client/gateway/informers/externalversions/gateway/interface.go create mode 100644 pkg/client/gateway/informers/externalversions/gateway/v1alpha1/gatewayconfig.go create mode 100644 pkg/client/gateway/informers/externalversions/gateway/v1alpha1/interface.go create mode 100644 pkg/client/gateway/informers/externalversions/generic.go create mode 100644 pkg/client/gateway/informers/externalversions/internalinterfaces/factory_interfaces.go create mode 100644 pkg/client/gateway/listers/gateway/v1alpha1/expansion_generated.go create mode 100644 pkg/client/gateway/listers/gateway/v1alpha1/gatewayconfig.go diff --git a/.gitignore b/.gitignore index 3b06c5bb76..ebbe53171a 100644 --- a/.gitignore +++ b/.gitignore @@ -21,5 +21,5 @@ # GoLand IDE .idea -# Binary -gateway +# Binary and Artifacts +build/.out diff --git a/Makefile b/Makefile index dda0d42736..1220c04887 100644 --- a/Makefile +++ b/Makefile @@ -8,19 +8,28 @@ DATE = $(shell date -u +"%Y-%m-%dT%H:%M:%SZ") TARGET ?= local KIND_KUBE_CONFIG_FOLDER = $${HOME}/.kube/kind +OUT_DIR=$(shell pwd)/build/.out export DOCKER_BUILDKIT = 1 .PHONY: container container: build - docker build --build-arg VERSION=$(VERSION) --build-arg GIT_COMMIT=$(GIT_COMMIT) --build-arg DATE=$(DATE) --target $(TARGET) -f build/Dockerfile -t $(PREFIX):$(TAG) . + docker build --build-arg OUT_DIR=$(OUT_DIR) --build-arg VERSION=$(VERSION) --build-arg GIT_COMMIT=$(GIT_COMMIT) --build-arg DATE=$(DATE) --target $(TARGET) -f build/Dockerfile -t $(PREFIX):$(TAG) . .PHONY: build build: ifeq (${TARGET},local) - 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 github.com/nginxinc/nginx-gateway-kubernetes/cmd/gateway + 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 $(OUT_DIR)/gateway github.com/nginxinc/nginx-gateway-kubernetes/cmd/gateway endif +.PHONY: out_dir +out_dir: + mkdir -p $(OUT_DIR) + +.PHONY: clean +clean: out_dir + rm -rf $(OUT_DIR) + .PHONY: deps deps: @go mod tidy && go mod verify && go mod download @@ -46,4 +55,4 @@ create-kind-cluster: .PHONY: delete-kind-cluster delete-kind-cluster: - kind delete cluster \ No newline at end of file + kind delete cluster diff --git a/build/Dockerfile b/build/Dockerfile index d544423e24..d95d8c6f7e 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -11,7 +11,7 @@ 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 . +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 ./build/.out/gateway . FROM scratch as common USER 1001:1001 @@ -21,4 +21,4 @@ FROM common as container COPY --from=builder /go/src/github.com/nginxinc/nginx-gateway-kubernetes/cmd/gateway/gateway /usr/bin/ FROM common as local -COPY ./gateway /usr/bin/ +COPY ./build/.out/gateway /usr/bin/ diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index 33144d2734..741a9a10a4 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -32,7 +32,8 @@ fi # k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir # instead of the $GOPATH directly. For normal projects this can be dropped. bash "${CODEGEN_PKG}"/generate-groups.sh "deepcopy,client,informer,lister" \ - github.com/nginxinc/nginx-gateway-kubernetes/pkg/client github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis \ - :v1alpha1 \ + github.com/nginxinc/nginx-gateway-kubernetes/pkg/client \ + github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis \ + gateway:v1alpha1 \ --output-base "$(dirname "${BASH_SOURCE[0]}")/../../../.." \ --go-header-file "${SCRIPT_ROOT}"/hack/boilerplate.go.txt diff --git a/internal/controller/controller.go b/internal/controller/controller.go index 24025603b3..16f4da5dc8 100644 --- a/internal/controller/controller.go +++ b/internal/controller/controller.go @@ -7,7 +7,7 @@ import ( gw "github.com/nginxinc/nginx-gateway-kubernetes/internal/implementations/gateway" gc "github.com/nginxinc/nginx-gateway-kubernetes/internal/implementations/gatewayclass" gcfg "github.com/nginxinc/nginx-gateway-kubernetes/internal/implementations/gatewayconfig" - nginxgwv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/v1alpha1" + nginxgwv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" "github.com/nginxinc/nginx-gateway-kubernetes/pkg/sdk" "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/implementations/gatewayconfig/gatewayconfig.go b/internal/implementations/gatewayconfig/gatewayconfig.go index 9c3cfbb8f9..3f614033af 100644 --- a/internal/implementations/gatewayconfig/gatewayconfig.go +++ b/internal/implementations/gatewayconfig/gatewayconfig.go @@ -5,7 +5,7 @@ import ( "github.com/nginxinc/nginx-gateway-kubernetes/internal/config" "github.com/nginxinc/nginx-gateway-kubernetes/pkg/sdk" - nginxgwv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/v1alpha1" + nginxgwv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" ) type gatewayConfigImplementation struct { diff --git a/pkg/apis/gateway/register.go b/pkg/apis/gateway/register.go new file mode 100644 index 0000000000..51ff64e40a --- /dev/null +++ b/pkg/apis/gateway/register.go @@ -0,0 +1,5 @@ +// Package specs defines Nginx Service Mesh specs API group +package gateway + +// GroupName identifies the API Group Name for a circuit breaker. +const GroupName = "gateway.nginx.org" diff --git a/pkg/apis/v1alpha1/doc.go b/pkg/apis/gateway/v1alpha1/doc.go similarity index 100% rename from pkg/apis/v1alpha1/doc.go rename to pkg/apis/gateway/v1alpha1/doc.go diff --git a/pkg/apis/v1alpha1/register.go b/pkg/apis/gateway/v1alpha1/register.go similarity index 86% rename from pkg/apis/v1alpha1/register.go rename to pkg/apis/gateway/v1alpha1/register.go index b3ad015898..c898201ed4 100644 --- a/pkg/apis/v1alpha1/register.go +++ b/pkg/apis/gateway/v1alpha1/register.go @@ -1,13 +1,15 @@ package v1alpha1 import ( + "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" ) // SchemeGroupVersion is group version used to register these object. -var SchemeGroupVersion = schema.GroupVersion{Group: "gateway.nginx.org", Version: "v1alpha1"} +var SchemeGroupVersion = schema.GroupVersion{Group: gateway.GroupName, Version: "v1alpha1"} // Kind takes an unqualified kind and returns back a Group qualified GroupKind. func Kind(kind string) schema.GroupKind { diff --git a/pkg/apis/v1alpha1/types.go b/pkg/apis/gateway/v1alpha1/types.go similarity index 100% rename from pkg/apis/v1alpha1/types.go rename to pkg/apis/gateway/v1alpha1/types.go diff --git a/pkg/apis/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/gateway/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from pkg/apis/v1alpha1/zz_generated.deepcopy.go rename to pkg/apis/gateway/v1alpha1/zz_generated.deepcopy.go diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go index 4c79cc2ad3..d57c203ef4 100644 --- a/pkg/client/clientset/versioned/clientset.go +++ b/pkg/client/clientset/versioned/clientset.go @@ -5,7 +5,7 @@ package versioned import ( "fmt" - gatewayv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/clientset/versioned/typed/v1alpha1" + gatewayv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/clientset/versioned/typed/gateway/v1alpha1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" diff --git a/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go index e74dff8e2d..0fd6efc6e7 100644 --- a/pkg/client/clientset/versioned/fake/clientset_generated.go +++ b/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -4,8 +4,8 @@ package fake import ( clientset "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/clientset/versioned" - gatewayv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/clientset/versioned/typed/v1alpha1" - fakegatewayv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/clientset/versioned/typed/v1alpha1/fake" + gatewayv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/clientset/versioned/typed/gateway/v1alpha1" + fakegatewayv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/clientset/versioned/typed/gateway/v1alpha1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go index d4a58d571f..1983d8ca42 100644 --- a/pkg/client/clientset/versioned/fake/register.go +++ b/pkg/client/clientset/versioned/fake/register.go @@ -3,7 +3,7 @@ package fake import ( - gatewayv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/v1alpha1" + gatewayv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go index 5888edfd14..1301842a72 100644 --- a/pkg/client/clientset/versioned/scheme/register.go +++ b/pkg/client/clientset/versioned/scheme/register.go @@ -3,7 +3,7 @@ package scheme import ( - gatewayv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/v1alpha1" + gatewayv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/clientset/versioned/typed/v1alpha1/doc.go b/pkg/client/clientset/versioned/typed/gateway/v1alpha1/doc.go similarity index 100% rename from pkg/client/clientset/versioned/typed/v1alpha1/doc.go rename to pkg/client/clientset/versioned/typed/gateway/v1alpha1/doc.go diff --git a/pkg/client/clientset/versioned/typed/v1alpha1/fake/doc.go b/pkg/client/clientset/versioned/typed/gateway/v1alpha1/fake/doc.go similarity index 100% rename from pkg/client/clientset/versioned/typed/v1alpha1/fake/doc.go rename to pkg/client/clientset/versioned/typed/gateway/v1alpha1/fake/doc.go diff --git a/pkg/client/clientset/versioned/typed/v1alpha1/fake/fake__client.go b/pkg/client/clientset/versioned/typed/gateway/v1alpha1/fake/fake_gateway_client.go similarity index 92% rename from pkg/client/clientset/versioned/typed/v1alpha1/fake/fake__client.go rename to pkg/client/clientset/versioned/typed/gateway/v1alpha1/fake/fake_gateway_client.go index 043a72f415..8b1a5f1cf5 100644 --- a/pkg/client/clientset/versioned/typed/v1alpha1/fake/fake__client.go +++ b/pkg/client/clientset/versioned/typed/gateway/v1alpha1/fake/fake_gateway_client.go @@ -3,7 +3,7 @@ package fake import ( - v1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/clientset/versioned/typed/v1alpha1" + v1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/clientset/versioned/typed/gateway/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/client/clientset/versioned/typed/v1alpha1/fake/fake_gatewayconfig.go b/pkg/client/clientset/versioned/typed/gateway/v1alpha1/fake/fake_gatewayconfig.go similarity index 99% rename from pkg/client/clientset/versioned/typed/v1alpha1/fake/fake_gatewayconfig.go rename to pkg/client/clientset/versioned/typed/gateway/v1alpha1/fake/fake_gatewayconfig.go index 692c537c39..71efbd3b9b 100644 --- a/pkg/client/clientset/versioned/typed/v1alpha1/fake/fake_gatewayconfig.go +++ b/pkg/client/clientset/versioned/typed/gateway/v1alpha1/fake/fake_gatewayconfig.go @@ -5,7 +5,7 @@ package fake import ( "context" - v1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/v1alpha1" + v1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/clientset/versioned/typed/v1alpha1/_client.go b/pkg/client/clientset/versioned/typed/gateway/v1alpha1/gateway_client.go similarity index 99% rename from pkg/client/clientset/versioned/typed/v1alpha1/_client.go rename to pkg/client/clientset/versioned/typed/gateway/v1alpha1/gateway_client.go index c6f24915e3..f129c9dbb5 100644 --- a/pkg/client/clientset/versioned/typed/v1alpha1/_client.go +++ b/pkg/client/clientset/versioned/typed/gateway/v1alpha1/gateway_client.go @@ -3,7 +3,7 @@ package v1alpha1 import ( - v1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/v1alpha1" + v1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/pkg/client/clientset/versioned/typed/v1alpha1/gatewayconfig.go b/pkg/client/clientset/versioned/typed/gateway/v1alpha1/gatewayconfig.go similarity index 99% rename from pkg/client/clientset/versioned/typed/v1alpha1/gatewayconfig.go rename to pkg/client/clientset/versioned/typed/gateway/v1alpha1/gatewayconfig.go index 6120654d91..9d68df358e 100644 --- a/pkg/client/clientset/versioned/typed/v1alpha1/gatewayconfig.go +++ b/pkg/client/clientset/versioned/typed/gateway/v1alpha1/gatewayconfig.go @@ -6,7 +6,7 @@ import ( "context" "time" - v1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/v1alpha1" + v1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" scheme "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" diff --git a/pkg/client/clientset/versioned/typed/v1alpha1/generated_expansion.go b/pkg/client/clientset/versioned/typed/gateway/v1alpha1/generated_expansion.go similarity index 100% rename from pkg/client/clientset/versioned/typed/v1alpha1/generated_expansion.go rename to pkg/client/clientset/versioned/typed/gateway/v1alpha1/generated_expansion.go diff --git a/pkg/client/gateway/clientset/versioned/clientset.go b/pkg/client/gateway/clientset/versioned/clientset.go new file mode 100644 index 0000000000..c71d3d484e --- /dev/null +++ b/pkg/client/gateway/clientset/versioned/clientset.go @@ -0,0 +1,81 @@ +// Code generated by client-gen. DO NOT EDIT. + +package versioned + +import ( + "fmt" + + gatewayv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1" + discovery "k8s.io/client-go/discovery" + rest "k8s.io/client-go/rest" + flowcontrol "k8s.io/client-go/util/flowcontrol" +) + +type Interface interface { + Discovery() discovery.DiscoveryInterface + GatewayV1alpha1() gatewayv1alpha1.GatewayV1alpha1Interface +} + +// Clientset contains the clients for groups. Each group has exactly one +// version included in a Clientset. +type Clientset struct { + *discovery.DiscoveryClient + gatewayV1alpha1 *gatewayv1alpha1.GatewayV1alpha1Client +} + +// GatewayV1alpha1 retrieves the GatewayV1alpha1Client +func (c *Clientset) GatewayV1alpha1() gatewayv1alpha1.GatewayV1alpha1Interface { + return c.gatewayV1alpha1 +} + +// Discovery retrieves the DiscoveryClient +func (c *Clientset) Discovery() discovery.DiscoveryInterface { + if c == nil { + return nil + } + return c.DiscoveryClient +} + +// NewForConfig creates a new Clientset for the given config. +// If config's RateLimiter is not set and QPS and Burst are acceptable, +// NewForConfig will generate a rate-limiter in configShallowCopy. +func NewForConfig(c *rest.Config) (*Clientset, error) { + configShallowCopy := *c + if configShallowCopy.RateLimiter == nil && configShallowCopy.QPS > 0 { + if configShallowCopy.Burst <= 0 { + return nil, fmt.Errorf("burst is required to be greater than 0 when RateLimiter is not set and QPS is set to greater than 0") + } + configShallowCopy.RateLimiter = flowcontrol.NewTokenBucketRateLimiter(configShallowCopy.QPS, configShallowCopy.Burst) + } + var cs Clientset + var err error + cs.gatewayV1alpha1, err = gatewayv1alpha1.NewForConfig(&configShallowCopy) + if err != nil { + return nil, err + } + + cs.DiscoveryClient, err = discovery.NewDiscoveryClientForConfig(&configShallowCopy) + if err != nil { + return nil, err + } + return &cs, nil +} + +// NewForConfigOrDie creates a new Clientset for the given config and +// panics if there is an error in the config. +func NewForConfigOrDie(c *rest.Config) *Clientset { + var cs Clientset + cs.gatewayV1alpha1 = gatewayv1alpha1.NewForConfigOrDie(c) + + cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) + return &cs +} + +// New creates a new Clientset for the given RESTClient. +func New(c rest.Interface) *Clientset { + var cs Clientset + cs.gatewayV1alpha1 = gatewayv1alpha1.New(c) + + cs.DiscoveryClient = discovery.NewDiscoveryClient(c) + return &cs +} diff --git a/pkg/client/gateway/clientset/versioned/doc.go b/pkg/client/gateway/clientset/versioned/doc.go new file mode 100644 index 0000000000..0e0c2a8900 --- /dev/null +++ b/pkg/client/gateway/clientset/versioned/doc.go @@ -0,0 +1,4 @@ +// Code generated by client-gen. DO NOT EDIT. + +// This package has the automatically generated clientset. +package versioned diff --git a/pkg/client/gateway/clientset/versioned/fake/clientset_generated.go b/pkg/client/gateway/clientset/versioned/fake/clientset_generated.go new file mode 100644 index 0000000000..235bcbe12b --- /dev/null +++ b/pkg/client/gateway/clientset/versioned/fake/clientset_generated.go @@ -0,0 +1,69 @@ +// Code generated by client-gen. DO NOT EDIT. + +package fake + +import ( + clientset "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/clientset/versioned" + gatewayv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1" + fakegatewayv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/fake" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/watch" + "k8s.io/client-go/discovery" + fakediscovery "k8s.io/client-go/discovery/fake" + "k8s.io/client-go/testing" +) + +// NewSimpleClientset returns a clientset that will respond with the provided objects. +// It's backed by a very simple object tracker that processes creates, updates and deletions as-is, +// without applying any validations and/or defaults. It shouldn't be considered a replacement +// for a real clientset and is mostly useful in simple unit tests. +func NewSimpleClientset(objects ...runtime.Object) *Clientset { + o := testing.NewObjectTracker(scheme, codecs.UniversalDecoder()) + for _, obj := range objects { + if err := o.Add(obj); err != nil { + panic(err) + } + } + + cs := &Clientset{tracker: o} + cs.discovery = &fakediscovery.FakeDiscovery{Fake: &cs.Fake} + cs.AddReactor("*", "*", testing.ObjectReaction(o)) + cs.AddWatchReactor("*", func(action testing.Action) (handled bool, ret watch.Interface, err error) { + gvr := action.GetResource() + ns := action.GetNamespace() + watch, err := o.Watch(gvr, ns) + if err != nil { + return false, nil, err + } + return true, watch, nil + }) + + return cs +} + +// Clientset implements clientset.Interface. Meant to be embedded into a +// struct to get a default implementation. This makes faking out just the method +// you want to test easier. +type Clientset struct { + testing.Fake + discovery *fakediscovery.FakeDiscovery + tracker testing.ObjectTracker +} + +func (c *Clientset) Discovery() discovery.DiscoveryInterface { + return c.discovery +} + +func (c *Clientset) Tracker() testing.ObjectTracker { + return c.tracker +} + +var ( + _ clientset.Interface = &Clientset{} + _ testing.FakeClient = &Clientset{} +) + +// GatewayV1alpha1 retrieves the GatewayV1alpha1Client +func (c *Clientset) GatewayV1alpha1() gatewayv1alpha1.GatewayV1alpha1Interface { + return &fakegatewayv1alpha1.FakeGatewayV1alpha1{Fake: &c.Fake} +} diff --git a/pkg/client/gateway/clientset/versioned/fake/doc.go b/pkg/client/gateway/clientset/versioned/fake/doc.go new file mode 100644 index 0000000000..3630ed1cd1 --- /dev/null +++ b/pkg/client/gateway/clientset/versioned/fake/doc.go @@ -0,0 +1,4 @@ +// Code generated by client-gen. DO NOT EDIT. + +// This package has the automatically generated fake clientset. +package fake diff --git a/pkg/client/gateway/clientset/versioned/fake/register.go b/pkg/client/gateway/clientset/versioned/fake/register.go new file mode 100644 index 0000000000..1983d8ca42 --- /dev/null +++ b/pkg/client/gateway/clientset/versioned/fake/register.go @@ -0,0 +1,40 @@ +// Code generated by client-gen. DO NOT EDIT. + +package fake + +import ( + gatewayv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + schema "k8s.io/apimachinery/pkg/runtime/schema" + serializer "k8s.io/apimachinery/pkg/runtime/serializer" + utilruntime "k8s.io/apimachinery/pkg/util/runtime" +) + +var scheme = runtime.NewScheme() +var codecs = serializer.NewCodecFactory(scheme) + +var localSchemeBuilder = runtime.SchemeBuilder{ + gatewayv1alpha1.AddToScheme, +} + +// AddToScheme adds all types of this clientset into the given scheme. This allows composition +// of clientsets, like in: +// +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) +// +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// +// After this, RawExtensions in Kubernetes types will serialize kube-aggregator types +// correctly. +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) + utilruntime.Must(AddToScheme(scheme)) +} diff --git a/pkg/client/gateway/clientset/versioned/scheme/doc.go b/pkg/client/gateway/clientset/versioned/scheme/doc.go new file mode 100644 index 0000000000..14db57a58f --- /dev/null +++ b/pkg/client/gateway/clientset/versioned/scheme/doc.go @@ -0,0 +1,4 @@ +// Code generated by client-gen. DO NOT EDIT. + +// This package contains the scheme of the automatically generated clientset. +package scheme diff --git a/pkg/client/gateway/clientset/versioned/scheme/register.go b/pkg/client/gateway/clientset/versioned/scheme/register.go new file mode 100644 index 0000000000..1301842a72 --- /dev/null +++ b/pkg/client/gateway/clientset/versioned/scheme/register.go @@ -0,0 +1,40 @@ +// Code generated by client-gen. DO NOT EDIT. + +package scheme + +import ( + gatewayv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + schema "k8s.io/apimachinery/pkg/runtime/schema" + serializer "k8s.io/apimachinery/pkg/runtime/serializer" + utilruntime "k8s.io/apimachinery/pkg/util/runtime" +) + +var Scheme = runtime.NewScheme() +var Codecs = serializer.NewCodecFactory(Scheme) +var ParameterCodec = runtime.NewParameterCodec(Scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + gatewayv1alpha1.AddToScheme, +} + +// AddToScheme adds all types of this clientset into the given scheme. This allows composition +// of clientsets, like in: +// +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) +// +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// +// After this, RawExtensions in Kubernetes types will serialize kube-aggregator types +// correctly. +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) + utilruntime.Must(AddToScheme(Scheme)) +} diff --git a/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/doc.go b/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/doc.go new file mode 100644 index 0000000000..93a7ca4e0e --- /dev/null +++ b/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/doc.go @@ -0,0 +1,4 @@ +// Code generated by client-gen. DO NOT EDIT. + +// This package has the automatically generated typed clients. +package v1alpha1 diff --git a/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/fake/doc.go b/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/fake/doc.go new file mode 100644 index 0000000000..2b5ba4c8e4 --- /dev/null +++ b/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/fake/doc.go @@ -0,0 +1,4 @@ +// Code generated by client-gen. DO NOT EDIT. + +// Package fake has the automatically generated clients. +package fake diff --git a/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/fake/fake_gateway_client.go b/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/fake/fake_gateway_client.go new file mode 100644 index 0000000000..6d1e054ad7 --- /dev/null +++ b/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/fake/fake_gateway_client.go @@ -0,0 +1,24 @@ +// Code generated by client-gen. DO NOT EDIT. + +package fake + +import ( + v1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1" + rest "k8s.io/client-go/rest" + testing "k8s.io/client-go/testing" +) + +type FakeGatewayV1alpha1 struct { + *testing.Fake +} + +func (c *FakeGatewayV1alpha1) GatewayConfigs() v1alpha1.GatewayConfigInterface { + return &FakeGatewayConfigs{c} +} + +// RESTClient returns a RESTClient that is used to communicate +// with API server by this client implementation. +func (c *FakeGatewayV1alpha1) RESTClient() rest.Interface { + var ret *rest.RESTClient + return ret +} diff --git a/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/fake/fake_gatewayconfig.go b/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/fake/fake_gatewayconfig.go new file mode 100644 index 0000000000..71efbd3b9b --- /dev/null +++ b/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/fake/fake_gatewayconfig.go @@ -0,0 +1,106 @@ +// Code generated by client-gen. DO NOT EDIT. + +package fake + +import ( + "context" + + v1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + labels "k8s.io/apimachinery/pkg/labels" + schema "k8s.io/apimachinery/pkg/runtime/schema" + types "k8s.io/apimachinery/pkg/types" + watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" +) + +// FakeGatewayConfigs implements GatewayConfigInterface +type FakeGatewayConfigs struct { + Fake *FakeGatewayV1alpha1 +} + +var gatewayconfigsResource = schema.GroupVersionResource{Group: "gateway.nginx.org", Version: "v1alpha1", Resource: "gatewayconfigs"} + +var gatewayconfigsKind = schema.GroupVersionKind{Group: "gateway.nginx.org", Version: "v1alpha1", Kind: "GatewayConfig"} + +// Get takes name of the gatewayConfig, and returns the corresponding gatewayConfig object, and an error if there is any. +func (c *FakeGatewayConfigs) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.GatewayConfig, err error) { + obj, err := c.Fake. + Invokes(testing.NewRootGetAction(gatewayconfigsResource, name), &v1alpha1.GatewayConfig{}) + if obj == nil { + return nil, err + } + return obj.(*v1alpha1.GatewayConfig), err +} + +// List takes label and field selectors, and returns the list of GatewayConfigs that match those selectors. +func (c *FakeGatewayConfigs) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.GatewayConfigList, err error) { + obj, err := c.Fake. + Invokes(testing.NewRootListAction(gatewayconfigsResource, gatewayconfigsKind, opts), &v1alpha1.GatewayConfigList{}) + if obj == nil { + return nil, err + } + + label, _, _ := testing.ExtractFromListOptions(opts) + if label == nil { + label = labels.Everything() + } + list := &v1alpha1.GatewayConfigList{ListMeta: obj.(*v1alpha1.GatewayConfigList).ListMeta} + for _, item := range obj.(*v1alpha1.GatewayConfigList).Items { + if label.Matches(labels.Set(item.Labels)) { + list.Items = append(list.Items, item) + } + } + return list, err +} + +// Watch returns a watch.Interface that watches the requested gatewayConfigs. +func (c *FakeGatewayConfigs) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { + return c.Fake. + InvokesWatch(testing.NewRootWatchAction(gatewayconfigsResource, opts)) +} + +// Create takes the representation of a gatewayConfig and creates it. Returns the server's representation of the gatewayConfig, and an error, if there is any. +func (c *FakeGatewayConfigs) Create(ctx context.Context, gatewayConfig *v1alpha1.GatewayConfig, opts v1.CreateOptions) (result *v1alpha1.GatewayConfig, err error) { + obj, err := c.Fake. + Invokes(testing.NewRootCreateAction(gatewayconfigsResource, gatewayConfig), &v1alpha1.GatewayConfig{}) + if obj == nil { + return nil, err + } + return obj.(*v1alpha1.GatewayConfig), err +} + +// Update takes the representation of a gatewayConfig and updates it. Returns the server's representation of the gatewayConfig, and an error, if there is any. +func (c *FakeGatewayConfigs) Update(ctx context.Context, gatewayConfig *v1alpha1.GatewayConfig, opts v1.UpdateOptions) (result *v1alpha1.GatewayConfig, err error) { + obj, err := c.Fake. + Invokes(testing.NewRootUpdateAction(gatewayconfigsResource, gatewayConfig), &v1alpha1.GatewayConfig{}) + if obj == nil { + return nil, err + } + return obj.(*v1alpha1.GatewayConfig), err +} + +// Delete takes name of the gatewayConfig and deletes it. Returns an error if one occurs. +func (c *FakeGatewayConfigs) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { + _, err := c.Fake. + Invokes(testing.NewRootDeleteAction(gatewayconfigsResource, name), &v1alpha1.GatewayConfig{}) + return err +} + +// DeleteCollection deletes a collection of objects. +func (c *FakeGatewayConfigs) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { + action := testing.NewRootDeleteCollectionAction(gatewayconfigsResource, listOpts) + + _, err := c.Fake.Invokes(action, &v1alpha1.GatewayConfigList{}) + return err +} + +// Patch applies the patch and returns the patched gatewayConfig. +func (c *FakeGatewayConfigs) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.GatewayConfig, err error) { + obj, err := c.Fake. + Invokes(testing.NewRootPatchSubresourceAction(gatewayconfigsResource, name, pt, data, subresources...), &v1alpha1.GatewayConfig{}) + if obj == nil { + return nil, err + } + return obj.(*v1alpha1.GatewayConfig), err +} diff --git a/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/gateway_client.go b/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/gateway_client.go new file mode 100644 index 0000000000..cac126b1c2 --- /dev/null +++ b/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/gateway_client.go @@ -0,0 +1,73 @@ +// Code generated by client-gen. DO NOT EDIT. + +package v1alpha1 + +import ( + v1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" + "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/clientset/versioned/scheme" + rest "k8s.io/client-go/rest" +) + +type GatewayV1alpha1Interface interface { + RESTClient() rest.Interface + GatewayConfigsGetter +} + +// GatewayV1alpha1Client is used to interact with features provided by the gateway.nginx.org group. +type GatewayV1alpha1Client struct { + restClient rest.Interface +} + +func (c *GatewayV1alpha1Client) GatewayConfigs() GatewayConfigInterface { + return newGatewayConfigs(c) +} + +// NewForConfig creates a new GatewayV1alpha1Client for the given config. +func NewForConfig(c *rest.Config) (*GatewayV1alpha1Client, error) { + config := *c + if err := setConfigDefaults(&config); err != nil { + return nil, err + } + client, err := rest.RESTClientFor(&config) + if err != nil { + return nil, err + } + return &GatewayV1alpha1Client{client}, nil +} + +// NewForConfigOrDie creates a new GatewayV1alpha1Client for the given config and +// panics if there is an error in the config. +func NewForConfigOrDie(c *rest.Config) *GatewayV1alpha1Client { + client, err := NewForConfig(c) + if err != nil { + panic(err) + } + return client +} + +// New creates a new GatewayV1alpha1Client for the given RESTClient. +func New(c rest.Interface) *GatewayV1alpha1Client { + return &GatewayV1alpha1Client{c} +} + +func setConfigDefaults(config *rest.Config) error { + gv := v1alpha1.SchemeGroupVersion + config.GroupVersion = &gv + config.APIPath = "/apis" + config.NegotiatedSerializer = scheme.Codecs.WithoutConversion() + + if config.UserAgent == "" { + config.UserAgent = rest.DefaultKubernetesUserAgent() + } + + return nil +} + +// RESTClient returns a RESTClient that is used to communicate +// with API server by this client implementation. +func (c *GatewayV1alpha1Client) RESTClient() rest.Interface { + if c == nil { + return nil + } + return c.restClient +} diff --git a/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/gatewayconfig.go b/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/gatewayconfig.go new file mode 100644 index 0000000000..0a0c76faee --- /dev/null +++ b/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/gatewayconfig.go @@ -0,0 +1,152 @@ +// Code generated by client-gen. DO NOT EDIT. + +package v1alpha1 + +import ( + "context" + "time" + + v1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" + scheme "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/clientset/versioned/scheme" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + types "k8s.io/apimachinery/pkg/types" + watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" +) + +// GatewayConfigsGetter has a method to return a GatewayConfigInterface. +// A group's client should implement this interface. +type GatewayConfigsGetter interface { + GatewayConfigs() GatewayConfigInterface +} + +// GatewayConfigInterface has methods to work with GatewayConfig resources. +type GatewayConfigInterface interface { + Create(ctx context.Context, gatewayConfig *v1alpha1.GatewayConfig, opts v1.CreateOptions) (*v1alpha1.GatewayConfig, error) + Update(ctx context.Context, gatewayConfig *v1alpha1.GatewayConfig, opts v1.UpdateOptions) (*v1alpha1.GatewayConfig, error) + Delete(ctx context.Context, name string, opts v1.DeleteOptions) error + DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error + Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.GatewayConfig, error) + List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.GatewayConfigList, error) + Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.GatewayConfig, err error) + GatewayConfigExpansion +} + +// gatewayConfigs implements GatewayConfigInterface +type gatewayConfigs struct { + client rest.Interface +} + +// newGatewayConfigs returns a GatewayConfigs +func newGatewayConfigs(c *GatewayV1alpha1Client) *gatewayConfigs { + return &gatewayConfigs{ + client: c.RESTClient(), + } +} + +// Get takes name of the gatewayConfig, and returns the corresponding gatewayConfig object, and an error if there is any. +func (c *gatewayConfigs) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.GatewayConfig, err error) { + result = &v1alpha1.GatewayConfig{} + err = c.client.Get(). + Resource("gatewayconfigs"). + Name(name). + VersionedParams(&options, scheme.ParameterCodec). + Do(ctx). + Into(result) + return +} + +// List takes label and field selectors, and returns the list of GatewayConfigs that match those selectors. +func (c *gatewayConfigs) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.GatewayConfigList, err error) { + var timeout time.Duration + if opts.TimeoutSeconds != nil { + timeout = time.Duration(*opts.TimeoutSeconds) * time.Second + } + result = &v1alpha1.GatewayConfigList{} + err = c.client.Get(). + Resource("gatewayconfigs"). + VersionedParams(&opts, scheme.ParameterCodec). + Timeout(timeout). + Do(ctx). + Into(result) + return +} + +// Watch returns a watch.Interface that watches the requested gatewayConfigs. +func (c *gatewayConfigs) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { + var timeout time.Duration + if opts.TimeoutSeconds != nil { + timeout = time.Duration(*opts.TimeoutSeconds) * time.Second + } + opts.Watch = true + return c.client.Get(). + Resource("gatewayconfigs"). + VersionedParams(&opts, scheme.ParameterCodec). + Timeout(timeout). + Watch(ctx) +} + +// Create takes the representation of a gatewayConfig and creates it. Returns the server's representation of the gatewayConfig, and an error, if there is any. +func (c *gatewayConfigs) Create(ctx context.Context, gatewayConfig *v1alpha1.GatewayConfig, opts v1.CreateOptions) (result *v1alpha1.GatewayConfig, err error) { + result = &v1alpha1.GatewayConfig{} + err = c.client.Post(). + Resource("gatewayconfigs"). + VersionedParams(&opts, scheme.ParameterCodec). + Body(gatewayConfig). + Do(ctx). + Into(result) + return +} + +// Update takes the representation of a gatewayConfig and updates it. Returns the server's representation of the gatewayConfig, and an error, if there is any. +func (c *gatewayConfigs) Update(ctx context.Context, gatewayConfig *v1alpha1.GatewayConfig, opts v1.UpdateOptions) (result *v1alpha1.GatewayConfig, err error) { + result = &v1alpha1.GatewayConfig{} + err = c.client.Put(). + Resource("gatewayconfigs"). + Name(gatewayConfig.Name). + VersionedParams(&opts, scheme.ParameterCodec). + Body(gatewayConfig). + Do(ctx). + Into(result) + return +} + +// Delete takes name of the gatewayConfig and deletes it. Returns an error if one occurs. +func (c *gatewayConfigs) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { + return c.client.Delete(). + Resource("gatewayconfigs"). + Name(name). + Body(&opts). + Do(ctx). + Error() +} + +// DeleteCollection deletes a collection of objects. +func (c *gatewayConfigs) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { + var timeout time.Duration + if listOpts.TimeoutSeconds != nil { + timeout = time.Duration(*listOpts.TimeoutSeconds) * time.Second + } + return c.client.Delete(). + Resource("gatewayconfigs"). + VersionedParams(&listOpts, scheme.ParameterCodec). + Timeout(timeout). + Body(&opts). + Do(ctx). + Error() +} + +// Patch applies the patch and returns the patched gatewayConfig. +func (c *gatewayConfigs) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.GatewayConfig, err error) { + result = &v1alpha1.GatewayConfig{} + err = c.client.Patch(pt). + Resource("gatewayconfigs"). + Name(name). + SubResource(subresources...). + VersionedParams(&opts, scheme.ParameterCodec). + Body(data). + Do(ctx). + Into(result) + return +} diff --git a/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/generated_expansion.go b/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/generated_expansion.go new file mode 100644 index 0000000000..f847da0399 --- /dev/null +++ b/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/generated_expansion.go @@ -0,0 +1,5 @@ +// Code generated by client-gen. DO NOT EDIT. + +package v1alpha1 + +type GatewayConfigExpansion interface{} diff --git a/pkg/client/gateway/informers/externalversions/factory.go b/pkg/client/gateway/informers/externalversions/factory.go new file mode 100644 index 0000000000..d090412b1e --- /dev/null +++ b/pkg/client/gateway/informers/externalversions/factory.go @@ -0,0 +1,164 @@ +// Code generated by informer-gen. DO NOT EDIT. + +package externalversions + +import ( + reflect "reflect" + sync "sync" + time "time" + + versioned "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/clientset/versioned" + gateway "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/informers/externalversions/gateway" + internalinterfaces "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/informers/externalversions/internalinterfaces" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + schema "k8s.io/apimachinery/pkg/runtime/schema" + cache "k8s.io/client-go/tools/cache" +) + +// SharedInformerOption defines the functional option type for SharedInformerFactory. +type SharedInformerOption func(*sharedInformerFactory) *sharedInformerFactory + +type sharedInformerFactory struct { + client versioned.Interface + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc + lock sync.Mutex + defaultResync time.Duration + customResync map[reflect.Type]time.Duration + + informers map[reflect.Type]cache.SharedIndexInformer + // startedInformers is used for tracking which informers have been started. + // This allows Start() to be called multiple times safely. + startedInformers map[reflect.Type]bool +} + +// WithCustomResyncConfig sets a custom resync period for the specified informer types. +func WithCustomResyncConfig(resyncConfig map[v1.Object]time.Duration) SharedInformerOption { + return func(factory *sharedInformerFactory) *sharedInformerFactory { + for k, v := range resyncConfig { + factory.customResync[reflect.TypeOf(k)] = v + } + return factory + } +} + +// WithTweakListOptions sets a custom filter on all listers of the configured SharedInformerFactory. +func WithTweakListOptions(tweakListOptions internalinterfaces.TweakListOptionsFunc) SharedInformerOption { + return func(factory *sharedInformerFactory) *sharedInformerFactory { + factory.tweakListOptions = tweakListOptions + return factory + } +} + +// WithNamespace limits the SharedInformerFactory to the specified namespace. +func WithNamespace(namespace string) SharedInformerOption { + return func(factory *sharedInformerFactory) *sharedInformerFactory { + factory.namespace = namespace + return factory + } +} + +// NewSharedInformerFactory constructs a new instance of sharedInformerFactory for all namespaces. +func NewSharedInformerFactory(client versioned.Interface, defaultResync time.Duration) SharedInformerFactory { + return NewSharedInformerFactoryWithOptions(client, defaultResync) +} + +// NewFilteredSharedInformerFactory constructs a new instance of sharedInformerFactory. +// Listers obtained via this SharedInformerFactory will be subject to the same filters +// as specified here. +// Deprecated: Please use NewSharedInformerFactoryWithOptions instead +func NewFilteredSharedInformerFactory(client versioned.Interface, defaultResync time.Duration, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) SharedInformerFactory { + return NewSharedInformerFactoryWithOptions(client, defaultResync, WithNamespace(namespace), WithTweakListOptions(tweakListOptions)) +} + +// NewSharedInformerFactoryWithOptions constructs a new instance of a SharedInformerFactory with additional options. +func NewSharedInformerFactoryWithOptions(client versioned.Interface, defaultResync time.Duration, options ...SharedInformerOption) SharedInformerFactory { + factory := &sharedInformerFactory{ + client: client, + namespace: v1.NamespaceAll, + defaultResync: defaultResync, + informers: make(map[reflect.Type]cache.SharedIndexInformer), + startedInformers: make(map[reflect.Type]bool), + customResync: make(map[reflect.Type]time.Duration), + } + + // Apply all options + for _, opt := range options { + factory = opt(factory) + } + + return factory +} + +// Start initializes all requested informers. +func (f *sharedInformerFactory) Start(stopCh <-chan struct{}) { + f.lock.Lock() + defer f.lock.Unlock() + + for informerType, informer := range f.informers { + if !f.startedInformers[informerType] { + go informer.Run(stopCh) + f.startedInformers[informerType] = true + } + } +} + +// WaitForCacheSync waits for all started informers' cache were synced. +func (f *sharedInformerFactory) WaitForCacheSync(stopCh <-chan struct{}) map[reflect.Type]bool { + informers := func() map[reflect.Type]cache.SharedIndexInformer { + f.lock.Lock() + defer f.lock.Unlock() + + informers := map[reflect.Type]cache.SharedIndexInformer{} + for informerType, informer := range f.informers { + if f.startedInformers[informerType] { + informers[informerType] = informer + } + } + return informers + }() + + res := map[reflect.Type]bool{} + for informType, informer := range informers { + res[informType] = cache.WaitForCacheSync(stopCh, informer.HasSynced) + } + return res +} + +// InternalInformerFor returns the SharedIndexInformer for obj using an internal +// client. +func (f *sharedInformerFactory) InformerFor(obj runtime.Object, newFunc internalinterfaces.NewInformerFunc) cache.SharedIndexInformer { + f.lock.Lock() + defer f.lock.Unlock() + + informerType := reflect.TypeOf(obj) + informer, exists := f.informers[informerType] + if exists { + return informer + } + + resyncPeriod, exists := f.customResync[informerType] + if !exists { + resyncPeriod = f.defaultResync + } + + informer = newFunc(f.client, resyncPeriod) + f.informers[informerType] = informer + + return informer +} + +// SharedInformerFactory provides shared informers for resources in all known +// API group versions. +type SharedInformerFactory interface { + internalinterfaces.SharedInformerFactory + ForResource(resource schema.GroupVersionResource) (GenericInformer, error) + WaitForCacheSync(stopCh <-chan struct{}) map[reflect.Type]bool + + Gateway() gateway.Interface +} + +func (f *sharedInformerFactory) Gateway() gateway.Interface { + return gateway.New(f, f.namespace, f.tweakListOptions) +} diff --git a/pkg/client/gateway/informers/externalversions/gateway/interface.go b/pkg/client/gateway/informers/externalversions/gateway/interface.go new file mode 100644 index 0000000000..fa262e61d1 --- /dev/null +++ b/pkg/client/gateway/informers/externalversions/gateway/interface.go @@ -0,0 +1,30 @@ +// Code generated by informer-gen. DO NOT EDIT. + +package gateway + +import ( + v1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/informers/externalversions/gateway/v1alpha1" + internalinterfaces "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/informers/externalversions/internalinterfaces" +) + +// Interface provides access to each of this group's versions. +type Interface interface { + // V1alpha1 provides access to shared informers for resources in V1alpha1. + V1alpha1() v1alpha1.Interface +} + +type group struct { + factory internalinterfaces.SharedInformerFactory + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc +} + +// New returns a new Interface. +func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { + return &group{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} +} + +// V1alpha1 returns a new v1alpha1.Interface. +func (g *group) V1alpha1() v1alpha1.Interface { + return v1alpha1.New(g.factory, g.namespace, g.tweakListOptions) +} diff --git a/pkg/client/gateway/informers/externalversions/gateway/v1alpha1/gatewayconfig.go b/pkg/client/gateway/informers/externalversions/gateway/v1alpha1/gatewayconfig.go new file mode 100644 index 0000000000..4f7fe98459 --- /dev/null +++ b/pkg/client/gateway/informers/externalversions/gateway/v1alpha1/gatewayconfig.go @@ -0,0 +1,73 @@ +// Code generated by informer-gen. DO NOT EDIT. + +package v1alpha1 + +import ( + "context" + time "time" + + gatewayv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" + versioned "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/clientset/versioned" + internalinterfaces "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/listers/gateway/v1alpha1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + watch "k8s.io/apimachinery/pkg/watch" + cache "k8s.io/client-go/tools/cache" +) + +// GatewayConfigInformer provides access to a shared informer and lister for +// GatewayConfigs. +type GatewayConfigInformer interface { + Informer() cache.SharedIndexInformer + Lister() v1alpha1.GatewayConfigLister +} + +type gatewayConfigInformer struct { + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc +} + +// NewGatewayConfigInformer constructs a new informer for GatewayConfig type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewGatewayConfigInformer(client versioned.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredGatewayConfigInformer(client, resyncPeriod, indexers, nil) +} + +// NewFilteredGatewayConfigInformer constructs a new informer for GatewayConfig type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredGatewayConfigInformer(client versioned.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { + return cache.NewSharedIndexInformer( + &cache.ListWatch{ + ListFunc: func(options v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } + return client.GatewayV1alpha1().GatewayConfigs().List(context.TODO(), options) + }, + WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } + return client.GatewayV1alpha1().GatewayConfigs().Watch(context.TODO(), options) + }, + }, + &gatewayv1alpha1.GatewayConfig{}, + resyncPeriod, + indexers, + ) +} + +func (f *gatewayConfigInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredGatewayConfigInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) +} + +func (f *gatewayConfigInformer) Informer() cache.SharedIndexInformer { + return f.factory.InformerFor(&gatewayv1alpha1.GatewayConfig{}, f.defaultInformer) +} + +func (f *gatewayConfigInformer) Lister() v1alpha1.GatewayConfigLister { + return v1alpha1.NewGatewayConfigLister(f.Informer().GetIndexer()) +} diff --git a/pkg/client/gateway/informers/externalversions/gateway/v1alpha1/interface.go b/pkg/client/gateway/informers/externalversions/gateway/v1alpha1/interface.go new file mode 100644 index 0000000000..6ef36d213b --- /dev/null +++ b/pkg/client/gateway/informers/externalversions/gateway/v1alpha1/interface.go @@ -0,0 +1,29 @@ +// Code generated by informer-gen. DO NOT EDIT. + +package v1alpha1 + +import ( + internalinterfaces "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/informers/externalversions/internalinterfaces" +) + +// Interface provides access to all the informers in this group version. +type Interface interface { + // GatewayConfigs returns a GatewayConfigInformer. + GatewayConfigs() GatewayConfigInformer +} + +type version struct { + factory internalinterfaces.SharedInformerFactory + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc +} + +// New returns a new Interface. +func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { + return &version{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} +} + +// GatewayConfigs returns a GatewayConfigInformer. +func (v *version) GatewayConfigs() GatewayConfigInformer { + return &gatewayConfigInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} +} diff --git a/pkg/client/gateway/informers/externalversions/generic.go b/pkg/client/gateway/informers/externalversions/generic.go new file mode 100644 index 0000000000..17e3fd8620 --- /dev/null +++ b/pkg/client/gateway/informers/externalversions/generic.go @@ -0,0 +1,46 @@ +// Code generated by informer-gen. DO NOT EDIT. + +package externalversions + +import ( + "fmt" + + v1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" + schema "k8s.io/apimachinery/pkg/runtime/schema" + cache "k8s.io/client-go/tools/cache" +) + +// GenericInformer is type of SharedIndexInformer which will locate and delegate to other +// sharedInformers based on type +type GenericInformer interface { + Informer() cache.SharedIndexInformer + Lister() cache.GenericLister +} + +type genericInformer struct { + informer cache.SharedIndexInformer + resource schema.GroupResource +} + +// Informer returns the SharedIndexInformer. +func (f *genericInformer) Informer() cache.SharedIndexInformer { + return f.informer +} + +// Lister returns the GenericLister. +func (f *genericInformer) Lister() cache.GenericLister { + return cache.NewGenericLister(f.Informer().GetIndexer(), f.resource) +} + +// ForResource gives generic access to a shared informer of the matching type +// TODO extend this to unknown resources with a client pool +func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) { + switch resource { + // Group=gateway.nginx.org, Version=v1alpha1 + case v1alpha1.SchemeGroupVersion.WithResource("gatewayconfigs"): + return &genericInformer{resource: resource.GroupResource(), informer: f.Gateway().V1alpha1().GatewayConfigs().Informer()}, nil + + } + + return nil, fmt.Errorf("no informer found for %v", resource) +} diff --git a/pkg/client/gateway/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/client/gateway/informers/externalversions/internalinterfaces/factory_interfaces.go new file mode 100644 index 0000000000..70fd222817 --- /dev/null +++ b/pkg/client/gateway/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -0,0 +1,24 @@ +// Code generated by informer-gen. DO NOT EDIT. + +package internalinterfaces + +import ( + time "time" + + versioned "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/clientset/versioned" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + cache "k8s.io/client-go/tools/cache" +) + +// NewInformerFunc takes versioned.Interface and time.Duration to return a SharedIndexInformer. +type NewInformerFunc func(versioned.Interface, time.Duration) cache.SharedIndexInformer + +// SharedInformerFactory a small interface to allow for adding an informer without an import cycle +type SharedInformerFactory interface { + Start(stopCh <-chan struct{}) + InformerFor(obj runtime.Object, newFunc NewInformerFunc) cache.SharedIndexInformer +} + +// TweakListOptionsFunc is a function that transforms a v1.ListOptions. +type TweakListOptionsFunc func(*v1.ListOptions) diff --git a/pkg/client/gateway/listers/gateway/v1alpha1/expansion_generated.go b/pkg/client/gateway/listers/gateway/v1alpha1/expansion_generated.go new file mode 100644 index 0000000000..743e81546a --- /dev/null +++ b/pkg/client/gateway/listers/gateway/v1alpha1/expansion_generated.go @@ -0,0 +1,7 @@ +// Code generated by lister-gen. DO NOT EDIT. + +package v1alpha1 + +// GatewayConfigListerExpansion allows custom methods to be added to +// GatewayConfigLister. +type GatewayConfigListerExpansion interface{} diff --git a/pkg/client/gateway/listers/gateway/v1alpha1/gatewayconfig.go b/pkg/client/gateway/listers/gateway/v1alpha1/gatewayconfig.go new file mode 100644 index 0000000000..1df00310de --- /dev/null +++ b/pkg/client/gateway/listers/gateway/v1alpha1/gatewayconfig.go @@ -0,0 +1,52 @@ +// Code generated by lister-gen. DO NOT EDIT. + +package v1alpha1 + +import ( + v1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" + "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/labels" + "k8s.io/client-go/tools/cache" +) + +// GatewayConfigLister helps list GatewayConfigs. +// All objects returned here must be treated as read-only. +type GatewayConfigLister interface { + // List lists all GatewayConfigs in the indexer. + // Objects returned here must be treated as read-only. + List(selector labels.Selector) (ret []*v1alpha1.GatewayConfig, err error) + // Get retrieves the GatewayConfig from the index for a given name. + // Objects returned here must be treated as read-only. + Get(name string) (*v1alpha1.GatewayConfig, error) + GatewayConfigListerExpansion +} + +// gatewayConfigLister implements the GatewayConfigLister interface. +type gatewayConfigLister struct { + indexer cache.Indexer +} + +// NewGatewayConfigLister returns a new GatewayConfigLister. +func NewGatewayConfigLister(indexer cache.Indexer) GatewayConfigLister { + return &gatewayConfigLister{indexer: indexer} +} + +// List lists all GatewayConfigs in the indexer. +func (s *gatewayConfigLister) List(selector labels.Selector) (ret []*v1alpha1.GatewayConfig, err error) { + err = cache.ListAll(s.indexer, selector, func(m interface{}) { + ret = append(ret, m.(*v1alpha1.GatewayConfig)) + }) + return ret, err +} + +// Get retrieves the GatewayConfig from the index for a given name. +func (s *gatewayConfigLister) Get(name string) (*v1alpha1.GatewayConfig, error) { + obj, exists, err := s.indexer.GetByKey(name) + if err != nil { + return nil, err + } + if !exists { + return nil, errors.NewNotFound(v1alpha1.Resource("gatewayconfig"), name) + } + return obj.(*v1alpha1.GatewayConfig), nil +} diff --git a/pkg/sdk/gatewayconfig_controller.go b/pkg/sdk/gatewayconfig_controller.go index d29d5fc8ff..a67e1b5927 100644 --- a/pkg/sdk/gatewayconfig_controller.go +++ b/pkg/sdk/gatewayconfig_controller.go @@ -4,7 +4,7 @@ import ( "context" "github.com/go-logr/logr" - nginxgwv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/v1alpha1" + nginxgwv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" ctlr "sigs.k8s.io/controller-runtime" diff --git a/pkg/sdk/interfaces.go b/pkg/sdk/interfaces.go index 72903394e7..f1497c9872 100644 --- a/pkg/sdk/interfaces.go +++ b/pkg/sdk/interfaces.go @@ -1,7 +1,7 @@ package sdk import ( - nginxgwv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/v1alpha1" + nginxgwv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" "sigs.k8s.io/gateway-api/apis/v1alpha2" ) From f5eb9c64b481d89717c56073bc320474513b4543 Mon Sep 17 00:00:00 2001 From: Matthew Yacobucci Date: Tue, 16 Nov 2021 16:11:03 -0700 Subject: [PATCH 2/2] Code review notes; remove OUT_DIR to docker and make comments accurate --- Makefile | 2 +- pkg/apis/gateway/register.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1220c04887..c148f321df 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ export DOCKER_BUILDKIT = 1 .PHONY: container container: build - docker build --build-arg OUT_DIR=$(OUT_DIR) --build-arg VERSION=$(VERSION) --build-arg GIT_COMMIT=$(GIT_COMMIT) --build-arg DATE=$(DATE) --target $(TARGET) -f build/Dockerfile -t $(PREFIX):$(TAG) . + docker build --build-arg VERSION=$(VERSION) --build-arg GIT_COMMIT=$(GIT_COMMIT) --build-arg DATE=$(DATE) --target $(TARGET) -f build/Dockerfile -t $(PREFIX):$(TAG) . .PHONY: build build: diff --git a/pkg/apis/gateway/register.go b/pkg/apis/gateway/register.go index 51ff64e40a..a2648116ba 100644 --- a/pkg/apis/gateway/register.go +++ b/pkg/apis/gateway/register.go @@ -1,5 +1,5 @@ -// Package specs defines Nginx Service Mesh specs API group +// Package gateway defines the API group for NGINX Gateway configuration resources. package gateway -// GroupName identifies the API Group Name for a circuit breaker. +// GroupName identifies the API Group Name for NGINX Gateway configuration resources. const GroupName = "gateway.nginx.org"