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.

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

Fix wrong method to get tikv configmap in mutation webhook #1871

Merged
merged 5 commits into from
Mar 6, 2020
Merged

Fix wrong method to get tikv configmap in mutation webhook #1871

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
07726e5
fix cmName
Mar 5, 2020
d3f4d91
Update pod_mutater.go
Mar 5, 2020
82fdc08
Update pod_mutater.go
Mar 5, 2020
483818a
Update pkg/webhook/pod/pod_mutater.go
Yisaer Mar 5, 2020
8732ae5
Merge branch 'master' into fix_cm_name_in_webhook
sre-bot Mar 6, 2020
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
21 changes: 17 additions & 4 deletions pkg/webhook/pod/pod_mutater.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"fmt"
"github.com/BurntSushi/toml"
"github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1"
"github.com/pingcap/tidb-operator/pkg/controller"
"github.com/pingcap/tidb-operator/pkg/features"
"github.com/pingcap/tidb-operator/pkg/label"
operatorUtils "github.com/pingcap/tidb-operator/pkg/util"
Expand Down Expand Up @@ -82,10 +81,9 @@ func (pc *PodAdmissionControl) tikvHotRegionSchedule(tc *v1alpha1.TidbCluster, p
return nil
}

cmName := controller.TiKVMemberName(tc.Name)
cm, err := pc.kubeCli.CoreV1().ConfigMaps(tc.Namespace).Get(cmName, metav1.GetOptions{})
cm, err := pc.getTikvConfigMap(tc, pod)
if err != nil {
klog.Infof("cm[%s/%s] found error,err %v", tc.Namespace, cmName, err)
klog.Infof("tc[%s/%s]'s tikv %s configmap not found, error: %v", tc.Namespace, tc.Name, pod.Name, err)
return err
}
v, ok := cm.Data["config-file"]
Expand Down Expand Up @@ -114,3 +112,18 @@ func (pc *PodAdmissionControl) tikvHotRegionSchedule(tc *v1alpha1.TidbCluster, p
}
return nil
}

// Get tikv original configmap from the pod spec template volume
func (pc *PodAdmissionControl) getTikvConfigMap(tc *v1alpha1.TidbCluster, pod *corev1.Pod) (*corev1.ConfigMap, error) {
cnName := ""
for _, v := range pod.Spec.Volumes {
if (v.Name == "config" || v.Name == "startup-script") && v.ConfigMap != nil {
cnName = v.ConfigMap.Name
break
}
}
if cnName == "" {
return nil, fmt.Errorf("tc[%s/%s] 's tikv configmap can't find", tc.Namespace, tc.Name)
}
return pc.kubeCli.CoreV1().ConfigMaps(tc.Namespace).Get(cnName, metav1.GetOptions{})
}