From 04f5bef72ceef6e27d0fe75a042cde92efd00f0b Mon Sep 17 00:00:00 2001 From: Yuedong Wu <57584831+lunarwhite@users.noreply.github.com> Date: Mon, 8 Jan 2024 18:08:06 +0000 Subject: [PATCH 1/3] refactor: change './bin' to 'LOCALBIN' avoid hardcoded tool binary variables Signed-off-by: GitHub --- internal/plugins/manifests/v2/init.go | 6 +++--- testdata/go/v3/memcached-operator/Makefile | 4 ++-- testdata/go/v3/monitoring/memcached-operator/Makefile | 4 ++-- testdata/go/v4/memcached-operator/Makefile | 4 ++-- testdata/go/v4/monitoring/memcached-operator/Makefile | 4 ++-- testdata/helm/memcached-operator/Makefile | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/internal/plugins/manifests/v2/init.go b/internal/plugins/manifests/v2/init.go index 60f3421594..b4ada27700 100644 --- a/internal/plugins/manifests/v2/init.go +++ b/internal/plugins/manifests/v2/init.go @@ -204,7 +204,7 @@ endif makefileSDKFragmentNonGo = ` .PHONY: operator-sdk -OPERATOR_SDK ?= ./bin/operator-sdk +OPERATOR_SDK ?= $(LOCALBIN)/operator-sdk operator-sdk: ## Download operator-sdk locally if necessary. ifeq (,$(wildcard $(OPERATOR_SDK))) ifeq (, $(shell which operator-sdk 2>/dev/null)) @@ -250,7 +250,7 @@ bundle-push: ## Push the bundle image. makefileOPMFragmentGo = ` .PHONY: opm -OPM = ./bin/opm +OPM = $(LOCALBIN)/opm opm: ## Download opm locally if necessary. ifeq (,$(wildcard $(OPM))) ifeq (,$(shell which opm 2>/dev/null)) @@ -269,7 +269,7 @@ endif makefileOPMFragmentNonGo = ` .PHONY: opm -OPM = ./bin/opm +OPM = $(LOCALBIN)/opm opm: ## Download opm locally if necessary. ifeq (,$(wildcard $(OPM))) ifeq (,$(shell which opm 2>/dev/null)) diff --git a/testdata/go/v3/memcached-operator/Makefile b/testdata/go/v3/memcached-operator/Makefile index add3bcc591..a6b6d82940 100644 --- a/testdata/go/v3/memcached-operator/Makefile +++ b/testdata/go/v3/memcached-operator/Makefile @@ -48,7 +48,7 @@ endif # Set the Operator SDK version to use. By default, what is installed on the system is used. # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit. -OPERATOR_SDK_VERSION ?= v1.32.0 +OPERATOR_SDK_VERSION ?= v1.33.0 # Image URL to use all building/pushing image targets IMG ?= controller:latest @@ -243,7 +243,7 @@ bundle-push: ## Push the bundle image. $(MAKE) docker-push IMG=$(BUNDLE_IMG) .PHONY: opm -OPM = ./bin/opm +OPM = $(LOCALBIN)/opm opm: ## Download opm locally if necessary. ifeq (,$(wildcard $(OPM))) ifeq (,$(shell which opm 2>/dev/null)) diff --git a/testdata/go/v3/monitoring/memcached-operator/Makefile b/testdata/go/v3/monitoring/memcached-operator/Makefile index 8b6d3d44a1..c7bced75e2 100644 --- a/testdata/go/v3/monitoring/memcached-operator/Makefile +++ b/testdata/go/v3/monitoring/memcached-operator/Makefile @@ -48,7 +48,7 @@ endif # Set the Operator SDK version to use. By default, what is installed on the system is used. # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit. -OPERATOR_SDK_VERSION ?= v1.32.0 +OPERATOR_SDK_VERSION ?= v1.33.0 # Image URL to use all building/pushing image targets IMG ?= controller:latest @@ -258,7 +258,7 @@ bundle-push: ## Push the bundle image. $(MAKE) docker-push IMG=$(BUNDLE_IMG) .PHONY: opm -OPM = ./bin/opm +OPM = $(LOCALBIN)/opm opm: ## Download opm locally if necessary. ifeq (,$(wildcard $(OPM))) ifeq (,$(shell which opm 2>/dev/null)) diff --git a/testdata/go/v4/memcached-operator/Makefile b/testdata/go/v4/memcached-operator/Makefile index 16b60a2f0c..e5bbc2f0ef 100644 --- a/testdata/go/v4/memcached-operator/Makefile +++ b/testdata/go/v4/memcached-operator/Makefile @@ -48,7 +48,7 @@ endif # Set the Operator SDK version to use. By default, what is installed on the system is used. # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit. -OPERATOR_SDK_VERSION ?= v1.32.0 +OPERATOR_SDK_VERSION ?= v1.33.0 # Image URL to use all building/pushing image targets IMG ?= controller:latest @@ -249,7 +249,7 @@ bundle-push: ## Push the bundle image. $(MAKE) docker-push IMG=$(BUNDLE_IMG) .PHONY: opm -OPM = ./bin/opm +OPM = $(LOCALBIN)/opm opm: ## Download opm locally if necessary. ifeq (,$(wildcard $(OPM))) ifeq (,$(shell which opm 2>/dev/null)) diff --git a/testdata/go/v4/monitoring/memcached-operator/Makefile b/testdata/go/v4/monitoring/memcached-operator/Makefile index 83f75a12b6..2a41dca371 100644 --- a/testdata/go/v4/monitoring/memcached-operator/Makefile +++ b/testdata/go/v4/monitoring/memcached-operator/Makefile @@ -48,7 +48,7 @@ endif # Set the Operator SDK version to use. By default, what is installed on the system is used. # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit. -OPERATOR_SDK_VERSION ?= v1.32.0 +OPERATOR_SDK_VERSION ?= v1.33.0 # Image URL to use all building/pushing image targets IMG ?= controller:latest @@ -264,7 +264,7 @@ bundle-push: ## Push the bundle image. $(MAKE) docker-push IMG=$(BUNDLE_IMG) .PHONY: opm -OPM = ./bin/opm +OPM = $(LOCALBIN)/opm opm: ## Download opm locally if necessary. ifeq (,$(wildcard $(OPM))) ifeq (,$(shell which opm 2>/dev/null)) diff --git a/testdata/helm/memcached-operator/Makefile b/testdata/helm/memcached-operator/Makefile index 04f02bb09a..7db73d291b 100644 --- a/testdata/helm/memcached-operator/Makefile +++ b/testdata/helm/memcached-operator/Makefile @@ -48,7 +48,7 @@ endif # Set the Operator SDK version to use. By default, what is installed on the system is used. # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit. -OPERATOR_SDK_VERSION ?= v1.32.0 +OPERATOR_SDK_VERSION ?= v1.33.0 # Image URL to use all building/pushing image targets IMG ?= controller:latest @@ -159,7 +159,7 @@ endif endif .PHONY: operator-sdk -OPERATOR_SDK ?= ./bin/operator-sdk +OPERATOR_SDK ?= $(LOCALBIN)/operator-sdk operator-sdk: ## Download operator-sdk locally if necessary. ifeq (,$(wildcard $(OPERATOR_SDK))) ifeq (, $(shell which operator-sdk 2>/dev/null)) @@ -190,7 +190,7 @@ bundle-push: ## Push the bundle image. $(MAKE) docker-push IMG=$(BUNDLE_IMG) .PHONY: opm -OPM = ./bin/opm +OPM = $(LOCALBIN)/opm opm: ## Download opm locally if necessary. ifeq (,$(wildcard $(OPM))) ifeq (,$(shell which opm 2>/dev/null)) From efab731cd5a8cb52f6743e4ccc5611001fbc7e59 Mon Sep 17 00:00:00 2001 From: Yuedong Wu <57584831+lunarwhite@users.noreply.github.com> Date: Mon, 8 Jan 2024 18:13:55 +0000 Subject: [PATCH 2/3] auto bump Copyright to 2024 'make generate' also change every Copyright 2023 to 2024, add a separate commit for reviewer to review easily Signed-off-by: GitHub --- testdata/go/v3/memcached-operator/README.md | 2 +- .../go/v3/memcached-operator/api/v1alpha1/groupversion_info.go | 2 +- .../go/v3/memcached-operator/api/v1alpha1/memcached_types.go | 2 +- .../go/v3/memcached-operator/api/v1alpha1/memcached_webhook.go | 2 +- .../go/v3/memcached-operator/api/v1alpha1/webhook_suite_test.go | 2 +- .../v3/memcached-operator/api/v1alpha1/zz_generated.deepcopy.go | 2 +- .../v3/memcached-operator/controllers/memcached_controller.go | 2 +- .../memcached-operator/controllers/memcached_controller_test.go | 2 +- testdata/go/v3/memcached-operator/controllers/suite_test.go | 2 +- testdata/go/v3/memcached-operator/hack/boilerplate.go.txt | 2 +- testdata/go/v3/memcached-operator/main.go | 2 +- testdata/go/v3/monitoring/memcached-operator/README.md | 2 +- .../memcached-operator/api/v1alpha1/groupversion_info.go | 2 +- .../memcached-operator/api/v1alpha1/memcached_types.go | 2 +- .../memcached-operator/api/v1alpha1/memcached_webhook.go | 2 +- .../memcached-operator/api/v1alpha1/webhook_suite_test.go | 2 +- .../memcached-operator/api/v1alpha1/zz_generated.deepcopy.go | 2 +- .../memcached-operator/controllers/memcached_controller.go | 2 +- .../memcached-operator/controllers/memcached_controller_test.go | 2 +- .../v3/monitoring/memcached-operator/controllers/suite_test.go | 2 +- .../go/v3/monitoring/memcached-operator/hack/boilerplate.go.txt | 2 +- testdata/go/v3/monitoring/memcached-operator/main.go | 2 +- .../go/v3/monitoring/memcached-operator/monitoring/alerts.go | 2 +- .../go/v3/monitoring/memcached-operator/monitoring/metrics.go | 2 +- .../memcached-operator/monitoring/metricsdocs/metricsdocs.go | 2 +- .../monitoring/prom-rule-ci/rule-spec-dumper.go | 2 +- testdata/go/v4/memcached-operator/README.md | 2 +- .../go/v4/memcached-operator/api/v1alpha1/groupversion_info.go | 2 +- .../go/v4/memcached-operator/api/v1alpha1/memcached_types.go | 2 +- .../go/v4/memcached-operator/api/v1alpha1/memcached_webhook.go | 2 +- .../go/v4/memcached-operator/api/v1alpha1/webhook_suite_test.go | 2 +- .../v4/memcached-operator/api/v1alpha1/zz_generated.deepcopy.go | 2 +- testdata/go/v4/memcached-operator/cmd/main.go | 2 +- testdata/go/v4/memcached-operator/hack/boilerplate.go.txt | 2 +- .../internal/controller/memcached_controller.go | 2 +- .../internal/controller/memcached_controller_test.go | 2 +- .../go/v4/memcached-operator/internal/controller/suite_test.go | 2 +- testdata/go/v4/monitoring/memcached-operator/README.md | 2 +- .../memcached-operator/api/v1alpha1/groupversion_info.go | 2 +- .../memcached-operator/api/v1alpha1/memcached_types.go | 2 +- .../memcached-operator/api/v1alpha1/memcached_webhook.go | 2 +- .../memcached-operator/api/v1alpha1/webhook_suite_test.go | 2 +- .../memcached-operator/api/v1alpha1/zz_generated.deepcopy.go | 2 +- testdata/go/v4/monitoring/memcached-operator/cmd/main.go | 2 +- .../go/v4/monitoring/memcached-operator/hack/boilerplate.go.txt | 2 +- .../internal/controller/memcached_controller.go | 2 +- .../internal/controller/memcached_controller_test.go | 2 +- .../memcached-operator/internal/controller/suite_test.go | 2 +- .../go/v4/monitoring/memcached-operator/monitoring/alerts.go | 2 +- .../go/v4/monitoring/memcached-operator/monitoring/metrics.go | 2 +- .../memcached-operator/monitoring/metricsdocs/metricsdocs.go | 2 +- .../monitoring/prom-rule-ci/rule-spec-dumper.go | 2 +- 52 files changed, 52 insertions(+), 52 deletions(-) diff --git a/testdata/go/v3/memcached-operator/README.md b/testdata/go/v3/memcached-operator/README.md index 3194aa0789..caa89baa89 100644 --- a/testdata/go/v3/memcached-operator/README.md +++ b/testdata/go/v3/memcached-operator/README.md @@ -78,7 +78,7 @@ More information can be found via the [Kubebuilder Documentation](https://book.k ## License -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v3/memcached-operator/api/v1alpha1/groupversion_info.go b/testdata/go/v3/memcached-operator/api/v1alpha1/groupversion_info.go index b5a1e8f2d3..e048c19fa0 100644 --- a/testdata/go/v3/memcached-operator/api/v1alpha1/groupversion_info.go +++ b/testdata/go/v3/memcached-operator/api/v1alpha1/groupversion_info.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v3/memcached-operator/api/v1alpha1/memcached_types.go b/testdata/go/v3/memcached-operator/api/v1alpha1/memcached_types.go index 822d0a4084..3dd5dc1013 100644 --- a/testdata/go/v3/memcached-operator/api/v1alpha1/memcached_types.go +++ b/testdata/go/v3/memcached-operator/api/v1alpha1/memcached_types.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v3/memcached-operator/api/v1alpha1/memcached_webhook.go b/testdata/go/v3/memcached-operator/api/v1alpha1/memcached_webhook.go index f6e37a5097..3de1429df3 100644 --- a/testdata/go/v3/memcached-operator/api/v1alpha1/memcached_webhook.go +++ b/testdata/go/v3/memcached-operator/api/v1alpha1/memcached_webhook.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v3/memcached-operator/api/v1alpha1/webhook_suite_test.go b/testdata/go/v3/memcached-operator/api/v1alpha1/webhook_suite_test.go index 7fa23aac47..40e921f4d0 100644 --- a/testdata/go/v3/memcached-operator/api/v1alpha1/webhook_suite_test.go +++ b/testdata/go/v3/memcached-operator/api/v1alpha1/webhook_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v3/memcached-operator/api/v1alpha1/zz_generated.deepcopy.go b/testdata/go/v3/memcached-operator/api/v1alpha1/zz_generated.deepcopy.go index 26ea5c32e4..f82b0c5ce9 100644 --- a/testdata/go/v3/memcached-operator/api/v1alpha1/zz_generated.deepcopy.go +++ b/testdata/go/v3/memcached-operator/api/v1alpha1/zz_generated.deepcopy.go @@ -2,7 +2,7 @@ // +build !ignore_autogenerated /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v3/memcached-operator/controllers/memcached_controller.go b/testdata/go/v3/memcached-operator/controllers/memcached_controller.go index ef32cc0e30..a244b37e63 100644 --- a/testdata/go/v3/memcached-operator/controllers/memcached_controller.go +++ b/testdata/go/v3/memcached-operator/controllers/memcached_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v3/memcached-operator/controllers/memcached_controller_test.go b/testdata/go/v3/memcached-operator/controllers/memcached_controller_test.go index 0b677bb192..160878dd4b 100644 --- a/testdata/go/v3/memcached-operator/controllers/memcached_controller_test.go +++ b/testdata/go/v3/memcached-operator/controllers/memcached_controller_test.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v3/memcached-operator/controllers/suite_test.go b/testdata/go/v3/memcached-operator/controllers/suite_test.go index 6b6c12f463..56c43ba5d0 100644 --- a/testdata/go/v3/memcached-operator/controllers/suite_test.go +++ b/testdata/go/v3/memcached-operator/controllers/suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v3/memcached-operator/hack/boilerplate.go.txt b/testdata/go/v3/memcached-operator/hack/boilerplate.go.txt index 65b8622718..ff72ff2aaa 100644 --- a/testdata/go/v3/memcached-operator/hack/boilerplate.go.txt +++ b/testdata/go/v3/memcached-operator/hack/boilerplate.go.txt @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v3/memcached-operator/main.go b/testdata/go/v3/memcached-operator/main.go index a8c1a22305..e9657cea8b 100644 --- a/testdata/go/v3/memcached-operator/main.go +++ b/testdata/go/v3/memcached-operator/main.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v3/monitoring/memcached-operator/README.md b/testdata/go/v3/monitoring/memcached-operator/README.md index 3194aa0789..caa89baa89 100644 --- a/testdata/go/v3/monitoring/memcached-operator/README.md +++ b/testdata/go/v3/monitoring/memcached-operator/README.md @@ -78,7 +78,7 @@ More information can be found via the [Kubebuilder Documentation](https://book.k ## License -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/groupversion_info.go b/testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/groupversion_info.go index b5a1e8f2d3..e048c19fa0 100644 --- a/testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/groupversion_info.go +++ b/testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/groupversion_info.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/memcached_types.go b/testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/memcached_types.go index 822d0a4084..3dd5dc1013 100644 --- a/testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/memcached_types.go +++ b/testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/memcached_types.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/memcached_webhook.go b/testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/memcached_webhook.go index f6e37a5097..3de1429df3 100644 --- a/testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/memcached_webhook.go +++ b/testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/memcached_webhook.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/webhook_suite_test.go b/testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/webhook_suite_test.go index 7fa23aac47..40e921f4d0 100644 --- a/testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/webhook_suite_test.go +++ b/testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/webhook_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/zz_generated.deepcopy.go b/testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/zz_generated.deepcopy.go index 26ea5c32e4..f82b0c5ce9 100644 --- a/testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/zz_generated.deepcopy.go +++ b/testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/zz_generated.deepcopy.go @@ -2,7 +2,7 @@ // +build !ignore_autogenerated /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v3/monitoring/memcached-operator/controllers/memcached_controller.go b/testdata/go/v3/monitoring/memcached-operator/controllers/memcached_controller.go index 702463e0cb..5fcb522605 100644 --- a/testdata/go/v3/monitoring/memcached-operator/controllers/memcached_controller.go +++ b/testdata/go/v3/monitoring/memcached-operator/controllers/memcached_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v3/monitoring/memcached-operator/controllers/memcached_controller_test.go b/testdata/go/v3/monitoring/memcached-operator/controllers/memcached_controller_test.go index 0b677bb192..160878dd4b 100644 --- a/testdata/go/v3/monitoring/memcached-operator/controllers/memcached_controller_test.go +++ b/testdata/go/v3/monitoring/memcached-operator/controllers/memcached_controller_test.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v3/monitoring/memcached-operator/controllers/suite_test.go b/testdata/go/v3/monitoring/memcached-operator/controllers/suite_test.go index 6b6c12f463..56c43ba5d0 100644 --- a/testdata/go/v3/monitoring/memcached-operator/controllers/suite_test.go +++ b/testdata/go/v3/monitoring/memcached-operator/controllers/suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v3/monitoring/memcached-operator/hack/boilerplate.go.txt b/testdata/go/v3/monitoring/memcached-operator/hack/boilerplate.go.txt index 65b8622718..ff72ff2aaa 100644 --- a/testdata/go/v3/monitoring/memcached-operator/hack/boilerplate.go.txt +++ b/testdata/go/v3/monitoring/memcached-operator/hack/boilerplate.go.txt @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v3/monitoring/memcached-operator/main.go b/testdata/go/v3/monitoring/memcached-operator/main.go index 39d3524880..099d871d39 100644 --- a/testdata/go/v3/monitoring/memcached-operator/main.go +++ b/testdata/go/v3/monitoring/memcached-operator/main.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v3/monitoring/memcached-operator/monitoring/alerts.go b/testdata/go/v3/monitoring/memcached-operator/monitoring/alerts.go index 0b730709b3..22524c0b54 100644 --- a/testdata/go/v3/monitoring/memcached-operator/monitoring/alerts.go +++ b/testdata/go/v3/monitoring/memcached-operator/monitoring/alerts.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v3/monitoring/memcached-operator/monitoring/metrics.go b/testdata/go/v3/monitoring/memcached-operator/monitoring/metrics.go index 6365c4551c..545e665ea9 100644 --- a/testdata/go/v3/monitoring/memcached-operator/monitoring/metrics.go +++ b/testdata/go/v3/monitoring/memcached-operator/monitoring/metrics.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v3/monitoring/memcached-operator/monitoring/metricsdocs/metricsdocs.go b/testdata/go/v3/monitoring/memcached-operator/monitoring/metricsdocs/metricsdocs.go index 84ae54faf4..e0a72ed0ae 100644 --- a/testdata/go/v3/monitoring/memcached-operator/monitoring/metricsdocs/metricsdocs.go +++ b/testdata/go/v3/monitoring/memcached-operator/monitoring/metricsdocs/metricsdocs.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v3/monitoring/memcached-operator/monitoring/prom-rule-ci/rule-spec-dumper.go b/testdata/go/v3/monitoring/memcached-operator/monitoring/prom-rule-ci/rule-spec-dumper.go index d9ff585dd5..38f695bb9a 100644 --- a/testdata/go/v3/monitoring/memcached-operator/monitoring/prom-rule-ci/rule-spec-dumper.go +++ b/testdata/go/v3/monitoring/memcached-operator/monitoring/prom-rule-ci/rule-spec-dumper.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v4/memcached-operator/README.md b/testdata/go/v4/memcached-operator/README.md index 3194aa0789..caa89baa89 100644 --- a/testdata/go/v4/memcached-operator/README.md +++ b/testdata/go/v4/memcached-operator/README.md @@ -78,7 +78,7 @@ More information can be found via the [Kubebuilder Documentation](https://book.k ## License -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v4/memcached-operator/api/v1alpha1/groupversion_info.go b/testdata/go/v4/memcached-operator/api/v1alpha1/groupversion_info.go index b5a1e8f2d3..e048c19fa0 100644 --- a/testdata/go/v4/memcached-operator/api/v1alpha1/groupversion_info.go +++ b/testdata/go/v4/memcached-operator/api/v1alpha1/groupversion_info.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v4/memcached-operator/api/v1alpha1/memcached_types.go b/testdata/go/v4/memcached-operator/api/v1alpha1/memcached_types.go index 822d0a4084..3dd5dc1013 100644 --- a/testdata/go/v4/memcached-operator/api/v1alpha1/memcached_types.go +++ b/testdata/go/v4/memcached-operator/api/v1alpha1/memcached_types.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v4/memcached-operator/api/v1alpha1/memcached_webhook.go b/testdata/go/v4/memcached-operator/api/v1alpha1/memcached_webhook.go index f6e37a5097..3de1429df3 100644 --- a/testdata/go/v4/memcached-operator/api/v1alpha1/memcached_webhook.go +++ b/testdata/go/v4/memcached-operator/api/v1alpha1/memcached_webhook.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v4/memcached-operator/api/v1alpha1/webhook_suite_test.go b/testdata/go/v4/memcached-operator/api/v1alpha1/webhook_suite_test.go index 40beb6cfdc..2178faa02f 100644 --- a/testdata/go/v4/memcached-operator/api/v1alpha1/webhook_suite_test.go +++ b/testdata/go/v4/memcached-operator/api/v1alpha1/webhook_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v4/memcached-operator/api/v1alpha1/zz_generated.deepcopy.go b/testdata/go/v4/memcached-operator/api/v1alpha1/zz_generated.deepcopy.go index 26ea5c32e4..f82b0c5ce9 100644 --- a/testdata/go/v4/memcached-operator/api/v1alpha1/zz_generated.deepcopy.go +++ b/testdata/go/v4/memcached-operator/api/v1alpha1/zz_generated.deepcopy.go @@ -2,7 +2,7 @@ // +build !ignore_autogenerated /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v4/memcached-operator/cmd/main.go b/testdata/go/v4/memcached-operator/cmd/main.go index 4b8ac664f2..3ff3f291c8 100644 --- a/testdata/go/v4/memcached-operator/cmd/main.go +++ b/testdata/go/v4/memcached-operator/cmd/main.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v4/memcached-operator/hack/boilerplate.go.txt b/testdata/go/v4/memcached-operator/hack/boilerplate.go.txt index 65b8622718..ff72ff2aaa 100644 --- a/testdata/go/v4/memcached-operator/hack/boilerplate.go.txt +++ b/testdata/go/v4/memcached-operator/hack/boilerplate.go.txt @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v4/memcached-operator/internal/controller/memcached_controller.go b/testdata/go/v4/memcached-operator/internal/controller/memcached_controller.go index 864c953623..e8c60e1875 100644 --- a/testdata/go/v4/memcached-operator/internal/controller/memcached_controller.go +++ b/testdata/go/v4/memcached-operator/internal/controller/memcached_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v4/memcached-operator/internal/controller/memcached_controller_test.go b/testdata/go/v4/memcached-operator/internal/controller/memcached_controller_test.go index 4ab82b317a..cef20513c9 100644 --- a/testdata/go/v4/memcached-operator/internal/controller/memcached_controller_test.go +++ b/testdata/go/v4/memcached-operator/internal/controller/memcached_controller_test.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v4/memcached-operator/internal/controller/suite_test.go b/testdata/go/v4/memcached-operator/internal/controller/suite_test.go index 12253046cc..c94cf5519e 100644 --- a/testdata/go/v4/memcached-operator/internal/controller/suite_test.go +++ b/testdata/go/v4/memcached-operator/internal/controller/suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v4/monitoring/memcached-operator/README.md b/testdata/go/v4/monitoring/memcached-operator/README.md index 3194aa0789..caa89baa89 100644 --- a/testdata/go/v4/monitoring/memcached-operator/README.md +++ b/testdata/go/v4/monitoring/memcached-operator/README.md @@ -78,7 +78,7 @@ More information can be found via the [Kubebuilder Documentation](https://book.k ## License -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v4/monitoring/memcached-operator/api/v1alpha1/groupversion_info.go b/testdata/go/v4/monitoring/memcached-operator/api/v1alpha1/groupversion_info.go index b5a1e8f2d3..e048c19fa0 100644 --- a/testdata/go/v4/monitoring/memcached-operator/api/v1alpha1/groupversion_info.go +++ b/testdata/go/v4/monitoring/memcached-operator/api/v1alpha1/groupversion_info.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v4/monitoring/memcached-operator/api/v1alpha1/memcached_types.go b/testdata/go/v4/monitoring/memcached-operator/api/v1alpha1/memcached_types.go index 822d0a4084..3dd5dc1013 100644 --- a/testdata/go/v4/monitoring/memcached-operator/api/v1alpha1/memcached_types.go +++ b/testdata/go/v4/monitoring/memcached-operator/api/v1alpha1/memcached_types.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v4/monitoring/memcached-operator/api/v1alpha1/memcached_webhook.go b/testdata/go/v4/monitoring/memcached-operator/api/v1alpha1/memcached_webhook.go index f6e37a5097..3de1429df3 100644 --- a/testdata/go/v4/monitoring/memcached-operator/api/v1alpha1/memcached_webhook.go +++ b/testdata/go/v4/monitoring/memcached-operator/api/v1alpha1/memcached_webhook.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v4/monitoring/memcached-operator/api/v1alpha1/webhook_suite_test.go b/testdata/go/v4/monitoring/memcached-operator/api/v1alpha1/webhook_suite_test.go index 40beb6cfdc..2178faa02f 100644 --- a/testdata/go/v4/monitoring/memcached-operator/api/v1alpha1/webhook_suite_test.go +++ b/testdata/go/v4/monitoring/memcached-operator/api/v1alpha1/webhook_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v4/monitoring/memcached-operator/api/v1alpha1/zz_generated.deepcopy.go b/testdata/go/v4/monitoring/memcached-operator/api/v1alpha1/zz_generated.deepcopy.go index 26ea5c32e4..f82b0c5ce9 100644 --- a/testdata/go/v4/monitoring/memcached-operator/api/v1alpha1/zz_generated.deepcopy.go +++ b/testdata/go/v4/monitoring/memcached-operator/api/v1alpha1/zz_generated.deepcopy.go @@ -2,7 +2,7 @@ // +build !ignore_autogenerated /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v4/monitoring/memcached-operator/cmd/main.go b/testdata/go/v4/monitoring/memcached-operator/cmd/main.go index 954f8bb94c..b9b71b41e0 100644 --- a/testdata/go/v4/monitoring/memcached-operator/cmd/main.go +++ b/testdata/go/v4/monitoring/memcached-operator/cmd/main.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v4/monitoring/memcached-operator/hack/boilerplate.go.txt b/testdata/go/v4/monitoring/memcached-operator/hack/boilerplate.go.txt index 65b8622718..ff72ff2aaa 100644 --- a/testdata/go/v4/monitoring/memcached-operator/hack/boilerplate.go.txt +++ b/testdata/go/v4/monitoring/memcached-operator/hack/boilerplate.go.txt @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v4/monitoring/memcached-operator/internal/controller/memcached_controller.go b/testdata/go/v4/monitoring/memcached-operator/internal/controller/memcached_controller.go index e3989b86b9..0ddc244bdf 100644 --- a/testdata/go/v4/monitoring/memcached-operator/internal/controller/memcached_controller.go +++ b/testdata/go/v4/monitoring/memcached-operator/internal/controller/memcached_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v4/monitoring/memcached-operator/internal/controller/memcached_controller_test.go b/testdata/go/v4/monitoring/memcached-operator/internal/controller/memcached_controller_test.go index 4ab82b317a..cef20513c9 100644 --- a/testdata/go/v4/monitoring/memcached-operator/internal/controller/memcached_controller_test.go +++ b/testdata/go/v4/monitoring/memcached-operator/internal/controller/memcached_controller_test.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v4/monitoring/memcached-operator/internal/controller/suite_test.go b/testdata/go/v4/monitoring/memcached-operator/internal/controller/suite_test.go index 12253046cc..c94cf5519e 100644 --- a/testdata/go/v4/monitoring/memcached-operator/internal/controller/suite_test.go +++ b/testdata/go/v4/monitoring/memcached-operator/internal/controller/suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v4/monitoring/memcached-operator/monitoring/alerts.go b/testdata/go/v4/monitoring/memcached-operator/monitoring/alerts.go index 0b730709b3..22524c0b54 100644 --- a/testdata/go/v4/monitoring/memcached-operator/monitoring/alerts.go +++ b/testdata/go/v4/monitoring/memcached-operator/monitoring/alerts.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v4/monitoring/memcached-operator/monitoring/metrics.go b/testdata/go/v4/monitoring/memcached-operator/monitoring/metrics.go index 6365c4551c..545e665ea9 100644 --- a/testdata/go/v4/monitoring/memcached-operator/monitoring/metrics.go +++ b/testdata/go/v4/monitoring/memcached-operator/monitoring/metrics.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v4/monitoring/memcached-operator/monitoring/metricsdocs/metricsdocs.go b/testdata/go/v4/monitoring/memcached-operator/monitoring/metricsdocs/metricsdocs.go index 84ae54faf4..e0a72ed0ae 100644 --- a/testdata/go/v4/monitoring/memcached-operator/monitoring/metricsdocs/metricsdocs.go +++ b/testdata/go/v4/monitoring/memcached-operator/monitoring/metricsdocs/metricsdocs.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/go/v4/monitoring/memcached-operator/monitoring/prom-rule-ci/rule-spec-dumper.go b/testdata/go/v4/monitoring/memcached-operator/monitoring/prom-rule-ci/rule-spec-dumper.go index d9ff585dd5..38f695bb9a 100644 --- a/testdata/go/v4/monitoring/memcached-operator/monitoring/prom-rule-ci/rule-spec-dumper.go +++ b/testdata/go/v4/monitoring/memcached-operator/monitoring/prom-rule-ci/rule-spec-dumper.go @@ -1,5 +1,5 @@ /* -Copyright 2023. +Copyright 2024. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From 82ed477a633de3f648667bab1a4792897f725539 Mon Sep 17 00:00:00 2001 From: Yuedong Wu <57584831+lunarwhite@users.noreply.github.com> Date: Fri, 12 Jan 2024 05:05:19 +0000 Subject: [PATCH 3/3] fix dead link error Signed-off-by: GitHub --- .../en/docs/best-practices/observability-best-practices.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/en/docs/best-practices/observability-best-practices.md b/website/content/en/docs/best-practices/observability-best-practices.md index 8baed3bbe6..88bde3bf75 100644 --- a/website/content/en/docs/best-practices/observability-best-practices.md +++ b/website/content/en/docs/best-practices/observability-best-practices.md @@ -27,7 +27,7 @@ Additional components would be `Dashboards`, `Logs` and `Traces`, which are not ### Operators Observability General Guidelines **Important:** It is highly recommended to separate your monitoring code from your core operator code. -We recommend to create a dedicated `/monitoring` subfolder that will include all the code of the [Operator Observability Recommended Components](#operator-observability-recommended-components), that are outlined above. For example, in the [memcached-operator](https://github.com/operator-framework/operator-sdk/tree/master/testdata/go/v4-alpha/monitoring/memcached-operator/monitoring). +We recommend to create a dedicated `/monitoring` subfolder that will include all the code of the [Operator Observability Recommended Components](#operator-observability-recommended-components), that are outlined above. For example, in the [memcached-operator](https://github.com/operator-framework/operator-sdk/tree/master/testdata/go/v4/monitoring/memcached-operator/monitoring). In your core operator code only call the functions that will update the metrics value from your desired location. For example, in the [memcached-operator](https://github.com/operator-framework/operator-sdk/blob/367bd3597c30607099aa73637f5286f7120b847a/testdata/go/v3/monitoring/memcached-operator/controllers/memcached_controller.go#L242).