Skip to content

feat: use CRD installer in backwards compatibility test, remove v1beta1 from charts #1153

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
Arvindthiru merged 1 commit into from
Jul 10, 2025
Merged

feat: use CRD installer in backwards compatibility test, remove v1beta1 from charts #1153

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
1 change: 0 additions & 1 deletion charts/hub-agent/crdbases/cluster.kubernetes-fleet.io_internalmemberclusters.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion charts/hub-agent/crdbases/cluster.kubernetes-fleet.io_memberclusters.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion charts/hub-agent/crdbases/placement.kubernetes-fleet.io_clusterresourceplacements.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion charts/hub-agent/crdbases/placement.kubernetes-fleet.io_works.yaml
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions charts/hub-agent/templates/crds/crps.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,3 @@
{{ if .Values.enableV1Alpha1APIs }}
{{ $files.Get "crdbases/fleet.azure.com_clusterresourceplacements.yaml" }}
{{ end }}
---
{{ if .Values.enableV1Beta1APIs }}
{{ $files.Get "crdbases/placement.kubernetes-fleet.io_clusterresourceplacements.yaml" }}
{{ end }}
4 changes: 0 additions & 4 deletions charts/hub-agent/templates/crds/internalmemberclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,3 @@
{{ if .Values.enableV1Alpha1APIs }}
{{ $files.Get "crdbases/fleet.azure.com_internalmemberclusters.yaml" }}
{{ end }}
---
{{ if .Values.enableV1Beta1APIs }}
{{ $files.Get "crdbases/cluster.kubernetes-fleet.io_internalmemberclusters.yaml" }}
{{ end }}
4 changes: 0 additions & 4 deletions charts/hub-agent/templates/crds/memberclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,3 @@
{{ if .Values.enableV1Alpha1APIs }}
{{ $files.Get "crdbases/fleet.azure.com_memberclusters.yaml" }}
{{ end }}
---
{{ if .Values.enableV1Beta1APIs }}
{{ $files.Get "crdbases/cluster.kubernetes-fleet.io_memberclusters.yaml" }}
{{ end }}
1 change: 0 additions & 1 deletion charts/hub-agent/templates/crds/multicluster.x-k8s.io_clusterprofiles.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion charts/hub-agent/templates/crds/placement.kubernetes-fleet.io_clusterapprovalrequests.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion charts/hub-agent/templates/crds/placement.kubernetes-fleet.io_clusterresourcebindings.yaml
View file
Open in desktop

This file was deleted.

58 changes: 0 additions & 58 deletions charts/hub-agent/templates/crds/placement.kubernetes-fleet.io_clusterresourceenvelopes.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion charts/hub-agent/templates/crds/placement.kubernetes-fleet.io_clusterresourceoverrides.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...-agent/templates/crds/placement.kubernetes-fleet.io_clusterresourceoverridesnapshots.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...mplates/crds/placement.kubernetes-fleet.io_clusterresourceplacementdisruptionbudgets.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...agent/templates/crds/placement.kubernetes-fleet.io_clusterresourceplacementevictions.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion charts/hub-agent/templates/crds/placement.kubernetes-fleet.io_clusterresourcesnapshots.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...-agent/templates/crds/placement.kubernetes-fleet.io_clusterschedulingpolicysnapshots.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion charts/hub-agent/templates/crds/placement.kubernetes-fleet.io_clusterstagedupdateruns.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...hub-agent/templates/crds/placement.kubernetes-fleet.io_clusterstagedupdatestrategies.yaml
View file
Open in desktop

This file was deleted.

