diff --git a/Dockerfile b/Dockerfile index 3866c9e..f74f619 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ WORKDIR /go/src/github.com/wish/kcd RUN export GO111MODULE=on && GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o /go/bin/kcd #Actual Image -FROM alpine:3.13.0 +FROM alpine:3.13 VOLUME /go/src diff --git a/service/controller.go b/service/controller.go index 1c1234b..c21377e 100644 --- a/service/controller.go +++ b/service/controller.go @@ -396,6 +396,10 @@ func (c *CVController) newKCDSyncDeployment(kcd *kcd1.KCD, version string) *apps // for new stage env, it should be node.wish.com/instancegroup from environment variable NODE_SELECTOR nodeSelector := getEnv("NODE_SELECTOR", "kops.k8s.io/instancegroup") glog.V(1).Info("Getting node selector label=%s", nodeSelector) + + // default value: kcd + nodeSelectorValue := getEnv("NODE_SELECTOR_VALUE", "kcd") + glog.V(1).Info("Getting node selector value=%s", nodeSelectorValue) return &appsv1.Deployment{ ObjectMeta: metav1.ObjectMeta{ @@ -457,6 +461,10 @@ func (c *CVController) newKCDSyncDeployment(kcd *kcd1.KCD, version string) *apps Name: "NODE_SELECTOR", Value: nodeSelector, }, + { + Name: "NODE_SELECTOR_VALUE", + Value: nodeSelectorValue, + }, }, LivenessProbe: &corev1.Probe{ PeriodSeconds: int32(livenessSeconds), @@ -478,7 +486,7 @@ func (c *CVController) newKCDSyncDeployment(kcd *kcd1.KCD, version string) *apps }, }, NodeSelector: map[string]string{ - nodeSelector: "kcd", + nodeSelector: nodeSelectorValue, }, }, },