Skip to content

Run make upgrade-klone and make generate #792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SgtCoDFish merged 3 commits into from
Apr 21, 2026
Merged

Run make upgrade-klone and make generate #792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64b4000
run make upgrade-klone
SgtCoDFish Apr 21, 2026
9c7ba9f
various changes relating to helm unittests
SgtCoDFish Apr 21, 2026
95127b0
temporary: only run ark e2e test when a label is given
SgtCoDFish Apr 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/make-self-upgrade.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
run: |
make print-go-version >> "$GITHUB_OUTPUT"

- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
with:
go-version: ${{ steps.go-version.outputs.result }}

Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
git push -f origin "$SELF_UPGRADE_BRANCH"

- if: ${{ steps.is-up-to-date.outputs.result != 'true' }}
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
with:
github-token: ${{ steps.octo-sts.outputs.token }}
script: |
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ jobs:
path: _bin/downloaded
key: downloaded-${{ runner.os }}-${{ hashFiles('klone.yaml') }}-test-unit

- run: make -j test-unit test-helm
# NB: helm unit tests will be run by "make verify", so we don't run it here
- run: make -j test-unit
env:
# These environment variables are required to run the CyberArk client integration tests
ARK_DISCOVERY_API: https://platform-discovery.integration-cyberark.cloud/
Expand All @@ -75,6 +76,11 @@ jobs:
ARK_SECRET: ${{ secrets.ARK_SECRET }}

ark-test-e2e:
# TEMPORARY: require an explicit label to test disco-agent until the test environment fixes a recurring issue
# where the e2e fails with a 400 error relating to "conflicting tagging values"
# The test is flaky, not broken and re-running eventually makes it pass - but that delays progress on
# other unrelated work.
if: contains(github.event.pull_request.labels.*.name, 'test-ark')
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
Expand Down
1 change: 1 addition & 0 deletions OWNERS_ALIASES
View file
Open in desktop
Copy link
Copy Markdown
Contributor Author

@SgtCoDFish SgtCoDFish Apr 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

