Skip to content
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

add Kustomize 5.2.1 in Kind GHA testing #43

Merged
merged 4 commits into from
Mar 25, 2024
Merged

add Kustomize 5.2.1 in Kind GHA testing #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
471563b
add Kustomize 5.2.1 in Kind GHA testing
tarilabs Mar 18, 2024
1235c35
fix GHA syntax for dependent env
tarilabs Mar 18, 2024
4266ba8
use kustomize install binary instead of dedicated GHA step
tarilabs Mar 18, 2024
a664ac1
kustomize seems installed by default in GHA
tarilabs Mar 18, 2024
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
3 changes: 2 additions & 1 deletion .github/workflows/build-and-push-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ on:
env:
IMG_ORG: kubeflow
IMG_REPO: model-registry
IMG: ${{ env.IMG_ORG }}/${{ env.IMG_REPO }}
DOCKER_USER: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKER_PWD: ${{ secrets.DOCKERHUB_TOKEN }}
PUSH_IMAGE: true
Expand Down Expand Up @@ -51,6 +50,7 @@ jobs:
if: env.BUILD_CONTEXT == 'main'
shell: bash
env:
IMG: ${{ env.IMG_ORG }}/${{ env.IMG_REPO }}
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm probably missing something, but what's the reason for moving the IMG env variable?

Copy link
Member Author

Choose a reason for hiding this comment

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

env at the top level of GHA cannot depend on one-another :(

so this was the original strategy by @lampajr and I'm just putting it back in place

Copy link
Member

Choose a reason for hiding this comment

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

env at the top level of GHA cannot depend on one-anothe

+1 you cannot define top-level env variables from other ones, that's is only possible at step level

BUILD_IMAGE: false # image is already built in "Build and Push Image" step
run: |
docker tag ${{ env.IMG }}:$VERSION ${{ env.IMG }}:latest
Expand All @@ -60,6 +60,7 @@ jobs:
if: env.BUILD_CONTEXT == 'main'
shell: bash
env:
IMG: ${{ env.IMG_ORG }}/${{ env.IMG_REPO }}
BUILD_IMAGE: false # image is already built in "Build and Push Image" step
run: |
docker tag ${{ env.IMG }}:$VERSION ${{ env.IMG }}:main
Expand Down
13 changes: 9 additions & 4 deletions .github/workflows/build-image-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ on:
env:
IMG_ORG: kubeflow
IMG_REPO: model-registry
IMG: ${{ env.IMG_ORG }}/${{ env.IMG_REPO }}
PUSH_IMAGE: false
BRANCH: ${{ github.base_ref }}
jobs:
Expand All @@ -37,18 +36,24 @@ jobs:
uses: helm/[email protected]
- name: Load Local Registry Test Image
env:
IMG: "${{ env.IMG }}:${{ steps.tags.outputs.tag }}"
IMG: "${{ env.IMG_ORG }}/${{ env.IMG_REPO }}:${{ steps.tags.outputs.tag }}"
run: |
kind load docker-image -n chart-testing ${IMG}
- name: Create Test Registry
env:
IMG: "${{ env.IMG }}:${{ steps.tags.outputs.tag }}"
IMG: "${{ env.IMG_ORG }}/${{ env.IMG_REPO }}:${{ steps.tags.outputs.tag }}"
run: |
echo "Download kustomize 5.2.1"
mkdir $GITHUB_WORKSPACE/kustomize
curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | bash -s "5.2.1" "$GITHUB_WORKSPACE/kustomize"
Copy link
Contributor

Choose a reason for hiding this comment

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

Same question as other PR. Can we try to avoid using curl | bash?

Copy link
Member Author

Choose a reason for hiding this comment

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

I tried first an alternative with

471563b#diff-ee244f6eeb2d7ac8c604cdc91588b49204dea5594df11b20af816ad9f4b54467R36-R39

that is using a dedicated GHA to download kustomize, but the performance was horrible due to the fact the GHA action step does much more we don't currently need.

So at this time, this seems the most vanilla and default way to override for a specific version of kustomize that what bundled in GHA automatically

Copy link
Member Author

Choose a reason for hiding this comment

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

btw, by "vanilla and default way" I mean what indicated by the manual, here: https://kubectl.docs.kubernetes.io/installation/kustomize/binaries/

PATH=$GITHUB_WORKSPACE/kustomize:$PATH
echo "Display Kustomize version"
kustomize version
echo "Deploying Model Registry using Manifests; branch ${BRANCH}"
kubectl create namespace kubeflow
cd manifests/kustomize/overlays/db
kustomize edit set image kubeflow/model-registry:latest $IMG
kubectl apply -k .
kustomize build | kubectl apply -f -
- name: Wait for Test Registry Deployment
run: |
kubectl wait --for=condition=available -n kubeflow deployment/model-registry-db --timeout=5m
Expand Down
Loading