Skip to content

Rename kubeconfig for target cluster #39

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

Merged
openshift-merge-robot merged 1 commit into from
Feb 16, 2021
Merged

Rename kubeconfig for target cluster #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1027,7 +1027,7 @@ func generateKubeadminPasswordSecret(namespace, password string) *corev1.Secret
func generateKubeconfigSecret(name, namespace string, kubeconfigBytes []byte) (*corev1.Secret, error) {
secret := &corev1.Secret{}
secret.Namespace = namespace
secret.Name = "admin-kubeconfig"
secret.Name = fmt.Sprintf("%v-kubeconfig", name)
secret.Data = map[string][]byte{"value": kubeconfigBytes}
return secret, nil
}
Expand Down
3 changes: 3 additions & 0 deletions hypershift-operator/controllers/hostedcluster/hostedcluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,9 @@ func (r *HostedClusterReconciler) Reconcile(ctx context.Context, req ctrl.Reques
Namespace: targetNamespace,
ServiceAccount: autoScalerServiceAccount,
Image: "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.20.0",
//The client used by CAPI machine controller expects the kubeconfig to follow this naming convention
//https://github.com/kubernetes-sigs/cluster-api/blob/5c85a0a01ee44ecf7c8a3c3fdc867a88af87d73c/util/secret/secret.go#L29-L33
TargetClusterKubeconfigSecretName: fmt.Sprintf("%s-kubeconfig", capiCluster.GetName()),
}.Build()
autoScalerObjects := []ctrlclient.Object{
autoScalerRole,
Expand Down
9 changes: 5 additions & 4 deletions hypershift-operator/controllers/hostedcluster/manifests/autoscaler/manifests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ import (
)

type Deployment struct {
Namespace *corev1.Namespace
ServiceAccount *corev1.ServiceAccount
Image string
Namespace *corev1.Namespace
ServiceAccount *corev1.ServiceAccount
Image string
TargetClusterKubeconfigSecretName string
}

func (o Deployment) Build() *appsv1.Deployment {
Expand Down Expand Up @@ -52,7 +53,7 @@ func (o Deployment) Build() *appsv1.Deployment {
VolumeSource: corev1.VolumeSource{
Secret: &corev1.SecretVolumeSource{
// TODO: this should come from HCP status
SecretName: "admin-kubeconfig",
SecretName: o.TargetClusterKubeconfigSecretName,
Items: []corev1.KeyToPath{
{
// TODO: this should come from HCP status
Expand Down
3 changes: 2 additions & 1 deletion test/e2e/quick_start_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package e2e

import (
"context"
"fmt"
"io/ioutil"
"time"

Expand Down Expand Up @@ -132,7 +133,7 @@ func QuickStartSpec(ctx context.Context, inputGetter func() QuickStartSpecInput)
key := ctrl.ObjectKey{
// TODO: This resource needs extracted into a library function
Namespace: example.Cluster.GetName(),
Name: "admin-kubeconfig",
Name: fmt.Sprintf("%s-kubeconfig", example.Cluster.GetName()),
}
if err := input.Client.Get(ctx, key, guestKubeConfigSecret); err != nil {
return false
Expand Down