self-review: this file is definitely not needed in this repo (it's a cert-manager thing we pull in).

But, it's not doing any harm and the actual OWNERS file is massively out of date too. I'm leaving cleaning that up as a separate thing for the future and ignoring it here.

Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ aliases:
- inteon
- thatsmrtalbot
- erikgb
- hjoshi123
10 changes: 5 additions & 5 deletions deploy/charts/venafi-kubernetes-agent/tests/__snapshot__/configmap_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
custom-cluster-description:
1: |
raw: |2
raw: |
- Check the credentials Secret exists: "agent-credentials"
> kubectl get secret -n test-ns agent-credentials
- Check the application is running:
Expand Down Expand Up @@ -287,7 +287,7 @@ custom-cluster-description:
namespace: test-ns
custom-cluster-name:
1: |
raw: |2
raw: |
- Check the credentials Secret exists: "agent-credentials"
> kubectl get secret -n test-ns agent-credentials
- Check the application is running:
Expand Down Expand Up @@ -574,7 +574,7 @@ custom-cluster-name:
namespace: test-ns
custom-configmap:
1: |
|2
|
You are using a custom configuration in the following ConfigMap: "agent-custom-config".

DEPRECATION: The `cluster_id` configuration field is deprecated.
Expand All @@ -589,7 +589,7 @@ custom-configmap:
> kubectl logs -n test-ns -l app.kubernetes.io/instance=test
custom-period:
1: |
raw: |2
raw: |
- Check the credentials Secret exists: "agent-credentials"
> kubectl get secret -n test-ns agent-credentials
- Check the application is running:
Expand Down Expand Up @@ -876,7 +876,7 @@ custom-period:
namespace: test-ns
defaults:
1: |
raw: |2
raw: |
- Check the credentials Secret exists: "agent-credentials"
> kubectl get secret -n test-ns agent-credentials
- Check the application is running:
Expand Down
22 changes: 11 additions & 11 deletions klone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,55 +10,55 @@ targets:
- folder_name: generate-verify
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: db3f643e1aa63fc2873731249f9aabf777fb86aa
repo_hash: 962eeffd065691abd2644eb514a7ec4cc47808fb
repo_path: modules/generate-verify
- folder_name: go
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: db3f643e1aa63fc2873731249f9aabf777fb86aa
repo_hash: 962eeffd065691abd2644eb514a7ec4cc47808fb
repo_path: modules/go
- folder_name: helm
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: db3f643e1aa63fc2873731249f9aabf777fb86aa
repo_hash: 962eeffd065691abd2644eb514a7ec4cc47808fb
repo_path: modules/helm
- folder_name: help
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: db3f643e1aa63fc2873731249f9aabf777fb86aa
repo_hash: 962eeffd065691abd2644eb514a7ec4cc47808fb
repo_path: modules/help
- folder_name: kind
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: db3f643e1aa63fc2873731249f9aabf777fb86aa
repo_hash: 962eeffd065691abd2644eb514a7ec4cc47808fb
repo_path: modules/kind
- folder_name: klone
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: db3f643e1aa63fc2873731249f9aabf777fb86aa
repo_hash: 962eeffd065691abd2644eb514a7ec4cc47808fb
repo_path: modules/klone
- folder_name: licenses
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: db3f643e1aa63fc2873731249f9aabf777fb86aa
repo_hash: 962eeffd065691abd2644eb514a7ec4cc47808fb
repo_path: modules/licenses
- folder_name: oci-build
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: db3f643e1aa63fc2873731249f9aabf777fb86aa
repo_hash: 962eeffd065691abd2644eb514a7ec4cc47808fb
repo_path: modules/oci-build
- folder_name: oci-publish
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: db3f643e1aa63fc2873731249f9aabf777fb86aa
repo_hash: 962eeffd065691abd2644eb514a7ec4cc47808fb
repo_path: modules/oci-publish
- folder_name: repository-base
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: db3f643e1aa63fc2873731249f9aabf777fb86aa
repo_hash: 962eeffd065691abd2644eb514a7ec4cc47808fb
repo_path: modules/repository-base
- folder_name: tools
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: db3f643e1aa63fc2873731249f9aabf777fb86aa
repo_hash: 962eeffd065691abd2644eb514a7ec4cc47808fb
repo_path: modules/tools
9 changes: 2 additions & 7 deletions make/02_mod.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,12 @@ shared_generate_targets += generate-crds-venconn
test-e2e-gke: | $(NEEDS_HELM) $(NEEDS_STEP) $(NEEDS_VENCTL)
./hack/e2e/test.sh

.PHONY: test-helm
## Run `helm unittest`.
## @category Testing
test-helm: | $(NEEDS_HELM-UNITTEST)
$(HELM-UNITTEST) ./deploy/charts/{venafi-kubernetes-agent,disco-agent}

.PHONY: test-helm-snapshot
## Update the `helm unittest` snapshots.
## Note that running helm unit tests is done through "make verify" using the Helm makefile-module
## @category Testing
test-helm-snapshot: | $(NEEDS_HELM-UNITTEST)
$(HELM-UNITTEST) ./deploy/charts/{venafi-kubernetes-agent,disco-agent} -u
$(HELM-UNITTEST) ./deploy/charts/{venafi-kubernetes-agent,disco-agent,discovery-agent} -u

.PHONY: helm-plugins
## Install required helm plugins
Expand Down
2 changes: 1 addition & 1 deletion make/_shared/go/base/.github/workflows/govulncheck.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
run: |
make print-go-version >> "$GITHUB_OUTPUT"

- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
with:
go-version: ${{ steps.go-version.outputs.result }}

Expand Down
8 changes: 8 additions & 0 deletions make/_shared/helm/helm.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,14 @@ verify-helm-values: | $(NEEDS_HELM-TOOL) $(NEEDS_GOJQ)

shared_verify_targets += verify-helm-values

.PHONY: verify-helm-unittest
## Run Helm chart unit tests using helm-unittest.
## @category [shared] Generate/ Verify
verify-helm-unittest: | $(NEEDS_HELM-UNITTEST)
$(HELM-UNITTEST) $(helm_chart_source_dir)

shared_verify_targets += verify-helm-unittest

$(bin_dir)/scratch/kyverno:
@mkdir -p $@

Expand Down
4 changes: 2 additions & 2 deletions make/_shared/oci-build/00_mod.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@

# Use distroless as minimal base image to package the manager binary
# To get latest SHA run "crane digest quay.io/jetstack/base-static:latest"
base_image_static := quay.io/jetstack/base-static@sha256:1da2e7de36c9d7a1931d765e8054a3c9fe7ed5126bacf728bb7429e923386146
base_image_static := quay.io/jetstack/base-static@sha256:bcdce6869d855fb0b8808ebfc5315360e3413b9975776b5c9e8899744b1ee8a9

# Use custom apko-built image as minimal base image to package the manager binary
# To get latest SHA run "crane digest quay.io/jetstack/base-static-csi:latest"
base_image_csi-static := quay.io/jetstack/base-static-csi@sha256:05ec9b9d5798fdd80680a54eab9eb69134d3cdaae948935bb1af07dadeb6e9be
base_image_csi-static := quay.io/jetstack/base-static-csi@sha256:e8c56285c3bd5bb98f8c0b3d30c5b28d81c087e333b6f9e3296c2eb51faca47e

# Utility functions
fatal_if_undefined = $(if $(findstring undefined,$(origin $1)),$(error $1 is not set))
Expand Down
4 changes: 2 additions & 2 deletions make/_shared/repository-base/base/.github/workflows/make-self-upgrade.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
run: |
make print-go-version >> "$GITHUB_OUTPUT"

- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
with:
go-version: ${{ steps.go-version.outputs.result }}

Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
git push -f origin "$SELF_UPGRADE_BRANCH"

- if: ${{ steps.is-up-to-date.outputs.result != 'true' }}
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
with:
github-token: ${{ steps.octo-sts.outputs.token }}
script: |
Expand Down
1 change: 1 addition & 0 deletions make/_shared/repository-base/base/OWNERS_ALIASES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ aliases:
- inteon
- thatsmrtalbot
- erikgb
- hjoshi123
Loading
Loading