deps: upgrade k8s api version and controller-runtime

Makefile

@@ -1,16 +1,13 @@
-# kubeenv is not supported on darwin/arm64
-ifeq (darwin arm64,$(shell go env GOOS GOARCH))
-KUBEENV_GOARCH=amd64
-else
 KUBEENV_GOARCH=$(shell go env GOARCH)
-endif
 
 CRD_PACKAGE=github.com/pomerium/ingress-controller/apis/ingress/v1
 
 # Image URL to use all building/pushing image targets
-IMG ?= ingress-controller:latest
-CRD_OPTIONS ?=
-ENVTEST_K8S_VERSION = 1.23
+IMG?=ingress-controller:latest
+CRD_OPTIONS?=
+ENVTEST_K8S_VERSION=$(shell go list -f '{{.Module.Version}}' k8s.io/api | sed 's/v0/1/')
+ENVTEST_VERSION=$(shell go list -f '{{.Module.Version}}' sigs.k8s.io/controller-runtime/tools/setup-envtest)
+CONTROLLER_GEN=go run sigs.k8s.io/controller-tools/cmd/[email protected]
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -23,7 +20,7 @@ endif
 # the embedded resources would be supplied externally
 GOTAGS = -tags embed_pomerium
 
-GOLDFLAGS = -X github.com/pomerium/pomerium/internal/version.Version=$(shell go list -f {{.Module.Version}} github.com/pomerium/pomerium) \
+GOLDFLAGS = -X github.com/pomerium/pomerium/internal/version.Version=$(shell go list -f '{{.Module.Version}}' github.com/pomerium/pomerium) \
 	-X github.com/pomerium/pomerium/internal/version.BuildMeta=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ") \
 	-X github.com/pomerium/pomerium/internal/version.ProjectName=pomerium-ingress-controller \
 	-X github.com/pomerium/pomerium/internal/version.ProjectURL=https://www.pomerium.io
@@ -58,37 +55,23 @@ help: ## Display this help.
 ##@ Development
 
 .PHONY: manifests
-manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
-	@echo "==> $@"
-	@$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role crd webhook paths=$(CRD_PACKAGE) output:crd:artifacts:config=config/crd/bases
-
-.PHONY: generate
-generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
-	@echo "==> $@"
-	@$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths=$(CRD_PACKAGE)
-	@go generate $(GOTAGS) ./...
-	@gofmt -s -w ./
-
-.PHONY: fmt
-fmt: ## Run go fmt against code.
+manifests: config/crd/bases/ingress.pomerium.io_pomerium.yaml
 	@echo "==> $@"
-	@go fmt ./...
 
-.PHONY: vet
-vet: ## Run go vet against code.
+config/crd/bases/ingress.pomerium.io_pomerium.yaml: apis/ingress/v1/pomerium_types.go
 	@echo "==> $@"
-	@go vet $(GOTAGS) ./...
+	@$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role crd paths=$(CRD_PACKAGE) output:crd:artifacts:config=config/crd/bases
 
 .PHONY: test
-test: envoy manifests generate fmt vet envtest ## Run tests.
+test: envoy manifests envtest pomerium-ui
 	@echo "==> $@"
-	@KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path --arch=$(KUBEENV_GOARCH))" go test $(GOTAGS) ./... -coverprofile cover.out
+	@KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path --arch=$(KUBEENV_GOARCH))" go test $(GOTAGS) ./...
 
 .PHONY: lint
 lint: envoy pomerium-ui
-	@echo "@==> $@"
+	@echo "==> $@"
 	@VERSION=$$(go run github.com/mikefarah/yq/[email protected] '.jobs.lint.steps[] | select(.uses == "golangci/golangci-lint-action*") | .with.version' .github/workflows/lint.yml) && \
-	go run github.com/golangci/golangci-lint/cmd/golangci-lint@$$VERSION run ./...
+		go run github.com/golangci/golangci-lint/cmd/golangci-lint@$$VERSION run ./...
 
 ##@ Build
 .PHONY: build
@@ -98,15 +81,15 @@ build: pomerium-ui build-go ## Build manager binary.
 
 # called from github actions to build multi-arch images outside of docker
 .PHONY: build-ci
