Skip to content

fix version file generation #2223

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
danudey merged 9 commits into from
Aug 14, 2025
Merged

fix version file generation #2223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0bbc1e9
Add small golang util to fixup versions files
danudey Aug 11, 2025
4a4a500
Run updated versions generation for v3.22
danudey Aug 11, 2025
a25a3db
Update versions from upstream
danudey Aug 12, 2025
5b98ce4
Fix whitespace in releases file
danudey Aug 12, 2025
0eb68fb
More updates to support v3.20
danudey Aug 12, 2025
86afbdc
Pass GOOS/GOARCH to filter-versions build
danudey Aug 13, 2025
c2b4d7b
Update calico cloud api docs while we're here
danudey Aug 14, 2025
8806d14
feat: more variables/release generation cleanup
danudey Aug 14, 2025
2447da9
Add notes to version/updateall make target
danudey Aug 14, 2025
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
33 changes: 31 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,20 @@ show_current_branches:
$(foreach CAL_BRANCH,$(CALICO_CLOUD_BRANCHES),$(info * $(CAL_BRANCH)))
@true

scripts/versions/format-versions: scripts/versions/go.* scripts/versions/main.go
ifdef LOCAL_BUILD
make -C scripts/versions
else
docker run --rm --net=host \
-e LOCAL_USER_ID=$(LOCAL_USER_ID) \
-e GOOS=$(shell go env GOOS) \
-e GOARCH=$(shell go env GOARCH) \
-v $(CURDIR):/go/src/$(PACKAGE_NAME):rw \
-v $(CURDIR)/.go-pkg-cache:/go/pkg:rw \
-w /go/src/$(PACKAGE_NAME) \
$(CALICO_BUILD) make -C scripts/versions
endif

.PHONY: build-operator-reference
build-operator-reference:
@mkdir -p .go-pkg-cache && \
Expand Down Expand Up @@ -199,11 +213,26 @@ run-update-cloud-image-list:
# e.g. for new versions of v3.18.0-2, DOCS_VERSION_STREAM=3.18-2
# If the version to updates is the latest version for the product, specify IS_LATEST=true
# e.g. if 3,18,1 is the latest version, IS_LATEST=true
version/autogen:

VERSION_ALL_VERSIONS=$(foreach version,$(wildcard calico-enterprise_versioned_docs/*),version/autogen/$(version:calico-enterprise_versioned_docs/version-%=%))

# This target updates *the current versions* based on what is present in calico-private. It will
# not (to my knowledge) add a new version which has not yet been added to the docs.
version/updateall: $(VERSION_ALL_VERSIONS)
$(info [info] All current versions have been updated, but please check `git diff` to ensure the values are correct!)

version/autogen/%:
$(info Building $@)
@$(MAKE) --no-print-directory version/autogen \
PRODUCT=calico-enterprise \
DOCS_VERSION_STREAM=$* \
VERSION=$(shell jq -r '.[0].title' calico-enterprise_versioned_docs/version-$*/releases.json)

version/autogen: scripts/versions/format-versions
$(if $(GITHUB_TOKEN),,$(error GITHUB_TOKEN is not set or empty, but is required))
$(if $(PRODUCT),,$(error PRODUCT is not set or empty, but is required))
$(if $(VERSION),,$(error VERSION is not set or empty, but is required))
./scripts/update-component-versions.sh
@./scripts/update-component-versions.sh

# Call the github API. $(1) is the http method type for the https request, $(2) is the repo slug, and is $(3) is for json
# data (if omitted then no data is set for the request). If GITHUB_API_EXIT_ON_FAILURE is set then the macro exits with 1
Expand Down
4 changes: 2 additions & 2 deletions calico-cloud/reference/installation/_api.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ APIServerDeployment
<td>

<p>
APIServerDeployment configures the calico-apiserver Deployment. If
APIServerDeployment configures the calico-apiserver (or tigera-apiserver in Enterprise) Deployment. If
used in conjunction with ControlPlaneNodeSelector or ControlPlaneTolerations, then these overrides
take precedence.
</p>
Expand Down Expand Up @@ -4693,7 +4693,7 @@ APIServerDeployment
<td>

<p>
APIServerDeployment configures the calico-apiserver Deployment. If
APIServerDeployment configures the calico-apiserver (or tigera-apiserver in Enterprise) Deployment. If
used in conjunction with ControlPlaneNodeSelector or ControlPlaneTolerations, then these overrides
take precedence.
</p>
Expand Down
Loading