Skip to content

upgrade flux v2 dependencies take 4#3889

Merged
chanwit merged 5 commits intomainfrom
flux-v2-take-4-cr-14
Jul 28, 2023
Merged

upgrade flux v2 dependencies take 4#3889
chanwit merged 5 commits intomainfrom
flux-v2-take-4-cr-14

Conversation

@chanwit
Copy link
Copy Markdown
Member

@chanwit chanwit commented Jul 26, 2023

Fixes #3878

See the counter part #3880 which uses controller runtime v0.15

Notable differences:

// Replace k8s.io packages v0.26 to downgrade controller-runtime to v0.14.6
replace (
	k8s.io/api => k8s.io/api v0.26.3
	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.3
	k8s.io/apimachinery => k8s.io/apimachinery v0.26.3
	k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.3
	k8s.io/client-go => k8s.io/client-go v0.26.3

	sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.14.6
)

@chanwit chanwit changed the title update flux v2 dependencies take 4 upgrade flux v2 dependencies take 4 Jul 26, 2023
@chanwit chanwit force-pushed the flux-v2-take-4-cr-14 branch from 4095c77 to f43053d Compare July 26, 2023 13:02
@chanwit chanwit force-pushed the flux-v2-take-4-cr-14 branch 2 times, most recently from f67457f to 1f07b53 Compare July 27, 2023 12:04
@chanwit chanwit requested a review from enekofb July 27, 2023 12:06
@chanwit chanwit force-pushed the flux-v2-take-4-cr-14 branch from 1f07b53 to 41f829c Compare July 27, 2023 12:11
Chanwit Kaewkasi added 2 commits July 27, 2023 19:27
Signed-off-by: Chanwit Kaewkasi <chanwit@weave.works>
Signed-off-by: Chanwit Kaewkasi <chanwit@weave.works>
@chanwit chanwit force-pushed the flux-v2-take-4-cr-14 branch from 41f829c to 3d62723 Compare July 27, 2023 12:27
Copy link
Copy Markdown
Contributor

@enekofb enekofb left a comment

Choose a reason for hiding this comment

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

fantastic work.

some follow up topics before approving:

  • verify gitops run
  • understand experience for not v2 users (using with flux v0.4x) -> done here
  • verify cli

and a couple of follow-up tickets

Comment thread core/clustersmngr/cluster/delegating_cache.go Outdated
Comment thread go.mod Outdated
Comment thread go.mod
Comment thread pkg/kube/kubehttp.go
Comment thread core/server/primarykinds.go
@enekofb
Copy link
Copy Markdown
Contributor

enekofb commented Jul 28, 2023

Understand Breaking Change - experience for not v2 users (using with flux v0.4x)

To document what they will see

Given wego with flux v0.41.2

Screenshot 2023-07-28 at 09 36 31

I could see errors for Sources for not finding v1/GitRepository

Screenshot 2023-07-28 at 09 37 21

I could see errors for Sources for not finding v1/Kustomizations

Screenshot 2023-07-28 at 09 37 56

@enekofb enekofb added the breaking-change Use on PRs that ship breaking changes from a user's perspective label Jul 28, 2023
Chanwit Kaewkasi and others added 2 commits July 28, 2023 17:58
Co-authored-by: Eneko Fernández <12957664+enekofb@users.noreply.github.com>
Signed-off-by: Chanwit Kaewkasi <chanwit@weave.works>
@chanwit chanwit force-pushed the flux-v2-take-4-cr-14 branch from 6a9f996 to c313cdc Compare July 28, 2023 12:37
Signed-off-by: Chanwit Kaewkasi <chanwit@weave.works>
@chanwit chanwit force-pushed the flux-v2-take-4-cr-14 branch from c313cdc to 52eefe8 Compare July 28, 2023 12:55
@chanwit chanwit requested a review from enekofb July 28, 2023 13:21
@enekofb
Copy link
Copy Markdown
Contributor

enekofb commented Jul 28, 2023

🟢 quick test cli works in PR

➜  weave-gitops git:(flux-v2-take-4-cr-14) ./bin/gitops create dashboard gitops --password=BDASDFASDF                                
✚ Generating GitOps Dashboard manifests ...
► Creating GitOps Dashboard objects ...
✚ Generating GitOps Dashboard manifests ...
✔ Generated GitOps Dashboard manifests
► Checking for a cluster in the kube config ...
► Checking if Flux is already installed ...
► Getting Flux version ...
✔ Flux v2.0.0 is already installed on the flux-system namespace.
► Applying GitOps Dashboard manifests
► Installing the GitOps Dashboard ...
✔ GitOps Dashboard has been installed
► Request reconciliation of dashboard (timeout 3m0s) ...
◎ Waiting for GitOps Dashboard reconciliation
✔ GitOps Dashboard gitops is ready
✔ Installed GitOps Dashboard

➜  weave-gitops git:(flux-v2-take-4-cr-14) ./bin/gitops check                                                                 <aws:sts>
✔ Kubernetes 1.24.0 >=1.20.6-0


Use "gitops remove [command] --help" for more information about a command.
➜  weave-gitops git:(flux-v2-take-4-cr-14) ./bin/gitops get config                                                            <aws:sts>
✔ Your CLI configuration for Weave GitOps:
{
  "analytics": true,
  "userId": "a5OoZqPd+p"
}

@chanwit
Copy link
Copy Markdown
Member Author

chanwit commented Jul 28, 2023

gitops run confirmed to work
image

Copy link
Copy Markdown
Contributor

@enekofb enekofb left a comment

Choose a reason for hiding this comment

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

🚀

@chanwit chanwit merged commit 6d3e04b into main Jul 28, 2023
@chanwit chanwit deleted the flux-v2-take-4-cr-14 branch July 28, 2023 14:01
@chanwit chanwit added the type/enhancement New feature or request label Jul 31, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

breaking-change Use on PRs that ship breaking changes from a user's perspective type/enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Upgrade Flux v2 dependencies - Take 3

2 participants