From e6b4e15fd48187fa6b9958b2e982b936941595a7 Mon Sep 17 00:00:00 2001 From: Frederic Giloux Date: Tue, 9 Jan 2024 11:00:26 +0100 Subject: [PATCH] chore: replace the base image UBI-minimal by UBI-micro UBI-micro has a few advantages compared to UBI-minimal: - smaller attack surface - no package manager - size Signed-off-by: Frederic Giloux --- images/custom-scorecard-tests/Dockerfile | 2 +- images/helm-operator/Dockerfile | 2 +- images/operator-sdk/Dockerfile | 13 +------------ images/scorecard-test/Dockerfile | 2 +- images/scorecard-untar/Dockerfile | 2 +- testdata/go/v3/memcached-operator/Makefile | 2 +- testdata/go/v3/memcached-operator/README.md | 2 +- .../api/v1alpha1/groupversion_info.go | 2 +- .../api/v1alpha1/memcached_types.go | 2 +- .../api/v1alpha1/memcached_webhook.go | 2 +- .../api/v1alpha1/webhook_suite_test.go | 2 +- .../api/v1alpha1/zz_generated.deepcopy.go | 2 +- .../controllers/memcached_controller.go | 2 +- .../controllers/memcached_controller_test.go | 2 +- .../v3/memcached-operator/controllers/suite_test.go | 2 +- .../v3/memcached-operator/hack/boilerplate.go.txt | 2 +- testdata/go/v3/memcached-operator/main.go | 2 +- .../go/v3/monitoring/memcached-operator/Makefile | 2 +- .../go/v3/monitoring/memcached-operator/README.md | 2 +- .../api/v1alpha1/groupversion_info.go | 2 +- .../api/v1alpha1/memcached_types.go | 2 +- .../api/v1alpha1/memcached_webhook.go | 2 +- .../api/v1alpha1/webhook_suite_test.go | 2 +- .../api/v1alpha1/zz_generated.deepcopy.go | 2 +- .../controllers/memcached_controller.go | 2 +- .../controllers/memcached_controller_test.go | 2 +- .../memcached-operator/controllers/suite_test.go | 2 +- .../memcached-operator/hack/boilerplate.go.txt | 2 +- .../go/v3/monitoring/memcached-operator/main.go | 2 +- .../memcached-operator/monitoring/alerts.go | 2 +- .../memcached-operator/monitoring/metrics.go | 2 +- .../monitoring/metricsdocs/metricsdocs.go | 2 +- .../monitoring/prom-rule-ci/rule-spec-dumper.go | 2 +- testdata/go/v4/memcached-operator/Makefile | 2 +- testdata/go/v4/memcached-operator/README.md | 2 +- .../api/v1alpha1/groupversion_info.go | 2 +- .../api/v1alpha1/memcached_types.go | 2 +- .../api/v1alpha1/memcached_webhook.go | 2 +- .../api/v1alpha1/webhook_suite_test.go | 2 +- .../api/v1alpha1/zz_generated.deepcopy.go | 2 +- testdata/go/v4/memcached-operator/cmd/main.go | 2 +- .../v4/memcached-operator/hack/boilerplate.go.txt | 2 +- .../internal/controller/memcached_controller.go | 2 +- .../controller/memcached_controller_test.go | 2 +- .../internal/controller/suite_test.go | 2 +- .../go/v4/monitoring/memcached-operator/Makefile | 2 +- .../go/v4/monitoring/memcached-operator/README.md | 2 +- .../api/v1alpha1/groupversion_info.go | 2 +- .../api/v1alpha1/memcached_types.go | 2 +- .../api/v1alpha1/memcached_webhook.go | 2 +- .../api/v1alpha1/webhook_suite_test.go | 2 +- .../api/v1alpha1/zz_generated.deepcopy.go | 2 +- .../go/v4/monitoring/memcached-operator/cmd/main.go | 2 +- .../memcached-operator/hack/boilerplate.go.txt | 2 +- .../internal/controller/memcached_controller.go | 2 +- .../controller/memcached_controller_test.go | 2 +- .../internal/controller/suite_test.go | 2 +- .../memcached-operator/monitoring/alerts.go | 2 +- .../memcached-operator/monitoring/metrics.go | 2 +- .../monitoring/metricsdocs/metricsdocs.go | 2 +- .../monitoring/prom-rule-ci/rule-spec-dumper.go | 2 +- testdata/helm/memcached-operator/Makefile | 2 +- 62 files changed, 62 insertions(+), 73 deletions(-) diff --git a/images/custom-scorecard-tests/Dockerfile b/images/custom-scorecard-tests/Dockerfile index df0f9c7a025..c2a95fffc62 100644 --- a/images/custom-scorecard-tests/Dockerfile +++ b/images/custom-scorecard-tests/Dockerfile @@ -17,7 +17,7 @@ COPY . . RUN GOOS=linux GOARCH=$TARGETARCH make build/custom-scorecard-tests # Final image. -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9 +FROM registry.access.redhat.com/ubi8/ubi-micro:8.9 ENV HOME=/opt/custom-scorecard-tests \ USER_NAME=custom-scorecard-tests \ diff --git a/images/helm-operator/Dockerfile b/images/helm-operator/Dockerfile index 78a294787f4..e50f2ec938d 100644 --- a/images/helm-operator/Dockerfile +++ b/images/helm-operator/Dockerfile @@ -17,7 +17,7 @@ COPY . . RUN GOOS=linux GOARCH=$TARGETARCH make build/helm-operator # Final image. -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9 +FROM registry.access.redhat.com/ubi8/ubi-micro:8.9 ENV HOME=/opt/helm \ USER_NAME=helm \ diff --git a/images/operator-sdk/Dockerfile b/images/operator-sdk/Dockerfile index c9d49e20ddb..f395b6f5296 100644 --- a/images/operator-sdk/Dockerfile +++ b/images/operator-sdk/Dockerfile @@ -17,18 +17,7 @@ COPY . . RUN GOOS=linux GOARCH=$TARGETARCH make build/operator-sdk # Final image. -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9 - -ENV GO_VERSION 1.19 - -ARG TARGETARCH -RUN microdnf install -y make gcc which tar gzip -RUN curl -sSLo /tmp/go.tar.gz https://golang.org/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz \ - && rm -rf /usr/local/go \ - && tar -C /usr/local -xzf /tmp/go.tar.gz \ - && ln -sf /usr/local/go/bin/* /usr/local/bin/ \ - && rm -f /tmp/go.tar.gz \ - && go version +FROM registry.access.redhat.com/ubi8/ubi-micro:8.9 COPY --from=builder /workspace/build/operator-sdk /usr/local/bin/operator-sdk diff --git a/images/scorecard-test/Dockerfile b/images/scorecard-test/Dockerfile index cd0c442e710..5643a8d073e 100644 --- a/images/scorecard-test/Dockerfile +++ b/images/scorecard-test/Dockerfile @@ -17,7 +17,7 @@ COPY . . RUN GOOS=linux GOARCH=$TARGETARCH make build/scorecard-test # Final image. -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9 +FROM registry.access.redhat.com/ubi8/ubi-micro:8.9 ENV HOME=/opt/scorecard-test \ USER_NAME=scorecard-test \ diff --git a/images/scorecard-untar/Dockerfile b/images/scorecard-untar/Dockerfile index a6f72053748..37f5dc2f67a 100644 --- a/images/scorecard-untar/Dockerfile +++ b/images/scorecard-untar/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi8:8.7 +FROM registry.access.redhat.com/ubi8/ubi-micro:8.9 ## Create a new non-root user to run as ENV HOME=/opt/scorecard-untar \ diff --git a/testdata/go/v3/memcached-operator/Makefile b/testdata/go/v3/memcached-operator/Makefile index add3bcc5910..f1b3e24b37c 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 diff --git a/testdata/go/v3/memcached-operator/README.md b/testdata/go/v3/memcached-operator/README.md index 3194aa0789a..caa89baa89c 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 b5a1e8f2d3c..e048c19fa0e 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 822d0a4084a..3dd5dc10131 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 f6e37a50973..3de1429df34 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 7fa23aac478..40e921f4d02 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 26ea5c32e4b..f82b0c5ce90 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 ef32cc0e30b..a244b37e639 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 0b677bb1920..160878dd4b4 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 6b6c12f4636..56c43ba5d07 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 65b86227183..ff72ff2aaab 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 a8c1a22305a..e9657cea8bb 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/Makefile b/testdata/go/v3/monitoring/memcached-operator/Makefile index 8b6d3d44a1a..934901a27d3 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 diff --git a/testdata/go/v3/monitoring/memcached-operator/README.md b/testdata/go/v3/monitoring/memcached-operator/README.md index 3194aa0789a..caa89baa89c 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 b5a1e8f2d3c..e048c19fa0e 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 822d0a4084a..3dd5dc10131 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 f6e37a50973..3de1429df34 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 7fa23aac478..40e921f4d02 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 26ea5c32e4b..f82b0c5ce90 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 702463e0cb2..5fcb522605c 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 0b677bb1920..160878dd4b4 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 6b6c12f4636..56c43ba5d07 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 65b86227183..ff72ff2aaab 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 39d35248801..099d871d399 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 0b730709b37..22524c0b546 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 6365c4551c8..545e665ea94 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 84ae54faf4a..e0a72ed0ae5 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 d9ff585dd5d..38f695bb9a6 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/Makefile b/testdata/go/v4/memcached-operator/Makefile index 16b60a2f0c2..20b38386916 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 diff --git a/testdata/go/v4/memcached-operator/README.md b/testdata/go/v4/memcached-operator/README.md index 3194aa0789a..caa89baa89c 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 b5a1e8f2d3c..e048c19fa0e 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 822d0a4084a..3dd5dc10131 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 f6e37a50973..3de1429df34 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 40beb6cfdc7..2178faa02f7 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 26ea5c32e4b..f82b0c5ce90 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 4b8ac664f2f..3ff3f291c80 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 65b86227183..ff72ff2aaab 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 864c953623c..e8c60e1875b 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 4ab82b317aa..cef20513c9c 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 12253046cc5..c94cf5519e4 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/Makefile b/testdata/go/v4/monitoring/memcached-operator/Makefile index 83f75a12b6f..d1a3a87e32e 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 diff --git a/testdata/go/v4/monitoring/memcached-operator/README.md b/testdata/go/v4/monitoring/memcached-operator/README.md index 3194aa0789a..caa89baa89c 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 b5a1e8f2d3c..e048c19fa0e 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 822d0a4084a..3dd5dc10131 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 f6e37a50973..3de1429df34 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 40beb6cfdc7..2178faa02f7 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 26ea5c32e4b..f82b0c5ce90 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 954f8bb94ca..b9b71b41e0d 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 65b86227183..ff72ff2aaab 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 e3989b86b96..0ddc244bdff 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 4ab82b317aa..cef20513c9c 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 12253046cc5..c94cf5519e4 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 0b730709b37..22524c0b546 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 6365c4551c8..545e665ea94 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 84ae54faf4a..e0a72ed0ae5 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 d9ff585dd5d..38f695bb9a6 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. diff --git a/testdata/helm/memcached-operator/Makefile b/testdata/helm/memcached-operator/Makefile index 04f02bb09a9..4d14e9a5f7e 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