58 changes: 0 additions & 58 deletions charts/hub-agent/templates/crds/placement.kubernetes-fleet.io_resourceenvelopes.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion charts/hub-agent/templates/crds/placement.kubernetes-fleet.io_resourceoverrides.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion charts/hub-agent/templates/crds/placement.kubernetes-fleet.io_resourceoverridesnapshots.yaml
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions charts/hub-agent/templates/crds/works.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,3 @@
{{ if .Values.enableV1Alpha1APIs }}
{{ $files.Get "crdbases/multicluster.x-k8s.io_works.yaml" }}
{{ end }}
---
{{ if .Values.enableV1Beta1APIs }}
{{ $files.Get "crdbases/placement.kubernetes-fleet.io_works.yaml" }}
{{ end }}
1 change: 0 additions & 1 deletion charts/member-agent/crdbases/placement.kubernetes-fleet.io_appliedworks.yaml
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions charts/member-agent/templates/crds/appliedworks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,3 @@
{{ if .Values.enableV1Alpha1APIs }}
{{ $files.Get "crdbases/multicluster.x-k8s.io_appliedworks.yaml" }}
{{ end }}
---
{{ if .Values.enableV1Beta1APIs }}
{{ $files.Get "crdbases/placement.kubernetes-fleet.io_appliedworks.yaml" }}
{{ end }}
12 changes: 12 additions & 0 deletions test/upgrade/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,15 @@ export OUTPUT_TYPE="${OUTPUT_TYPE:-type=docker}"
export HUB_AGENT_IMAGE="${HUB_AGENT_IMAGE:-hub-agent}"
export MEMBER_AGENT_IMAGE="${MEMBER_AGENT_IMAGE:-member-agent}"
export REFRESH_TOKEN_IMAGE="${REFRESH_TOKEN_IMAGE:-refresh-token}"
export CRD_INSTALLER_IMAGE="${CRD_INSTALLER_IMAGE:-crd-installer}"

# Build the Fleet agent images.
echo "Building and the Fleet agent images..."

TAG=$IMAGE_TAG make docker-build-hub-agent
TAG=$IMAGE_TAG make docker-build-member-agent
TAG=$IMAGE_TAG make docker-build-refresh-token
TAG=$IMAGE_TAG make docker-build-crd-installer

# Create the kind clusters.
echo "Creating the kind clusters..."
Expand All @@ -51,11 +53,13 @@ done

# Load the hub agent image into the hub cluster.
kind load docker-image --name $HUB_CLUSTER $REGISTRY/$HUB_AGENT_IMAGE:$IMAGE_TAG
kind load docker-image --name $HUB_CLUSTER $REGISTRY/$CRD_INSTALLER_IMAGE:$IMAGE_TAG

# Load the member agent image and the refresh token image into the member clusters.
for i in "${MEMBER_CLUSTERS[@]}"
do
kind load docker-image --name "$i" $REGISTRY/$MEMBER_AGENT_IMAGE:$IMAGE_TAG
kind load docker-image --name "$i" $REGISTRY/$CRD_INSTALLER_IMAGE:$IMAGE_TAG
kind load docker-image --name "$i" $REGISTRY/$REFRESH_TOKEN_IMAGE:$IMAGE_TAG
done

