Merge pull request grafana#381 from periklis/backport-pr-14447-5.9

[release-5.9] Backport PR grafana#14447
periklis · Oct 24, 2024 · a1c77d2 · a1c77d2
2 parents 64a3eb2 + 6c4b614
commit a1c77d2
Show file tree

Hide file tree

Showing 201 changed files with 1,957 additions and 1,800 deletions.
diff --git a/operator/.bingo/Variables.mk b/operator/.bingo/Variables.mk
@@ -77,11 +77,11 @@ $(KIND): $(BINGO_DIR)/kind.mod
 	@echo "(re)installing $(GOBIN)/kind-v0.23.0"
 	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=kind.mod -o=$(GOBIN)/kind-v0.23.0 "sigs.k8s.io/kind"
 
-KUSTOMIZE := $(GOBIN)/kustomize-v4.5.7
+KUSTOMIZE := $(GOBIN)/kustomize-v5.4.3
 $(KUSTOMIZE): $(BINGO_DIR)/kustomize.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/kustomize-v4.5.7"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=kustomize.mod -o=$(GOBIN)/kustomize-v4.5.7 "sigs.k8s.io/kustomize/kustomize/v4"
+	@echo "(re)installing $(GOBIN)/kustomize-v5.4.3"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=kustomize.mod -o=$(GOBIN)/kustomize-v5.4.3 "sigs.k8s.io/kustomize/kustomize/v5"
 
 OPERATOR_SDK := $(GOBIN)/operator-sdk-v1.37.0
 $(OPERATOR_SDK): $(BINGO_DIR)/operator-sdk.mod

diff --git a/operator/.bingo/kustomize.mod b/operator/.bingo/kustomize.mod
@@ -1,9 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.17
+go 1.22.5
 
-exclude sigs.k8s.io/kustomize/api v0.2.0
-
-exclude sigs.k8s.io/kustomize/cmd/config v0.2.0
-
-require sigs.k8s.io/kustomize/kustomize/v4 v4.5.7
+require sigs.k8s.io/kustomize/kustomize/v5 v5.4.3
diff --git a/operator/.bingo/kustomize.sum b/operator/.bingo/kustomize.sum
diff --git a/operator/.bingo/operator-sdk.mod b/operator/.bingo/operator-sdk.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.22.8
+go 1.22.5
 
 require github.com/operator-framework/operator-sdk v1.37.0 // cmd/operator-sdk
diff --git a/operator/.bingo/variables.env b/operator/.bingo/variables.env
@@ -28,7 +28,7 @@ JSONNETFMT="${GOBIN}/jsonnetfmt-v0.20.0"
 
 KIND="${GOBIN}/kind-v0.23.0"
 
-KUSTOMIZE="${GOBIN}/kustomize-v4.5.7"
+KUSTOMIZE="${GOBIN}/kustomize-v5.4.3"
 
 OPERATOR_SDK="${GOBIN}/operator-sdk-v1.37.0"
 

diff --git a/operator/CHANGELOG.md b/operator/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Release 5.9.9
 
