Skip to content

Copy kindnet and kube-proxy assets to the upstream repository#76

Merged
ggiguash merged 6 commits intomicroshift-io:mainfrom
ggiguash:kindnet-move-upstream
Oct 16, 2025
Merged

Copy kindnet and kube-proxy assets to the upstream repository#76
ggiguash merged 6 commits intomicroshift-io:mainfrom
ggiguash:kindnet-move-upstream

Conversation

@ggiguash
Copy link
Contributor

@ggiguash ggiguash commented Oct 14, 2025

Resolves #73
Resolves #75

%package kindnet
Summary: kindnet CNI for MicroShift
ExclusiveArch: x86_64 aarch64
Requires: microshift = %{version}
Copy link
Contributor

Choose a reason for hiding this comment

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

Would that work?

Suggested change
Requires: microshift = %{version}
Requires: microshift = %{version}
Conflicts: microshift-networking

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This would not allow microshift-kindnet installation if microshift-networking is installed.
It may be a bit of too strong, I think, because Kindnet overrides and disables OVN-k.

Maybe, Obsoletes: is a better candidate? It'll cause the package to be uninstalled if present.
Since it's an uncharted territory, I can create a separate issue to follow-up, if you think we should do this.

echo "Usage:"
echo "$(basename "$0") --verify OKD_URL RELEASE_TAG verify upstream release"
echo "$(basename "$0") --replace OKD_URL RELEASE_TAG replace microshift assets with upstream images"
echo "$(basename "$0") --verify OKD_URL RELEASE_TAG verify OKD upstream release"
Copy link
Contributor

Choose a reason for hiding this comment

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

Just btw. is there a reason why we split OKD_URL and RELEASE_TAG into two params even though we always join them later?
When it comes to OCI images I find this a bit superficial

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think it's a mere convenience.
OKD_URL is fixed, while the tag is a variable that we calculate.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I can create a follow-up issue if you think we should fix it

@ggiguash ggiguash requested a review from pmtk October 14, 2025 16:12
@ggiguash
Copy link
Contributor Author

ggiguash commented Oct 15, 2025

Now that the code has been removed from downstream repo, restarting the tests to see if we have not missed to copy anything upstream.

Also, adjusting WITH_KINDNET usage and increasing run-healthy timeout to 15m.

@ggiguash ggiguash merged commit 8b1a324 into microshift-io:main Oct 16, 2025
14 of 16 checks passed
@ggiguash ggiguash deleted the kindnet-move-upstream branch October 16, 2025 07:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Remove WITH_KINDNET=0 when building kindnet upstream Copy kindnet assets to upstream repo

2 participants