Merge pull request #1744 from cert-manager/self-upgrade-master

[CI] Merge self-upgrade-master into master

Author: cert-manager-prow[bot]

.github/workflows/make-self-upgrade.yaml

@@ -15,7 +15,7 @@ jobs:
   self_upgrade:
     runs-on: ubuntu-latest
 
-    if: github.repository_owner == 'cert-manager'
+    if: github.repository == 'cert-manager/website'
 
     permissions:
       contents: write

klone.yaml

@@ -10,30 +10,30 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: cf7f45d0a649834f3a8906ffef411bce03d09ac5
+      repo_hash: 8837533393f5309a1f6ce4cc09641c26d50cef5d
       repo_path: modules/boilerplate
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: cf7f45d0a649834f3a8906ffef411bce03d09ac5
+      repo_hash: 8837533393f5309a1f6ce4cc09641c26d50cef5d
       repo_path: modules/generate-verify
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: cf7f45d0a649834f3a8906ffef411bce03d09ac5
+      repo_hash: 8837533393f5309a1f6ce4cc09641c26d50cef5d
       repo_path: modules/help
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: cf7f45d0a649834f3a8906ffef411bce03d09ac5
+      repo_hash: 8837533393f5309a1f6ce4cc09641c26d50cef5d
       repo_path: modules/klone
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: cf7f45d0a649834f3a8906ffef411bce03d09ac5
+      repo_hash: 8837533393f5309a1f6ce4cc09641c26d50cef5d
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: cf7f45d0a649834f3a8906ffef411bce03d09ac5
+      repo_hash: 8837533393f5309a1f6ce4cc09641c26d50cef5d
       repo_path: modules/tools

make/00_mod.mk

@@ -1,3 +1,19 @@
+# Copyright 2025 The cert-manager Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+repo_name := github.com/cert-manager/website
+
 # Node and NPM are installed from the same source, so the versions must match
 ADDITIONAL_TOOLS += node=v20.11.1
 ADDITIONAL_TOOLS += npm=v20.11.1

make/02_mod.mk

@@ -1,3 +1,17 @@
+# Copyright 2025 The cert-manager Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 npm_scripts = build start dev check
 .PHONY: $(npm_scripts)
 $(npm_scripts): | $(NEEDS_NPM)

make/_shared/boilerplate/01_mod.mk

@@ -12,10 +12,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+license_base_dir := $(dir $(lastword $(MAKEFILE_LIST)))/base/
+
 .PHONY: verify-boilerplate
 ## Verify that all files have the correct boilerplate.
 ## @category [shared] Generate/ Verify
 verify-boilerplate: | $(NEEDS_BOILERSUITE)
 	$(BOILERSUITE) .
 
 shared_verify_targets += verify-boilerplate
+
+.PHONY: generate-license
+## Generate LICENSE file in the repository
+## @category [shared] Generate/ Verify
+generate-license:
+	cp -r $(license_base_dir)/. ./
+
+shared_generate_targets += generate-base

make/_shared/repository-base/base/LICENSE renamed to make/_shared/boilerplate/base/LICENSE

@@ -12,22 +12,34 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-base_dir := $(dir $(lastword $(MAKEFILE_LIST)))/base/
-base_dependabot_dir := $(dir $(lastword $(MAKEFILE_LIST)))/base-dependabot/
+ifndef repo_name
+$(error repo_name is not set)
+endif
+
+repository_base_dir := $(dir $(lastword $(MAKEFILE_LIST)))/base/
+repository_base_dependabot_dir := $(dir $(lastword $(MAKEFILE_LIST)))/base-dependabot/
 
 ifdef repository_base_no_dependabot
 .PHONY: generate-base
 ## Generate base files in the repository
 ## @category [shared] Generate/ Verify
 generate-base:
-	cp -r $(base_dir)/. ./
+	cp -r $(repository_base_dir)/. ./
+	cd $(repository_base_dir) && \
+		find . -type f | while read file; do \
+			sed "s|{{REPLACE:GH-REPOSITORY}}|$(repo_name:github.com/%=%)|g" "$$file" > "$(CURDIR)/$$file"; \
+		done
 else
 .PHONY: generate-base
 ## Generate base files in the repository
 ## @category [shared] Generate/ Verify
 generate-base:
-	cp -r $(base_dir)/. ./
-	cp -r $(base_dependabot_dir)/. ./
+	cp -r $(repository_base_dir)/. ./
+	cd $(repository_base_dir) && \
+		find . -type f | while read file; do \
+			sed "s|{{REPLACE:GH-REPOSITORY}}|$(repo_name:github.com/%=%)|g" "$$file" > "$(CURDIR)/$$file"; \
+		done
+	cp -r $(repository_base_dependabot_dir)/. ./
 endif
 
 shared_generate_targets += generate-base

make/_shared/repository-base/01_mod.mk

@@ -15,7 +15,7 @@ jobs:
   self_upgrade:
     runs-on: ubuntu-latest
 
-    if: github.repository_owner == 'cert-manager'
+    if: github.repository == '{{REPLACE:GH-REPOSITORY}}'
 
     permissions:
       contents: write

make/_shared/repository-base/base/.github/workflows/make-self-upgrade.yaml

@@ -93,7 +93,7 @@ tools += controller-gen=v0.18.0
 # https://pkg.go.dev/golang.org/x/tools/cmd/goimports?tab=versions
 tools += goimports=v0.35.0
 # https://pkg.go.dev/github.com/google/go-licenses/v2?tab=versions
-tools += go-licenses=8c3708dd545a9faed3777bf50a3530ff8082180a
+tools += go-licenses=e4be799587800ffd119a1b419f13daf4989da546
 # https://pkg.go.dev/gotest.tools/gotestsum?tab=versions
 tools += gotestsum=v1.12.3
 # https://pkg.go.dev/sigs.k8s.io/kustomize/kustomize/v5?tab=versions