Expand All @@ -67,6 +71,10 @@ helm install hub-agent charts/hub-agent/ \
--set image.pullPolicy=Never \
--set image.repository=$REGISTRY/$HUB_AGENT_IMAGE \
--set image.tag=$IMAGE_TAG \
--set crdInstaller.enabled=true \
--set crdInstaller.image.repository=$REGISTRY/$CRD_INSTALLER_IMAGE \
--set crdInstaller.image.tag=$IMAGE_TAG \
--set crdInstaller.image.pullPolicy=Never \
--set namespace=fleet-system \
--set logVerbosity=5 \
--set enableWebhook=false \
Expand Down Expand Up @@ -119,6 +127,10 @@ do
--set config.hubURL=$HUB_SERVER_URL \
--set image.repository=$REGISTRY/$MEMBER_AGENT_IMAGE \
--set image.tag=$IMAGE_TAG \
--set crdInstaller.enabled=true \
--set crdInstaller.image.repository=$REGISTRY/$CRD_INSTALLER_IMAGE \
--set crdInstaller.image.tag=$IMAGE_TAG \
--set crdInstaller.image.pullPolicy=Never \
--set refreshtoken.repository=$REGISTRY/$REFRESH_TOKEN_IMAGE \
--set refreshtoken.tag=$IMAGE_TAG \
--set image.pullPolicy=Never \
Expand Down
12 changes: 12 additions & 0 deletions test/upgrade/upgrade.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export OUTPUT_TYPE="${OUTPUT_TYPE:-type=docker}"
export HUB_AGENT_IMAGE="${HUB_AGENT_IMAGE:-hub-agent}"
export MEMBER_AGENT_IMAGE="${MEMBER_AGENT_IMAGE:-member-agent}"
export REFRESH_TOKEN_IMAGE="${REFRESH_TOKEN_IMAGE:-refresh-token}"
export CRD_INSTALLER_IMAGE="${CRD_INSTALLER_IMAGE:-crd-installer}"
export UPGRADE_HUB_SIDE="${UPGRADE_HUB_SIDE:-}"
export UPGRADE_MEMBER_SIDE="${UPGRADE_MEMBER_SIDE:-}"

Expand All @@ -33,16 +34,19 @@ echo "Building and the Fleet agent images..."
TAG=$IMAGE_TAG make docker-build-hub-agent
TAG=$IMAGE_TAG make docker-build-member-agent
TAG=$IMAGE_TAG make docker-build-refresh-token
TAG=$IMAGE_TAG make docker-build-crd-installer

# Load the Fleet agent images (for upgrading) into the kind clusters.

# Load the hub agent image into the hub cluster.
kind load docker-image --name $HUB_CLUSTER $REGISTRY/$HUB_AGENT_IMAGE:$IMAGE_TAG
kind load docker-image --name $HUB_CLUSTER $REGISTRY/$CRD_INSTALLER_IMAGE:$IMAGE_TAG

# Load the member agent image and the refresh token image into the member clusters.
for i in "${MEMBER_CLUSTERS[@]}"
do
kind load docker-image --name "$i" $REGISTRY/$MEMBER_AGENT_IMAGE:$IMAGE_TAG
kind load docker-image --name "$i" $REGISTRY/$CRD_INSTALLER_IMAGE:$IMAGE_TAG
kind load docker-image --name "$i" $REGISTRY/$REFRESH_TOKEN_IMAGE:$IMAGE_TAG
done

Expand All @@ -56,6 +60,10 @@ if [ -n "$UPGRADE_HUB_SIDE" ]; then
--set image.pullPolicy=Never \
--set image.repository=$REGISTRY/$HUB_AGENT_IMAGE \
--set image.tag=$IMAGE_TAG \
--set crdInstaller.enabled=true \
--set crdInstaller.image.repository=$REGISTRY/$CRD_INSTALLER_IMAGE \
--set crdInstaller.image.tag=$IMAGE_TAG \
--set crdInstaller.image.pullPolicy=Never \
--set namespace=fleet-system \
--set logVerbosity=5 \
--set enableWebhook=true \
Expand All @@ -81,6 +89,10 @@ if [ -n "$UPGRADE_MEMBER_SIDE" ]; then
--set config.hubURL=$HUB_SERVER_URL \
--set image.repository=$REGISTRY/$MEMBER_AGENT_IMAGE \
--set image.tag=$IMAGE_TAG \
--set crdInstaller.enabled=true \
--set crdInstaller.image.repository=$REGISTRY/$CRD_INSTALLER_IMAGE \
--set crdInstaller.image.tag=$IMAGE_TAG \
--set crdInstaller.image.pullPolicy=Never \
--set refreshtoken.repository=$REGISTRY/$REFRESH_TOKEN_IMAGE \
--set refreshtoken.tag=$IMAGE_TAG \
--set image.pullPolicy=Never \
Expand Down
Loading