admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix router annotations

Browse Source
This commit is contained in:
Jeff
2019-11-09 15:39:40 +08:00
committed by zryfish
parent b6f65272c8
commit 2c94cfddf1
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/models/kubectl/kubectl.go
View File

@@ -99,7 +99,6 @@ func selectCorrectPod(namespace string, pods []v1.Pod) (kubectlPod v1.Pod, err e
func CreateKubectlDeploy(username string) error { func CreateKubectlDeploy(username string) error {
k8sClient := client.ClientSets().K8s().Kubernetes() k8sClient := client.ClientSets().K8s().Kubernetes()
deployName := fmt.Sprintf("kubectl-%s", username) deployName := fmt.Sprintf("kubectl-%s", username)
configName := fmt.Sprintf("kubeconfig-%s", username)
_, err := k8sClient.AppsV1().Deployments(namespace).Get(deployName, metav1.GetOptions{}) _, err := k8sClient.AppsV1().Deployments(namespace).Get(deployName, metav1.GetOptions{})
if err == nil { if err == nil {
return nil return nil
@@ -107,7 +106,6 @@ func CreateKubectlDeploy(username string) error {
replica := int32(1) replica := int32(1)
selector := metav1.LabelSelector{MatchLabels: map[string]string{"username": username}} selector := metav1.LabelSelector{MatchLabels: map[string]string{"username": username}}
config := v1.ConfigMapVolumeSource{Items: []v1.KeyToPath{{Key: "config", Path: "config"}}, LocalObjectReference: v1.LocalObjectReference{Name: configName}}
deployment := appsv1.Deployment{ deployment := appsv1.Deployment{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: deployName, Name: deployName,
@@ -124,11 +122,10 @@ func CreateKubectlDeploy(username string) error {
Spec: v1.PodSpec{ Spec: v1.PodSpec{
Containers: []v1.Container{ Containers: []v1.Container{
{Name: "kubectl", {Name: "kubectl",
Image: DefaultImage, Image: DefaultImage,
VolumeMounts: []v1.VolumeMount{{Name: "kubeconfig", MountPath: "/root/.kube"}},
}, },
}, },
Volumes: []v1.Volume{{Name: "kubeconfig", VolumeSource: v1.VolumeSource{ConfigMap: &config}}}, ServiceAccountName: "kubesphere-cluster-admin",
}, },
}, },
}, },

8
pkg/models/routers/routers.go
View File

@@ -287,13 +287,7 @@ func updateRouterService(namespace string, routerType corev1.ServiceType, annota
service.Spec.Type = routerType service.Spec.Type = routerType
originalAnnotations := service.GetAnnotations() service.SetAnnotations(annotations)
for key, val := range annotations {
originalAnnotations[key] = val
}
service.SetAnnotations(originalAnnotations)
service, err = k8sClient.CoreV1().Services(constants.IngressControllerNamespace).Update(service) service, err = k8sClient.CoreV1().Services(constants.IngressControllerNamespace).Update(service)