-build-ci: envoy-ci pomerium-ui generate fmt vet
+build-ci: envoy-ci pomerium-ui
 	@GOOS=linux GOARCH=amd64 go build $(GOTAGS) --ldflags="$(GOLDFLAGS)" -o bin/manager-linux-amd64 main.go
 	@GOOS=linux GOARCH=arm64 go build $(GOTAGS) --ldflags="$(GOLDFLAGS)" -o bin/manager-linux-arm64 main.go
 
 ##@ Build
 .PHONY: build-go
-build-go: envoy generate fmt vet
+build-go: envoy
 	@echo "==> $@"
-	go build $(GOTAGS) --ldflags="$(GOVERSIONFLAGS)" -o bin/manager main.go
+	@go build $(GOTAGS) --ldflags="$(GOLDFLAGS)" -o bin/manager main.go
 
 .PHONY: envoy-ci
 envoy-ci:
@@ -121,12 +104,12 @@ envoy:
 
 UI_DIR = $(shell go list -f {{.Dir}} github.com/pomerium/pomerium/ui)
 internal/ui:
-	@echo "@==> $@"
+	@echo "==> $@"
 	@cp -rf $(UI_DIR) ./internal
 	@chmod u+w internal/ui internal/ui/dist
 
 internal/ui/node_modules: internal/ui
-	@echo "@==> $@"
+	@echo "==> $@"
 	@cd internal/ui && yarn install --network-timeout 1000000
 
 .PHONY: pomerium-ui
@@ -136,7 +119,7 @@ internal/ui/dist/index.js: internal/ui/node_modules
 	@cd internal/ui && yarn build
 
 .PHONY: run
-run: manifests generate fmt vet ## Run a controller from your host.
+run: manifests
 	@echo "==> $@"
 	@go run $(GOTAGS) ./main.go
 
@@ -187,18 +170,16 @@ $(LOCALBIN):
 .PHONY: clean
 clean:
 	@echo "==> $@"
