Merge pull request #152 from cert-manager/self-upgrade-main

Manual makefile-modules upgrade
cert-manager · Jan 29, 2025 · 711efee · 711efee
2 parents 8ff1d3e + ee81ecb
commit 711efee
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/govulncheck.yaml b/.github/workflows/govulncheck.yaml
@@ -28,7 +28,7 @@ jobs:
         run: |
           make print-go-version >> "$GITHUB_OUTPUT"
 
-      - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
+      - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
         with:
           go-version: ${{ steps.go-version.outputs.result }}
 

diff --git a/.github/workflows/make-self-upgrade.yaml b/.github/workflows/make-self-upgrade.yaml
@@ -42,7 +42,7 @@ jobs:
         run: |
           make print-go-version >> "$GITHUB_OUTPUT"
 
-      - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
+      - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
         with:
           go-version: ${{ steps.go-version.outputs.result }}
 

diff --git a/klone.yaml b/klone.yaml
@@ -10,65 +10,65 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 05aa82b2d7e66d515d539b9c56f8a7d831fe048b
+      repo_hash: 4c928b49036b018acd01eabf3bdcd21be73201a5
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 05aa82b2d7e66d515d539b9c56f8a7d831fe048b
+      repo_hash: 4c928b49036b018acd01eabf3bdcd21be73201a5
       repo_path: modules/cert-manager
     - folder_name: controller-gen
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 05aa82b2d7e66d515d539b9c56f8a7d831fe048b
+      repo_hash: 4c928b49036b018acd01eabf3bdcd21be73201a5
       repo_path: modules/controller-gen
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 05aa82b2d7e66d515d539b9c56f8a7d831fe048b
+      repo_hash: 4c928b49036b018acd01eabf3bdcd21be73201a5
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 05aa82b2d7e66d515d539b9c56f8a7d831fe048b
+      repo_hash: 4c928b49036b018acd01eabf3bdcd21be73201a5
       repo_path: modules/go
     - folder_name: helm
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 05aa82b2d7e66d515d539b9c56f8a7d831fe048b
+      repo_hash: 4c928b49036b018acd01eabf3bdcd21be73201a5
       repo_path: modules/helm
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 05aa82b2d7e66d515d539b9c56f8a7d831fe048b
+      repo_hash: 4c928b49036b018acd01eabf3bdcd21be73201a5
       repo_path: modules/help
     - folder_name: kind
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 05aa82b2d7e66d515d539b9c56f8a7d831fe048b
+      repo_hash: 4c928b49036b018acd01eabf3bdcd21be73201a5
       repo_path: modules/kind
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 05aa82b2d7e66d515d539b9c56f8a7d831fe048b
+      repo_hash: 4c928b49036b018acd01eabf3bdcd21be73201a5
       repo_path: modules/klone
     - folder_name: oci-build
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 05aa82b2d7e66d515d539b9c56f8a7d831fe048b
+      repo_hash: 4c928b49036b018acd01eabf3bdcd21be73201a5
       repo_path: modules/oci-build
     - folder_name: oci-publish
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 05aa82b2d7e66d515d539b9c56f8a7d831fe048b
+      repo_hash: 4c928b49036b018acd01eabf3bdcd21be73201a5
       repo_path: modules/oci-publish
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 05aa82b2d7e66d515d539b9c56f8a7d831fe048b
+      repo_hash: 4c928b49036b018acd01eabf3bdcd21be73201a5
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 05aa82b2d7e66d515d539b9c56f8a7d831fe048b
+      repo_hash: 4c928b49036b018acd01eabf3bdcd21be73201a5
       repo_path: modules/tools
diff --git a/make/_shared/go/base/.github/workflows/govulncheck.yaml b/make/_shared/go/base/.github/workflows/govulncheck.yaml
@@ -28,7 +28,7 @@ jobs:
         run: |
           make print-go-version >> "$GITHUB_OUTPUT"
 
-      - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
+      - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
         with:
           go-version: ${{ steps.go-version.outputs.result }}
 

diff --git a/make/_shared/helm/crds.mk b/make/_shared/helm/crds.mk
@@ -67,7 +67,7 @@ generate-crds: | $(NEEDS_CONTROLLER-GEN) $(NEEDS_YQ)
 	done
 
 	@if [ -n "$$(ls $(crds_gen_temp) 2>/dev/null)" ]; then \
-		cp -r $(crds_gen_temp) $(crds_dir)/ ; \
+		cp $(crds_gen_temp)/* $(crds_dir)/ ; \
 		cp $(crds_dir_readme) $(crds_dir)/README.md ; \
 	fi
 

diff --git a/make/_shared/repository-base/base/.github/workflows/make-self-upgrade.yaml b/make/_shared/repository-base/base/.github/workflows/make-self-upgrade.yaml
@@ -42,7 +42,7 @@ jobs:
         run: |
           make print-go-version >> "$GITHUB_OUTPUT"
 
-      - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
+      - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
         with:
           go-version: ${{ steps.go-version.outputs.result }}