From 6b77f4c11eca01440d26adc4c6677d4eba18a317 Mon Sep 17 00:00:00 2001 From: Michal Schott Date: Mon, 5 Aug 2019 16:57:57 +0200 Subject: [PATCH] Removing custom transport options to make it work with kubernetes 1.12. Use defaultTaintNodeNotReadyName if not-ready-taint-name parameter is not specified. Build container from scratch. aws sdk update --- Dockerfile | 4 +- Gopkg.lock | 144 ++++++++++++++++++++++++++++++++++++++++++++--------- Gopkg.toml | 2 +- main.go | 5 +- 4 files changed, 126 insertions(+), 29 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9a3b9c9..53d3350 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,5 @@ -FROM registry.opensource.zalan.do/stups/alpine:latest -MAINTAINER Team Teapot @ Zalando SE +FROM scratch -# add binary ADD build/linux/kube-node-ready-controller / ENTRYPOINT ["/kube-node-ready-controller"] diff --git a/Gopkg.lock b/Gopkg.lock index 8650497..8e964b2 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -3,20 +3,25 @@ [[projects]] branch = "master" + digest = "1:315c5f2f60c76d89b871c73f9bd5fe689cad96597afd50fb9992228ef80bdd34" name = "github.com/alecthomas/template" packages = [ ".", - "parse" + "parse", ] + pruneopts = "UT" revision = "a0175ee3bccc567396460bf5acd36800cb10c49c" [[projects]] branch = "master" + digest = "1:c198fdc381e898e8fb62b8eb62758195091c313ad18e52a3067366e1dda2fb3c" name = "github.com/alecthomas/units" packages = ["."] + pruneopts = "UT" revision = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a" [[projects]] + digest = "1:38dd027e5ebcbb8821d1d1596e7badda8d67b0f29c8ebed5b3fbe563c1637227" name = "github.com/aws/aws-sdk-go" packages = [ "aws", @@ -28,18 +33,23 @@ "aws/credentials", "aws/credentials/ec2rolecreds", "aws/credentials/endpointcreds", + "aws/credentials/processcreds", "aws/credentials/stscreds", + "aws/csm", "aws/defaults", "aws/ec2metadata", "aws/endpoints", "aws/request", "aws/session", "aws/signer/v4", + "internal/ini", "internal/sdkio", "internal/sdkrand", + "internal/sdkuri", "internal/shareddefaults", "private/protocol", "private/protocol/ec2query", + "private/protocol/json/jsonutil", "private/protocol/query", "private/protocol/query/queryutil", "private/protocol/rest", @@ -48,183 +58,232 @@ "service/autoscaling/autoscalingiface", "service/ec2", "service/ec2/ec2iface", - "service/sts" + "service/sts", + "service/sts/stsiface", ] - revision = "31bd69f7db00cbf3d85d129e16d42304cb6e455f" - version = "v1.13.44" + pruneopts = "UT" + revision = "f3fe96892dc0e8e8e9862456e1455e62e4cb55d4" + version = "v1.21.9" [[projects]] branch = "master" + digest = "1:d6afaeed1502aa28e80a4ed0981d570ad91b2579193404256ce672ed0a609e0d" name = "github.com/beorn7/perks" packages = ["quantile"] + pruneopts = "UT" revision = "3a771d992973f24aa725d07868b467d1ddfceafb" [[projects]] + digest = "1:2209584c0f7c9b68c23374e659357ab546e1b70eec2761f03280f69a8fd23d77" name = "github.com/cenkalti/backoff" packages = ["."] + pruneopts = "UT" revision = "2ea60e5f094469f9e65adb9cd103795b73ae743e" version = "v2.0.0" [[projects]] + digest = "1:2cd7915ab26ede7d95b8749e6b1f933f1c6d5398030684e6505940a10f31cfda" name = "github.com/ghodss/yaml" packages = ["."] + pruneopts = "UT" revision = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7" version = "v1.0.0" [[projects]] - name = "github.com/go-ini/ini" - packages = ["."] - revision = "6529cf7c58879c08d927016dde4477f18a0634cb" - version = "v1.36.0" - -[[projects]] + digest = "1:a7534feda0f15b5fd691e59e4fb6b7547e27df4b415a62e02c7cb71b3439c1b1" name = "github.com/gogo/protobuf" packages = [ "proto", - "sortkeys" + "sortkeys", ] + pruneopts = "UT" revision = "1adfc126b41513cc696b209667c8656ea7aac67c" version = "v1.0.0" [[projects]] branch = "master" + digest = "1:1ba1d79f2810270045c328ae5d674321db34e3aae468eb4233883b473c5c0467" name = "github.com/golang/glog" packages = ["."] + pruneopts = "UT" revision = "23def4e6c14b4da8ac2ed8007337bc5eb5007998" [[projects]] + digest = "1:17fe264ee908afc795734e8c4e63db2accabaf57326dbf21763a7d6b86096260" name = "github.com/golang/protobuf" packages = [ "proto", "ptypes", "ptypes/any", "ptypes/duration", - "ptypes/timestamp" + "ptypes/timestamp", ] + pruneopts = "UT" revision = "b4deda0973fb4c70b50d226b1af49f3da59f5265" version = "v1.1.0" [[projects]] branch = "master" + digest = "1:3ee90c0d94da31b442dde97c99635aaafec68d0b8a3c12ee2075c6bdabeec6bb" name = "github.com/google/gofuzz" packages = ["."] + pruneopts = "UT" revision = "24818f796faf91cd76ec7bddd72458fbced7a6c1" [[projects]] + digest = "1:5e031a35b76ee001fa9ca9d598298054a123d080e00d13a8dafcfc5e3ecd5b58" name = "github.com/googleapis/gnostic" packages = [ "OpenAPIv2", "compiler", - "extensions" + "extensions", ] + pruneopts = "UT" revision = "ee43cbb60db7bd22502942cccbc39059117352ab" version = "v0.1.0" [[projects]] + digest = "1:bb81097a5b62634f3e9fec1014657855610c82d19b9a40c17612e32651e35dca" name = "github.com/jmespath/go-jmespath" packages = ["."] - revision = "0b12d6b5" + pruneopts = "UT" + revision = "c2b33e84" [[projects]] + digest = "1:b1d4df033414c1a0d85fa7037b9aaf03746314811c860a95ea2d5fd481cd6c35" name = "github.com/json-iterator/go" packages = ["."] + pruneopts = "UT" revision = "ca39e5af3ece67bbcda3d0f4f56a8e24d9f2dad4" version = "1.1.3" [[projects]] + digest = "1:5985ef4caf91ece5d54817c11ea25f182697534f8ae6521eadcd628c142ac4b6" name = "github.com/matttproud/golang_protobuf_extensions" packages = ["pbutil"] + pruneopts = "UT" revision = "3247c84500bff8d9fb6d579d800f20b3e091582c" version = "v1.0.0" [[projects]] + digest = "1:5844f0df32a374c460a28bf8d546b656d34f800bb73b09c50b9e872707b17cd5" + name = "github.com/mikkeloscar/kube-node-ready-controller" + packages = ["pkg/aws"] + pruneopts = "UT" + revision = "18e7710c40166abe29ce79081f40e71ed6dd6f42" + version = "v0.0.4" + +[[projects]] + digest = "1:33422d238f147d247752996a26574ac48dcf472976eda7f5134015f06bf16563" name = "github.com/modern-go/concurrent" packages = ["."] + pruneopts = "UT" revision = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94" version = "1.0.3" [[projects]] + digest = "1:d711dfcf661439f1ef0b202a02e8a1ff4deac48f26f34253520dcdbecbd7c5f1" name = "github.com/modern-go/reflect2" packages = ["."] + pruneopts = "UT" revision = "1df9eeb2bb81f327b96228865c5687bc2194af3f" version = "1.0.0" [[projects]] + digest = "1:d14a5f4bfecf017cb780bdde1b6483e5deb87e12c332544d2c430eda58734bcb" name = "github.com/prometheus/client_golang" packages = [ "prometheus", - "prometheus/promhttp" + "prometheus/promhttp", ] + pruneopts = "UT" revision = "c5b7fccd204277076155f10851dad72b76a49317" version = "v0.8.0" [[projects]] branch = "master" + digest = "1:32d10bdfa8f09ecf13598324dba86ab891f11db3c538b6a34d1c3b5b99d7c36b" name = "github.com/prometheus/client_model" packages = ["go"] + pruneopts = "UT" revision = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c" [[projects]] branch = "master" + digest = "1:e469cd65badf7694aeb44874518606d93c1d59e7735d3754ad442782437d3cc3" name = "github.com/prometheus/common" packages = [ "expfmt", "internal/bitbucket.org/ww/goautoneg", - "model" + "model", ] + pruneopts = "UT" revision = "d811d2e9bf898806ecfb6ef6296774b13ffc314c" [[projects]] branch = "master" + digest = "1:570784e0ddbf67f14087c6d8cfb7b999b9c55e75518a755e88cb202566ea8a17" name = "github.com/prometheus/procfs" packages = [ ".", "internal/util", "nfs", - "xfs" + "xfs", ] + pruneopts = "UT" revision = "8b1c2da0d56deffdbb9e48d4414b4e674bd8083e" [[projects]] + digest = "1:9e9193aa51197513b3abcb108970d831fbcf40ef96aa845c4f03276e1fa316d2" name = "github.com/sirupsen/logrus" packages = ["."] + pruneopts = "UT" revision = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc" version = "v1.0.5" [[projects]] + digest = "1:9424f440bba8f7508b69414634aef3b2b3a877e522d8a4624692412805407bb7" name = "github.com/spf13/pflag" packages = ["."] + pruneopts = "UT" revision = "583c0c0531f06d5278b7d917446061adc344b5cd" version = "v1.0.1" [[projects]] branch = "master" + digest = "1:3f3a05ae0b95893d90b9b3b5afdb79a9b3d96e4e36e099d841ae602e4aca0da8" name = "golang.org/x/crypto" packages = ["ssh/terminal"] + pruneopts = "UT" revision = "21052ae46654ecf18dfdba0f7c12701a1e2b3164" [[projects]] branch = "master" + digest = "1:8b891cd19368cddb45930e889dd599d8e02be56bd1abedb4f7aae71564f60e80" name = "golang.org/x/net" packages = [ "context", "http/httpguts", "http2", "http2/hpack", - "idna" + "idna", ] + pruneopts = "UT" revision = "f73e4c9ed3b7ebdd5f699a16a880c2b1994e50dd" [[projects]] branch = "master" + digest = "1:f188849a07aed244639654388dc775da034b17dab0890485e1e75c28e7a053ff" name = "golang.org/x/sys" packages = [ "unix", - "windows" + "windows", ] + pruneopts = "UT" revision = "7db1c3b1a98089d0071c84f646ff5c96aad43682" [[projects]] + digest = "1:a2ab62866c75542dd18d2b069fec854577a20211d7c0ea6ae746072a1dccdd18" name = "golang.org/x/text" packages = [ "collate", @@ -240,37 +299,47 @@ "unicode/bidi", "unicode/cldr", "unicode/norm", - "unicode/rangetable" + "unicode/rangetable", ] + pruneopts = "UT" revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" version = "v0.3.0" [[projects]] branch = "master" + digest = "1:c9e7a4b4d47c0ed205d257648b0e5b0440880cb728506e318f8ac7cd36270bc4" name = "golang.org/x/time" packages = ["rate"] + pruneopts = "UT" revision = "fbb02b2291d28baffd63558aa44b4b56f178d650" [[projects]] + digest = "1:c06d9e11d955af78ac3bbb26bd02e01d2f61f689e1a3bce2ef6fb683ef8a7f2d" name = "gopkg.in/alecthomas/kingpin.v2" packages = ["."] + pruneopts = "UT" revision = "947dcec5ba9c011838740e680966fd7087a71d0d" version = "v2.2.6" [[projects]] + digest = "1:2d1fbdc6777e5408cabeb02bf336305e724b925ff4546ded0fa8715a7267922a" name = "gopkg.in/inf.v0" packages = ["."] + pruneopts = "UT" revision = "d2d2541c53f18d2a059457998ce2876cc8e67cbf" version = "v0.9.1" [[projects]] + digest = "1:342378ac4dcb378a5448dd723f0784ae519383532f5e70ade24132c4c8693202" name = "gopkg.in/yaml.v2" packages = ["."] + pruneopts = "UT" revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183" version = "v2.2.1" [[projects]] branch = "master" + digest = "1:d46a71c9d46d5d3e5d162074f520fc481ae2a164100c82ddd82a11cc0a59abc1" name = "k8s.io/api" packages = [ "admissionregistration/v1alpha1", @@ -300,11 +369,13 @@ "settings/v1alpha1", "storage/v1", "storage/v1alpha1", - "storage/v1beta1" + "storage/v1beta1", ] + pruneopts = "UT" revision = "8ab7c6a2fbd1724a52514855629cec31a8f86929" [[projects]] + digest = "1:5306fa4e911383bc8540148123e6a81aea1786dbf592ac051fd572fdd8a173b1" name = "k8s.io/apimachinery" packages = [ "pkg/api/errors", @@ -341,11 +412,13 @@ "pkg/util/yaml", "pkg/version", "pkg/watch", - "third_party/forked/golang/reflect" + "third_party/forked/golang/reflect", ] + pruneopts = "UT" revision = "302974c03f7e50f16561ba237db776ab93594ef6" [[projects]] + digest = "1:2ad13bf152883351205212b4dee22255c4c5282fff9dc58e7fffcf08fff9dd45" name = "k8s.io/client-go" packages = [ "discovery", @@ -422,14 +495,37 @@ "transport", "util/cert", "util/flowcontrol", - "util/integer" + "util/integer", ] + pruneopts = "UT" revision = "23781f4d6632d88e869066eaebb743857aa1ef9b" version = "v7.0.0" [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "26832df13f066c0a33f654c7c2b5456fe8a9a20dc520ec130f6c7c5b1a6d5b79" + input-imports = [ + "github.com/aws/aws-sdk-go/aws", + "github.com/aws/aws-sdk-go/aws/ec2metadata", + "github.com/aws/aws-sdk-go/aws/session", + "github.com/aws/aws-sdk-go/service/autoscaling", + "github.com/aws/aws-sdk-go/service/autoscaling/autoscalingiface", + "github.com/aws/aws-sdk-go/service/ec2", + "github.com/aws/aws-sdk-go/service/ec2/ec2iface", + "github.com/cenkalti/backoff", + "github.com/mikkeloscar/kube-node-ready-controller/pkg/aws", + "github.com/prometheus/client_golang/prometheus", + "github.com/prometheus/client_golang/prometheus/promhttp", + "github.com/sirupsen/logrus", + "gopkg.in/alecthomas/kingpin.v2", + "gopkg.in/yaml.v2", + "k8s.io/api/core/v1", + "k8s.io/apimachinery/pkg/api/errors", + "k8s.io/apimachinery/pkg/apis/meta/v1", + "k8s.io/apimachinery/pkg/labels", + "k8s.io/client-go/kubernetes", + "k8s.io/client-go/kubernetes/fake", + "k8s.io/client-go/rest", + ] solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 0d20134..68c14a5 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -27,7 +27,7 @@ [[constraint]] name = "github.com/aws/aws-sdk-go" - version = "1.13.44" + version = "1.21.9" [[constraint]] name = "github.com/sirupsen/logrus" diff --git a/main.go b/main.go index 43afd54..2780aa9 100644 --- a/main.go +++ b/main.go @@ -84,6 +84,10 @@ func main() { } } + if len(config.TaintNodeNotReadyName) == 0 { + config.TaintNodeNotReadyName = defaultTaintNodeNotReadyName + } + var kubeConfig *rest.Config if config.APIServer != nil { kubeConfig = &rest.Config{ @@ -122,7 +126,6 @@ func main() { } }() - kubeConfig.Transport = tr client, err := kubernetes.NewForConfig(kubeConfig) if err != nil { log.Fatal(err)