+	@chmod -Rf u+w ./bin || true
 	@rm -rf pomerium/envoy/bin/*
 	@rm -rf $(LOCALBIN)
 	@rm -rf testbin
 	@chmod -Rf u+w internal/ui || true
 	@rm -rf internal/ui
 
 KUSTOMIZE ?= $(LOCALBIN)/kustomize
-CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
-ENVTEST ?= $(LOCALBIN)/setup-envtest
+ENVTEST ?= $(LOCALBIN)/setup-envtest-$(ENVTEST_VERSION)
 
-## Tool Versions
-KUSTOMIZE_VERSION ?= v4.5.4
 
 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
 .PHONY: kustomize
@@ -210,20 +191,14 @@ $(KUSTOMIZE): $(LOCALBIN)
 	@rm -rf $(KUSTOMIZE)
 	@curl -s $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN)
 
-.PHONY: controller-gen
-controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
-$(CONTROLLER_GEN): $(LOCALBIN)
-	@echo "==> $@"
-	@GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/[email protected]
-
 .PHONY: envtest
-envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
+envtest: $(ENVTEST)
 $(ENVTEST): $(LOCALBIN)
 	@echo "==> $@"
-	@GOARCH= GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest
+	$(call go-install-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest,$(ENVTEST_VERSION))
 
 .PHONY: deployment
-deployment:
+deployment: kustomize
 	@echo "==> $@"
 	@$(KUSTOMIZE) build config/default > deployment.yaml
 
@@ -262,3 +237,17 @@ dev-build:
 dev-clean:
 	@echo "==> $@"
 	@kubectl delete ns/pomerium --wait || true
+
+# go-install-tool will 'go install' any package with custom target and name of binary, if it doesn't exist
+# $1 - target path with name of binary (ideally with version)
+# $2 - package url which can be installed
+# $3 - specific version of package
+define go-install-tool
+@[ -f $(1) ] || { \
+set -e; \
+package=$(2)@$(3) ;\
+echo "Downloading $${package}" ;\
+GOBIN=$(LOCALBIN) go install $${package} ;\
+mv "$$(echo "$(1)" | sed "s/-$(3)$$//")" $(1) ;\
+}
+endef

cmd/all_in_one.go

@@ -17,6 +17,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	runtime_ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/log"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
 	"github.com/pomerium/pomerium/config"
 	"github.com/pomerium/pomerium/pkg/grpc/databroker"
@@ -311,10 +312,11 @@ func (s *allCmdParam) buildController(ctx context.Context, cfg *config.Config) (
 		},
 		DataBrokerServiceClient: client,
 		MgrOpts: runtime_ctrl.Options{
-			Scheme:             scheme,
-			MetricsBindAddress: s.ingressMetricsAddr,
-			Port:               0,
-			LeaderElection:     false,
+			Scheme: scheme,
+			Metrics: metricsserver.Options{
+				BindAddress: s.ingressMetricsAddr,
+			},
+			LeaderElection: false,
 		},
 		IngressCtrlOpts: s.ingressOpts,
 		GlobalSettings:  &s.settings,
@@ -336,10 +338,9 @@ func (s *allCmdParam) runBootstrapConfigController(ctx context.Context, reconcil
 	}
 
 	mgr, err := runtime_ctrl.NewManager(cfg, runtime_ctrl.Options{
-		Scheme:             scheme,
-		MetricsBindAddress: s.bootstrapMetricsAddr,
-		Port:               0,
-		LeaderElection:     false,
+		Scheme:         scheme,
+		Metrics:        metricsserver.Options{BindAddress: s.bootstrapMetricsAddr},
+		LeaderElection: false,
 	})
 	if err != nil {
 		return fmt.Errorf("manager: %w", err)

cmd/controller.go

@@ -11,6 +11,7 @@ import (
 	"google.golang.org/grpc"
 	"k8s.io/apiserver/pkg/server/healthz"
 	ctrl "sigs.k8s.io/controller-runtime"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
 	"github.com/pomerium/pomerium/pkg/grpc/databroker"
 	"github.com/pomerium/pomerium/pkg/grpcutil"
@@ -23,7 +24,6 @@ type controllerCmd struct {
 	ingressControllerOpts
 
 	metricsAddr string
-	webhookPort int
 	probeAddr   string
 
 	databrokerServiceURL       string
@@ -64,7 +64,6 @@ const (
 
 func (s *controllerCmd) setupFlags() error {
 	flags := s.PersistentFlags()
-	flags.IntVar(&s.webhookPort, webhookPort, 9443, "webhook port")
 	flags.StringVar(&s.metricsAddr, metricsBindAddress, ":9090", "The address the metric endpoint binds to.")
 	flags.StringVar(&s.probeAddr, healthProbeBindAddress, ":8081", "The address the probe endpoint binds to.")
 	flags.StringVar(&s.databrokerServiceURL, databrokerServiceURL, "http://localhost:5443",
@@ -156,10 +155,9 @@ func (s *controllerCmd) buildController(ctx context.Context) (*controllers.Contr
 		},
 		DataBrokerServiceClient: client,
 		MgrOpts: ctrl.Options{
-			Scheme:             scheme,
-			MetricsBindAddress: s.metricsAddr,
-			Port:               s.webhookPort,
-			LeaderElection:     false,
+			Scheme:         scheme,
+			Metrics:        metricsserver.Options{BindAddress: s.metricsAddr},
+			LeaderElection: false,
 		},
 		IngressCtrlOpts: opts,
 	}

cmd/controller_test.go

@@ -14,7 +14,6 @@ func TestFlags(t *testing.T) {
 	caData, err := base64.StdEncoding.DecodeString(caString)
 	assert.NoError(t, err)
 	for k, v := range map[string]string{
-		webhookPort:                "1234",
 		metricsBindAddress:         ":5678",
 		healthProbeBindAddress:     ":9876",
 		ingressClassControllerName: "class-name",
@@ -32,7 +31,6 @@ func TestFlags(t *testing.T) {
 		os.Setenv(envName(k), v)
 	}
 	cmd.setupFlags()
-	assert.Equal(t, 1234, cmd.webhookPort)
 	assert.Equal(t, []string{"one", "two", "three"}, cmd.Namespaces)
 	assert.Equal(t, caData, cmd.tlsCA)
 	assert.Equal(t, true, cmd.debug)