+- [14447](https://github.com/grafana/loki/pull/14447) **periklis**: refactor(operator)!: Migrate project layout to kubebuilder go/v4
 - [14526](https://github.com/grafana/loki/pull/14526) **periklis**: feat(operator): Update Loki operand to v3.2.1
 - [14445](https://github.com/grafana/loki/pull/14445) **periklis**: chore(operator): Upgrade operator-sdk 1.37.0 and kind 0.23.0
 

diff --git a/operator/Dockerfile b/operator/Dockerfile
@@ -3,20 +3,19 @@ FROM golang:1.22.8 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
-COPY apis/ apis/
+COPY api/ api/
 COPY go.mod go.mod
 COPY go.sum go.sum
 # cache deps before building and copying source so that we don't need to re-download as much
 # and so that source changes don't invalidate our downloaded layer
 RUN go mod download
 
 # Copy the go source
-COPY main.go main.go
-COPY controllers/ controllers/
+COPY cmd/loki-operator/main.go cmd/loki-operator/main.go
 COPY internal/ internal/
 
 # Build
-RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -mod=readonly -a -o manager main.go
+RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -mod=readonly -a -o manager cmd/loki-operator/main.go
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details

diff --git a/operator/Dockerfile.cross b/operator/Dockerfile.cross
@@ -8,20 +8,19 @@ FROM --platform=linux/amd64 $BUILD_IMAGE as builder
 COPY --from=goenv /goarch /goarm /
 WORKDIR /workspace
 # Copy the Go Modules manifests
-COPY apis/ apis/
+COPY api/ api/
 COPY go.mod go.mod
 COPY go.sum go.sum
 # cache deps before building and copying source so that we don't need to re-download as much
 # and so that source changes don't invalidate our downloaded layer
 RUN go mod download
 
 # Copy the go source
-COPY main.go main.go
-COPY controllers/ controllers/
+COPY cmd/loki-operator/main.go cmd/loki-operator/main.go
 COPY internal/ internal/
 
 # Build
-RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on GOARCH=$(cat /goarch) GOARM=$(cat /goarm) go build -a -o manager main.go
+RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on GOARCH=$(cat /goarch) GOARM=$(cat /goarm) go build -a -o manager cmd/loki-operator/main.go
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details

diff --git a/operator/Makefile b/operator/Makefile
@@ -126,10 +126,10 @@ deps: go.mod go.sum
 	go mod verify
 
 .PHONY: deps-api
-deps-api: apis/loki/go.mod apis/loki/go.sum
-	@cd ./apis/loki/ && go mod tidy
-	@cd ./apis/loki/ && go mod download
-	@cd ./apis/loki/ && go mod verify
+deps-api: api/loki/go.mod api/loki/go.sum
+	@cd ./api/loki/ && go mod tidy
+	@cd ./api/loki/ && go mod download
+	@cd ./api/loki/ && go mod verify
 
 .PHONY: cli
 cli: deps bin/loki-broker ## Build loki-broker CLI binary
@@ -138,11 +138,11 @@ bin/loki-broker: $(GO_FILES) | generate
 
 .PHONY: manager
 manager: deps generate ## Build manager binary
-	go build -o bin/manager main.go
+	go build -o bin/manager ./cmd/loki-operator/main.go
 
 .PHONY: size-calculator
 size-calculator: deps generate ## Build size-calculator binary
-	go build -o bin/size-calculator main.go
+	go build -o bin/size-calculator ./cmd/size-calculator/main.go
 
 .PHONY: go-generate
 go-generate: ## Run go generate
@@ -163,7 +163,7 @@ test: $(GO_FILES)
 
 .PHONY: test-unit-api
 test-unit-api: $(GO_FILES)
-	@cd ./apis/loki/ && go test ./... -coverprofile cover.out
+	@cd ./api/loki/ && go test ./... -coverprofile cover.out
 
 .PHONY: test-unit-prometheus
 test-unit-prometheus: $(PROMTOOL) ## Run prometheus unit tests
@@ -237,7 +237,7 @@ quickstart-cleanup: $(KIND) ## Cleanup for quickstart set up
 
 .PHONY: run
 run: generate manifests ## Run against the configured Kubernetes cluster in ~/.kube/config
-	go run ./main.go
+	go run ./cmd/loki-operator/main.go
 
 .PHONY: install
 install: manifests $(KUSTOMIZE) ## Install CRDs into a cluster
@@ -312,17 +312,17 @@ oci-push-calculator: ## Push the calculator image
 	$(OCI_RUNTIME) push $(CALCULATOR_IMG)
 
 ##@ Website
-TYPES_TARGET := $(shell find apis/loki -type f -iname "*_types.go")
+TYPES_TARGET := $(shell find api/loki -type f -iname "*_types.go")
 docs/operator/api.md: $(TYPES_TARGET) $(GEN_CRD_API_REFERENCE_DOCS)
-	$(GEN_CRD_API_REFERENCE_DOCS) -api-dir "github.com/grafana/loki/operator/apis/loki/" -config "$(PWD)/config/docs/config.json" -template-dir "$(PWD)/config/docs/templates" -out-file "$(PWD)/$@"
+	$(GEN_CRD_API_REFERENCE_DOCS) -api-dir "github.com/grafana/loki/operator/api/loki/" -config "$(PWD)/config/docs/config.json" -template-dir "$(PWD)/config/docs/templates" -out-file "$(PWD)/$@"
 	sed -i 's/+docs:/  docs:/' $@
 	sed -i 's/+parent:/    parent:/' $@
 	sed -i 's/##/\n##/' $@
 	sed -i 's/+newline/\n/' $@
 
-FEATURE_GATES_TARGET := $(shell find apis/config -type f -iname "*_types.go")
+FEATURE_GATES_TARGET := $(shell find api/config -type f -iname "*_types.go")
 docs/operator/feature-gates.md: $(FEATURE_GATES_TARGET) $(GEN_CRD_API_REFERENCE_DOCS)
-	$(GEN_CRD_API_REFERENCE_DOCS) -api-dir "github.com/grafana/loki/operator/apis/config/v1/" -config "$(PWD)/config/docs/config.json" -template-dir "$(PWD)/config/docs/templates" -out-file "$(PWD)/$@"
+	$(GEN_CRD_API_REFERENCE_DOCS) -api-dir "github.com/grafana/loki/operator/api/config/v1/" -config "$(PWD)/config/docs/config.json" -template-dir "$(PWD)/config/docs/templates" -out-file "$(PWD)/$@"
 	sed -i 's/title: "API"/title: "Feature Gates"/' $@
 	sed -i 's/+docs:/  docs:/' $@
 	sed -i 's/+parent:/    parent:/' $@

diff --git a/operator/PROJECT b/operator/PROJECT
@@ -1,7 +1,7 @@
 componentConfig: true
 domain: grafana.com
 layout:
-- go.kubebuilder.io/v3
+- go.kubebuilder.io/v4
 multigroup: true
 plugins:
   manifests.sdk.operatorframework.io/v2: {}
@@ -16,7 +16,7 @@ resources:
   domain: grafana.com
   group: loki
   kind: LokiStack
-  path: github.com/grafana/loki/operator/apis/loki/v1beta1
+  path: github.com/grafana/loki/operator/api/loki/v1beta1
   version: v1beta1
 - api:
     crdVersion: v1
@@ -25,7 +25,7 @@ resources:
   domain: grafana.com
   group: loki
   kind: LokiStack
-  path: github.com/grafana/loki/operator/apis/loki/v1
+  path: github.com/grafana/loki/operator/api/loki/v1
   version: v1
   webhooks:
     conversion: true
@@ -38,7 +38,7 @@ resources:
   domain: grafana.com
   group: loki
   kind: AlertingRule
-  path: github.com/grafana/loki/operator/apis/loki/v1
+  path: github.com/grafana/loki/operator/api/loki/v1
   version: v1
   webhooks:
     conversion: true
@@ -51,7 +51,7 @@ resources:
   domain: grafana.com
   group: loki
   kind: AlertingRule
-  path: github.com/grafana/loki/operator/apis/loki/v1beta1
+  path: github.com/grafana/loki/operator/api/loki/v1beta1
   version: v1beta1
   webhooks:
     validation: true
@@ -63,7 +63,7 @@ resources:
   domain: grafana.com
   group: loki
   kind: RecordingRule
-  path: github.com/grafana/loki/operator/apis/loki/v1
+  path: github.com/grafana/loki/operator/api/loki/v1
   version: v1
   webhooks:
     validation: true
@@ -76,7 +76,7 @@ resources:
   domain: grafana.com
   group: loki
   kind: RecordingRule
-  path: github.com/grafana/loki/operator/apis/loki/v1beta1
+  path: github.com/grafana/loki/operator/api/loki/v1beta1
   version: v1beta1
   webhooks:
     validation: true
@@ -88,7 +88,7 @@ resources:
   domain: grafana.com
   group: loki
   kind: RulerConfig
-  path: github.com/grafana/loki/operator/apis/loki/v1
+  path: github.com/grafana/loki/operator/api/loki/v1
   version: v1
 - api:
     crdVersion: v1
@@ -97,6 +97,6 @@ resources:
   domain: grafana.com
   group: loki
   kind: RulerConfig
-  path: github.com/grafana/loki/operator/apis/loki/v1beta1
+  path: github.com/grafana/loki/operator/api/loki/v1beta1
   version: v1beta1
 version: "3"
diff --git a/operator/apis/config/v1/doc.go → operator/api/config/v1/doc.go b/operator/apis/config/v1/doc.go → operator/api/config/v1/doc.go
diff --git a/...tor/apis/config/v1/projectconfig_types.go → ...ator/api/config/v1/projectconfig_types.go b/...tor/apis/config/v1/projectconfig_types.go → ...ator/api/config/v1/projectconfig_types.go
diff --git a/...r/apis/config/v1/zz_generated.deepcopy.go → ...or/api/config/v1/zz_generated.deepcopy.go b/...r/apis/config/v1/zz_generated.deepcopy.go → ...or/api/config/v1/zz_generated.deepcopy.go
diff --git a/operator/apis/loki/go.mod → operator/api/loki/go.mod b/operator/apis/loki/go.mod → operator/api/loki/go.mod
@@ -1,4 +1,4 @@
-module github.com/grafana/loki/operator/apis/loki
+module github.com/grafana/loki/operator/api/loki
 
 go 1.19
 

diff --git a/operator/apis/loki/go.sum → operator/api/loki/go.sum b/operator/apis/loki/go.sum → operator/api/loki/go.sum
diff --git a/operator/apis/loki/register.go → operator/api/loki/register.go b/operator/apis/loki/register.go → operator/api/loki/register.go
diff --git a/operator/apis/loki/v1/alertingrule_types.go → operator/api/loki/v1/alertingrule_types.go b/operator/apis/loki/v1/alertingrule_types.go → operator/api/loki/v1/alertingrule_types.go
diff --git a/operator/apis/loki/v1/doc.go → operator/api/loki/v1/doc.go b/operator/apis/loki/v1/doc.go → operator/api/loki/v1/doc.go
diff --git a/operator/apis/loki/v1/groupversion_info.go → operator/api/loki/v1/groupversion_info.go b/operator/apis/loki/v1/groupversion_info.go → operator/api/loki/v1/groupversion_info.go
diff --git a/operator/apis/loki/v1/lokistack_types.go → operator/api/loki/v1/lokistack_types.go b/operator/apis/loki/v1/lokistack_types.go → operator/api/loki/v1/lokistack_types.go
diff --git a/operator/apis/loki/v1/recordingrule_types.go → operator/api/loki/v1/recordingrule_types.go b/operator/apis/loki/v1/recordingrule_types.go → operator/api/loki/v1/recordingrule_types.go
diff --git a/operator/apis/loki/v1/rulerconfig_types.go → operator/api/loki/v1/rulerconfig_types.go b/operator/apis/loki/v1/rulerconfig_types.go → operator/api/loki/v1/rulerconfig_types.go
diff --git a/operator/apis/loki/v1/v1.go → operator/api/loki/v1/v1.go b/operator/apis/loki/v1/v1.go → operator/api/loki/v1/v1.go
diff --git a/...tor/apis/loki/v1/zz_generated.deepcopy.go → ...ator/api/loki/v1/zz_generated.deepcopy.go b/...tor/apis/loki/v1/zz_generated.deepcopy.go → ...ator/api/loki/v1/zz_generated.deepcopy.go
diff --git a/...r/apis/loki/v1beta1/alertingrule_types.go → ...or/api/loki/v1beta1/alertingrule_types.go b/...r/apis/loki/v1beta1/alertingrule_types.go → ...or/api/loki/v1beta1/alertingrule_types.go
@@ -1,7 +1,7 @@
 package v1beta1
 
 import (
-	v1 "github.com/grafana/loki/operator/apis/loki/v1"
+	v1 "github.com/grafana/loki/operator/api/loki/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 )

diff --git a/...s/loki/v1beta1/alertingrule_types_test.go → ...i/loki/v1beta1/alertingrule_types_test.go b/...s/loki/v1beta1/alertingrule_types_test.go → ...i/loki/v1beta1/alertingrule_types_test.go
@@ -3,8 +3,8 @@ package v1beta1_test
 import (
 	"testing"
 
-	v1 "github.com/grafana/loki/operator/apis/loki/v1"
-	"github.com/grafana/loki/operator/apis/loki/v1beta1"
+	v1 "github.com/grafana/loki/operator/api/loki/v1"
+	"github.com/grafana/loki/operator/api/loki/v1beta1"
 	"github.com/stretchr/testify/require"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

diff --git a/operator/apis/loki/v1beta1/doc.go → operator/api/loki/v1beta1/doc.go b/operator/apis/loki/v1beta1/doc.go → operator/api/loki/v1beta1/doc.go
diff --git a/...or/apis/loki/v1beta1/groupversion_info.go → ...tor/api/loki/v1beta1/groupversion_info.go b/...or/apis/loki/v1beta1/groupversion_info.go → ...tor/api/loki/v1beta1/groupversion_info.go
diff --git a/...ator/apis/loki/v1beta1/lokistack_types.go → operator/api/loki/v1beta1/lokistack_types.go b/...ator/apis/loki/v1beta1/lokistack_types.go → operator/api/loki/v1beta1/lokistack_types.go
@@ -1,7 +1,7 @@
 package v1beta1
 
 import (
-	v1 "github.com/grafana/loki/operator/apis/loki/v1"
+	v1 "github.com/grafana/loki/operator/api/loki/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"

diff --git a/...apis/loki/v1beta1/lokistack_types_test.go → .../api/loki/v1beta1/lokistack_types_test.go b/...apis/loki/v1beta1/lokistack_types_test.go → .../api/loki/v1beta1/lokistack_types_test.go
@@ -7,8 +7,8 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	v1 "github.com/grafana/loki/operator/apis/loki/v1"
-	"github.com/grafana/loki/operator/apis/loki/v1beta1"
+	v1 "github.com/grafana/loki/operator/api/loki/v1"
+	"github.com/grafana/loki/operator/api/loki/v1beta1"
 )
 
 func TestConvertToV1_LokiStack(t *testing.T) {

diff --git a/.../apis/loki/v1beta1/recordingrule_types.go → ...r/api/loki/v1beta1/recordingrule_types.go b/.../apis/loki/v1beta1/recordingrule_types.go → ...r/api/loki/v1beta1/recordingrule_types.go
@@ -1,7 +1,7 @@
 package v1beta1
 
 import (
-	v1 "github.com/grafana/loki/operator/apis/loki/v1"
+	v1 "github.com/grafana/loki/operator/api/loki/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 )

diff --git a/.../loki/v1beta1/recordingrule_types_test.go → .../loki/v1beta1/recordingrule_types_test.go b/.../loki/v1beta1/recordingrule_types_test.go → .../loki/v1beta1/recordingrule_types_test.go
@@ -3,8 +3,8 @@ package v1beta1_test
 import (
 	"testing"
 
-	v1 "github.com/grafana/loki/operator/apis/loki/v1"
-	"github.com/grafana/loki/operator/apis/loki/v1beta1"
+	v1 "github.com/grafana/loki/operator/api/loki/v1"
+	"github.com/grafana/loki/operator/api/loki/v1beta1"
 	"github.com/stretchr/testify/require"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

diff --git a/...or/apis/loki/v1beta1/rulerconfig_types.go → ...tor/api/loki/v1beta1/rulerconfig_types.go b/...or/apis/loki/v1beta1/rulerconfig_types.go → ...tor/api/loki/v1beta1/rulerconfig_types.go
@@ -1,7 +1,7 @@
 package v1beta1
 
 import (
-	v1 "github.com/grafana/loki/operator/apis/loki/v1"
+	v1 "github.com/grafana/loki/operator/api/loki/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 )

diff --git a/...is/loki/v1beta1/rulerconfig_types_test.go → ...pi/loki/v1beta1/rulerconfig_types_test.go b/...is/loki/v1beta1/rulerconfig_types_test.go → ...pi/loki/v1beta1/rulerconfig_types_test.go
@@ -3,8 +3,8 @@ package v1beta1_test
 import (
 	"testing"
 
-	v1 "github.com/grafana/loki/operator/apis/loki/v1"
-	"github.com/grafana/loki/operator/apis/loki/v1beta1"
+	v1 "github.com/grafana/loki/operator/api/loki/v1"
+	"github.com/grafana/loki/operator/api/loki/v1beta1"
 	"github.com/stretchr/testify/require"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/ptr"

diff --git a/operator/apis/loki/v1beta1/v1beta1.go → operator/api/loki/v1beta1/v1beta1.go b/operator/apis/loki/v1beta1/v1beta1.go → operator/api/loki/v1beta1/v1beta1.go
diff --git a/...pis/loki/v1beta1/zz_generated.deepcopy.go → ...api/loki/v1beta1/zz_generated.deepcopy.go b/...pis/loki/v1beta1/zz_generated.deepcopy.go → ...api/loki/v1beta1/zz_generated.deepcopy.go
diff --git a/operator/bundle/community-openshift/bundle.Dockerfile b/operator/bundle/community-openshift/bundle.Dockerfile
@@ -9,7 +9,7 @@ LABEL operators.operatorframework.io.bundle.channels.v1=alpha
 LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-unknown
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
-LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
+LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v4
 
 # Labels for testing.
 LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1

diff --git a/...hift/manifests/loki-operator-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml b/...hift/manifests/loki-operator-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml
@@ -26,7 +26,7 @@ spec:
         secret:
           key: service-ca.crt
           name: loki-operator-controller-manager-metrics-token
-      serverName: loki-operator-controller-manager-metrics-service.kubernetes-operators.svc
+      serverName: loki-operator-controller-manager-metrics-service.openshift-operators-redhat.svc
   selector:
     matchLabels:
       app.kubernetes.io/component: metrics