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

Jump to bottom

chore: upgrade charts to Flux v2.0.0 (GA) #177

Merged
merged 8 commits into from
Jul 5, 2023
Merged

chore: upgrade charts to Flux v2.0.0 (GA) #177

merged 8 commits into from
Jul 5, 2023

Conversation

jimid27
Copy link
Contributor

@jimid27 jimid27 commented Jul 5, 2023

What this PR does / why we need it:

  • Upgrades the helm charts to use the GA Flux V2 release

Which issue this PR fixes

(optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged)

Special notes for your reviewer:

Checklist

  • DCO signed
  • Chart Version bumped
  • helm-docs are updated
  • Helm chart is tested
  • Update artifacthub.io/changes in Chart.yaml
  • Run make reviewable

@jimid27
upgrade charts to flux v2 ga
88edd7b 
Signed-off-by: Jimi Dodd-o <jimi@prefect.io>
@stefanprodan
Copy link
Member 

Kubernetes version v1.21.1 does not match >=1.24.0-0

We need to bump Kubernetes in e2e tests to kindest/node:v1.24.15. Can you please do that in

@jimid27
GHA updates & image version updates
7de29cc 
Signed-off-by: Jimi Dodd-o <jimi@prefect.io>
@jimid27
helm unittest
3bfced3 
Signed-off-by: Jimi Dodd-o <jimi@prefect.io>
@jimid27
make reviewable
fe26416 
Signed-off-by: Jimi Dodd-o <jimi@prefect.io>
@stefanprodan
Copy link
Member

Ok we need to replace:

      - name: Setup Kubernetes
        uses: engineerd/setup-kind@v0.5.0
        with:
          version: v0.11.1

With:

      - name: Setup Kubernetes
        uses: helm/kind-action@v1.4.0
        with:
          cluster_name: kind
          node_image: kindest/node:v1.24.15

@jimid27
Copy link
Contributor Author

jimid27 commented Jul 5, 2023 •
edited
Loading

with:
cluster_name: kind
node_image: kindest/node:v1.24.15

Per the README I believe we want to use image vs node_image for this action, right?

@jimid27
Copy link
Contributor Author

jimid27 commented Jul 5, 2023

Something else seems weird with the e2e sync 🤔 as we are creating a cluster named kind using k8s version 1.24.5 and yet it is still failing (https://github.com/fluxcd-community/helm-charts/actions/runs/5466764719/jobs/9952168866?pr=177#step:4:13)

@jimid27
try forcing the name
f63da7c 
Signed-off-by: Jimi Dodd-o <jimi@prefect.io>
@stefanprodan
Copy link
Member

@jimid27 we need to replace the engineerd/setup-kind@v0.5.0 which is deprecated with helm/kind-action@v1.4.0 like so:

      - name: Setup Kubernetes
        uses: helm/kind-action@v1.4.0
        with:
          cluster_name: kind
          node_image: kindest/node:v1.24.15

@jimid27
Copy link
Contributor Author

jimid27 commented Jul 5, 2023

@jimid27 we need to replace the engineerd/setup-kind@v0.5.0 which is deprecated with helm/kind-action@v1.4.0 like so:

      - name: Setup Kubernetes
        uses: helm/kind-action@v1.4.0
        with:
          cluster_name: kind
          node_image: kindest/node:v1.24.15

omg my bad I misread your previous post. Change incoming

@jimid27
e2e sync using helm/kind-action
a6de567 
Signed-off-by: Jimi Dodd-o <jimi@prefect.io>
@stefanprodan
Copy link
Member

Works now GG! can you please squash the last 4 commits.

@jimid27
helm unittest
3674f11 
Signed-off-by: Jimi Dodd-o <jimi@prefect.io>

make reviewable

Signed-off-by: Jimi Dodd-o <jimi@prefect.io>

try forcing the name

Signed-off-by: Jimi Dodd-o <jimi@prefect.io>

e2e sync using helm/kind-action

Signed-off-by: Jimi Dodd-o <jimi@prefect.io>
@jimid27
Merge branch 'chore/flux2.0-release' of github.com:jimid27/fluxcd-2.0…
3e5a393 
…-helm into chore/flux2.0-release
@jimid27
Copy link
Contributor Author

jimid27 commented Jul 5, 2023

Works now GG! can you please squash the last 4 commits.

should be squashed lmk if theres anything else needed here (or if I messed the squash up 😄 )

@stefanprodan
Copy link
Member

Eh the squash didn't work, I can do it at merge time into a single commit.

@stefanprodan stefanprodan changed the title chore: upgrade charts to flux v2 ga chore: upgrade charts to Flux v2.0.0 (GA) Jul 5, 2023
stefanprodan
stefanprodan approved these changes Jul 5, 2023
View reviewed changes
Copy link
Member

@stefanprodan stefanprodan left a comment

Choose a reason for hiding this comment

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

LGTM

Thanks @jimid27 🏅

@stefanprodan stefanprodan merged commit 7df8107 into fluxcd-community:main Jul 5, 2023
dirien pushed a commit to dirien/helm-charts-flux that referenced this pull request Oct 10, 2023
@jimid27 @dirien
chore: upgrade charts to Flux v2.0.0 (GA) (fluxcd-community#177)
550c6ab 
Upgrade charts to Flux v2.0.0 (GA)

Signed-off-by: Jimi Dodd-o <jimi@prefect.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stefanprodan stefanprodan stefanprodan approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jimid27 @stefanprodan