Skip to content

NO-JIRA: Add manifests verify target #579

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

NO-JIRA: Add manifests verify target #579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 36 additions & 0 deletions openshift/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,49 @@ $(RELEASE_DIR):
mkdir -p $(RELEASE_DIR)/

MANIFESTS_GEN := go run ./vendor/github.com/openshift/cluster-capi-operator/manifests-gen/
YQ := go run github.com/mikefarah/yq/v4@v4.48.1

.PHONY: check-env
check-env:
ifndef PROVIDER_VERSION
$(error PROVIDER_VERSION is undefined)
endif

.PHONY: verify
verify: verify-ocp-manifests

# NOTE: This target extracts the provider version from the existing generated manifest
# and uses it for regeneration. This means the version label itself is NOT verified,
# only that the rest of the manifest structure is correct.
MANIFEST_FILE := manifests/0000_30_cluster-api_04_cm.infrastructure-aws.yaml
.PHONY: verify-ocp-manifests
verify-ocp-manifests:
@echo "Extracting provider version from existing manifest..."
$(eval PROVIDER_VERSION := $(shell ${YQ} eval '.metadata.labels."provider.cluster.x-k8s.io/version"' $(MANIFEST_FILE)))
@if [ -z "$(PROVIDER_VERSION)" ]; then \
echo "Error: Could not extract provider version from $(MANIFEST_FILE)"; \
exit 1; \
fi
@echo "Using PROVIDER_VERSION=$(PROVIDER_VERSION) for verification"
@$(MAKE) ocp-manifests PROVIDER_VERSION=$(PROVIDER_VERSION) || { \
echo "Error: Failed to generate manifests"; \
exit 1; \
}
@if ./verify-diff.sh; then \
echo ""; \
echo "Verification successful! Manifests are in sync."; \
else \
git restore $(MANIFEST_FILE); \
echo ""; \
echo "Verification failed! Manifests are out of sync."; \
echo "Please run:"; \
echo " PROVIDER_VERSION=<release-version> make ocp-manifests"; \
echo ""; \
echo "Where <release-version> is the desired upstream release version tag (e.g., v2.9.2)"; \
echo "that matches the upstream version the OpenShift fork is based on."; \
exit 1; \
fi

.PHONY: update-manifests-gen
update-manifests-gen:
cd tools && go get github.com/openshift/cluster-capi-operator/manifests-gen && go mod tidy && go mod vendor
Expand Down
11 changes: 11 additions & 0 deletions openshift/verify-diff.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/bash

FILE_DIFF=$(git ls-files -o --exclude-standard)

if [ "$FILE_DIFF" != "" ]; then
echo "Found untracked files:"
echo "$FILE_DIFF"
exit 1
fi

git diff --exit-code