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.

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

Release rancher-turtles 0.2.0+up0.11.0 #150

Merged
merged 7 commits into from
Sep 4, 2024
Merged

Conversation

hardys
Copy link
Contributor

@hardys hardys commented Sep 2, 2024

This rebases to the latest 0.11.0 turtles release, and also rebases the versions of Core CAPI, CAPM3 and the RKE2 provider.

Note that to enable this to install reliably via EIB we currently need a workaround for rancher/turtles#627 until a version with rancher/turtles#705 is released, passing a values file like this should work:

rancherTurtles:
  features:
    embedded-capi:
      disabled: false

It's then also necessary to pass a manifest as follows since the chart pre-install hook is no longer taking care of this.

apiVersion: management.cattle.io/v3
kind: Feature
metadata:
  name: embedded-cluster-api
spec:
  value: false

@hardys hardys requested a review from alknopfler September 2, 2024 17:19
Copy link
Contributor

@alknopfler alknopfler left a comment

Choose a reason for hiding this comment

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

LGTM

@hardys hardys marked this pull request as draft September 3, 2024 07:36
@hardys
Copy link
Contributor Author

hardys commented Sep 3, 2024

Setting this back to draft as @Danil-Grigorev pointed out that the repository override we used via clusterctl isn't working via the CAPI operator:

> kubectl get deployment -n capi-system -o yaml | grep image
          image: registry.k8s.io/cluster-api/cluster-api-controller:v1.7.5
          imagePullPolicy: IfNotPresent
> kubectl get deployment -n rke2-bootstrap-system -o yaml | grep image
          image: ghcr.io/rancher/cluster-api-provider-rke2-bootstrap:v0.6.1
          imagePullPolicy: IfNotPresent

I will try to find a different approach via the providers section

@Danil-Grigorev
Copy link

Danil-Grigorev commented Sep 3, 2024

The scenario with repository images overrides via clusterctl.yaml will be working once kubernetes-sigs/cluster-api-operator#598 is merged and released. cc @alexander-demicev

The current clusterctl override is not working ref this fix:
kubernetes-sigs/cluster-api-operator#598
@hardys hardys force-pushed the turtles_rebase branch 2 times, most recently from ad12f48 to 2132d0b Compare September 3, 2024 17:29
Also include a variable and configuration to override the ipam controller image
@hardys hardys marked this pull request as ready for review September 3, 2024 18:45
@hardys
Copy link
Contributor Author

hardys commented Sep 3, 2024

Ok this is now working with all images overridden to the OBS ones:

> for ns in capi-system capm3-system rke2-bootstrap-system rke2-control-plane-system; do kubectl get deployment -n $ns -o yaml | grep "image:"; done
          image: registry.opensuse.org/isv/suse/edge/clusterapi/containers/images/cluster-api-controller:1.7.5
          image: registry.opensuse.org/isv/suse/edge/clusterapi/containers/images/cluster-api-provider-metal3:1.7.1
          image: registry.opensuse.org/isv/suse/edge/clusterapi/containers/images/ip-address-manager:1.7.1
          image: registry.opensuse.org/isv/suse/edge/clusterapi/containers/images/cluster-api-provider-rke2-bootstrap:0.6.1
          image: registry.opensuse.org/isv/suse/edge/clusterapi/containers/images/cluster-api-provider-rke2-controlplane:0.6.1

@alknopfler and @Danil-Grigorev please could you take another look and check if you're happy with this revision? Thanks!

Copy link

@Danil-Grigorev Danil-Grigorev left a comment

Choose a reason for hiding this comment

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

This looks good to me, just a comment - the original issue should be fixed and we are planning to release it soon.

- condition: cluster-api-operator.enabled
name: cluster-api-operator
repository: file://./charts/cluster-api-operator
version: 0.12.0

Choose a reason for hiding this comment

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

We have released operator version with the fix for images section of clusterctl.yaml, so it can be used as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks a lot for working on that - we can pick up that in our next rebase which should simplify the configuration 👍

@hardys hardys merged commit 7a4b7e2 into suse-edge:main Sep 4, 2024
1 check passed
hardys added a commit to hardys/atip that referenced this pull request Sep 4, 2024
Continuation of the work discussed via suse-edge#6

Depends on suse-edge/charts#150
hardys added a commit to hardys/suse-edge.github.io that referenced this pull request Sep 11, 2024
This aligns with the recently added suse-edge charts which enable
management of CAPI dependencies via Rancher Turtles

Depends On:
suse-edge/charts#150 (merged)
suse-edge/charts#154
hardys added a commit to hardys/atip that referenced this pull request Oct 2, 2024
Continuation of the work discussed via suse-edge#6

Depends on suse-edge/charts#150
hardys added a commit to suse-edge/atip that referenced this pull request Oct 3, 2024
Continuation of the work discussed via #6

Depends on suse-edge/charts#150
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.

3 participants