Implemented the unmanaged cluster CRD for adopting existing k8s clusters #623
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kylewuolle
requested review from
Kshatrix,
squizzi,
eromanova and
a13x5
as code owners
Kshatrix
requested changes
Nov 12, 2024
| kind: ClusterRole | ||
| metadata: | ||
| labels: | ||
| hmc.mirantis.com/aggregate-to-global-admin: "true" |
There was a problem hiding this comment.
I think rbac considerations should be similar to managedclusters, unless it was decided otherwise
a13x5
requested changes
Nov 12, 2024
kylewuolle
force-pushed
the
unmanaged-cluster
branch
from
d20e204 to
c689cd1
Compare
kylewuolle
force-pushed
the
unmanaged-cluster
branch
from
06ec211 to
56bd578
Compare
eromanova
reviewed
Dec 19, 2024
There was a problem hiding this comment.
Minor comments from my side. @kylewuolle could you please address unresolved comments from Andrey, rebase the PR, and resolve all the conflicts?
| // +kubebuilder:default:=false | ||
| Ready bool `json:"ready"` | ||
|
|
||
| // Conditions contains details for the current state of the ManagedCluster. |
There was a problem hiding this comment.
Suggested change
| // Conditions contains details for the current state of the ManagedCluster. | |
| // Conditions contains details for the current state of the UnmanagedCluster. |
| // Flag indicating whether the machine is in the ready state or not | ||
| // +kubebuilder:default:=false | ||
| Ready bool `json:"ready,omitempty"` | ||
| // Conditions contains details for the current state of the ManagedCluster |
There was a problem hiding this comment.
Suggested change
| // Conditions contains details for the current state of the ManagedCluster | |
| // Conditions contains details for the current state of the UnmanagedCluster |
| Name: unmanagedCluster.Name, | ||
| Namespace: unmanagedCluster.Namespace, | ||
| Labels: map[string]string{ | ||
| "helm.toolkit.fluxcd.io/name": unmanagedCluster.Name, |
There was a problem hiding this comment.
Can be replaced with hmc.FluxHelmChartNameKey
| Namespace: unmanagedCluster.Namespace, | ||
| Labels: map[string]string{ | ||
| "helm.toolkit.fluxcd.io/name": unmanagedCluster.Name, | ||
| "helm.toolkit.fluxcd.io/namespace": unmanagedCluster.Namespace, |
There was a problem hiding this comment.
Suggested change
| "helm.toolkit.fluxcd.io/namespace": unmanagedCluster.Namespace, | |
| hmc.FluxHelmChartNamespaceKey: unmanagedCluster.Namespace, |
| return nil, nil | ||
| } | ||
|
|
||
| kubecfgSeccret := &corev1.Secret{} |
There was a problem hiding this comment.
Suggested change
| kubecfgSeccret := &corev1.Secret{} | |
| kubecfgSecret := &corev1.Secret{} |
| "with key %s", kubecfgSeccret.Name, secret.KubeconfigDataName)) | ||
| } | ||
|
|
||
| if cluserNameLabel, ok := kubecfgSeccret.Labels[v1beta1.ClusterNameLabel]; !ok || cluserNameLabel != unmanagedCluster.Name { |
There was a problem hiding this comment.
Suggested change
| if cluserNameLabel, ok := kubecfgSeccret.Labels[v1beta1.ClusterNameLabel]; !ok || cluserNameLabel != unmanagedCluster.Name { | |
| if clusterNameLabel, ok := kubecfgSeccret.Labels[v1beta1.ClusterNameLabel]; !ok || cluserNameLabel != unmanagedCluster.Name { |
| Spec: v1beta1.ClusterSpec{ | ||
| ControlPlaneEndpoint: controlPlaneEndPoint, | ||
| InfrastructureRef: &corev1.ObjectReference{ | ||
| Kind: "UnmanagedCluster", |
There was a problem hiding this comment.
Suggested change
| Kind: "UnmanagedCluster", | |
| Kind: hmc.UnmanagedClusterKind, |
| OwnerReferences: []metav1.OwnerReference{ | ||
| { | ||
| APIVersion: hmc.GroupVersion.Identifier(), | ||
| Kind: "UnmanagedMachine", |
There was a problem hiding this comment.
Suggested change
| Kind: "UnmanagedMachine", | |
| Kind: hmc.UnmanagedMachineKind, |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #542
This PR implements adopting existing k8s clusters into 2a.