From e5c20ca50aa7a098db5f5886c8d90a9a53468710 Mon Sep 17 00:00:00 2001 From: Pat Christopher Date: Tue, 27 Oct 2020 18:38:05 -0700 Subject: [PATCH] use current method signatures --- cluster/addons/fluentd-elasticsearch/es-image/Dockerfile | 2 +- .../es-image/elasticsearch_logging_discovery.go | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile b/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile index bdda4f73d94..5180f3febfd 100644 --- a/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile +++ b/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.12.0 AS builder +FROM golang:1.15.3 AS builder COPY elasticsearch_logging_discovery.go go.mod go.sum / RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -a -ldflags "-w" -o /elasticsearch_logging_discovery /elasticsearch_logging_discovery.go diff --git a/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go b/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go index 909bc4c652c..f7c19fbe3ef 100644 --- a/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go +++ b/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go @@ -17,7 +17,6 @@ limitations under the License. package main import ( - "context" "flag" "fmt" "net" @@ -103,7 +102,7 @@ func main() { namespace := metav1.NamespaceSystem envNamespace := os.Getenv("NAMESPACE") if envNamespace != "" { - if _, err := client.CoreV1().Namespaces().Get(context.TODO(), envNamespace, metav1.GetOptions{}); err != nil { + if _, err := client.CoreV1().Namespaces().Get(envNamespace, metav1.GetOptions{}); err != nil { klog.Fatalf("%s namespace doesn't exist: %v", envNamespace, err) } namespace = envNamespace @@ -118,7 +117,7 @@ func main() { // Look for endpoints associated with the Elasticsearch logging service. // First wait for the service to become available. for t := time.Now(); time.Since(t) < 5*time.Minute; time.Sleep(10 * time.Second) { - elasticsearch, err = client.CoreV1().Services(namespace).Get(context.TODO(), serviceName, metav1.GetOptions{}) + elasticsearch, err = client.CoreV1().Services(namespace).Get(serviceName, metav1.GetOptions{}) if err == nil { break } @@ -135,7 +134,7 @@ func main() { // Wait for some endpoints. count, _ := strconv.Atoi(os.Getenv("MINIMUM_MASTER_NODES")) for t := time.Now(); time.Since(t) < 5*time.Minute; time.Sleep(10 * time.Second) { - endpoints, err = client.CoreV1().Endpoints(namespace).Get(context.TODO(), serviceName, metav1.GetOptions{}) + endpoints, err = client.CoreV1().Endpoints(namespace).Get(serviceName, metav1.GetOptions{}) if err != nil { continue }