add e2e tests for mod-ip and mod-instance under kops

Author: M00nF1sh

Makefile

@@ -52,6 +52,10 @@ lint:
 
 unit-test:
 	@./scripts/ci_unit_test.sh
+
+e2e-test:
+	@./scripts/ci_e2e_test.sh
+
 test:unit-test
 
 # build & preview docs

cmd/main.go

@@ -26,6 +26,9 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/aws/aws-sdk-go/service/resourcegroupstaggingapi"
+
 	"github.com/kubernetes-sigs/aws-alb-ingress-controller/internal/aws"
 	"github.com/kubernetes-sigs/aws-alb-ingress-controller/internal/ingress/controller"
 	"github.com/kubernetes-sigs/aws-alb-ingress-controller/internal/ingress/metric"
@@ -86,6 +89,8 @@ func main() {
 	reg.MustRegister(prometheus.NewProcessCollector(prometheus.ProcessCollectorOpts{}))
 
 	cc := cache.NewConfig(5 * time.Minute)
+	cc.SetCacheTTL(resourcegroupstaggingapi.ServiceName, "GetResources", time.Hour)
+	cc.SetCacheTTL(ec2.ServiceName, "DescribeInstanceStatus", time.Minute)
 	reg.MustRegister(cc.NewCacheCollector(collectors.PrometheusNamespace))
 	mc, err := metric.NewCollector(reg, options.ingressCTLConfig.IngressClass)
 	if err != nil {

cmd/options.go

@@ -22,6 +22,8 @@ import (
 	"os"
 	"time"
 
+	"k8s.io/klog"
+
 	"github.com/kubernetes-sigs/aws-alb-ingress-controller/internal/aws"
 
 	"github.com/spf13/pflag"
@@ -130,6 +132,11 @@ func getOptions() (*Options, error) {
 
 	_ = flag.Set("logtostderr", "true")
 	fs.AddGoFlagSet(flag.CommandLine)
+
+	klogFs := flag.NewFlagSet("klog", flag.ExitOnError)
+	klog.InitFlags(klogFs)
+	fs.AddGoFlagSet(klogFs)
+
 	_ = fs.Parse(os.Args)
 	if err := options.BindEnv(); err != nil {
 		return nil, err

go.mod

@@ -1,69 +1,54 @@
 module github.com/kubernetes-sigs/aws-alb-ingress-controller
 
 require (
-	github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc // indirect
-	github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf // indirect
-	github.com/aws/aws-sdk-go v1.16.11
+	github.com/appscode/jsonpatch v0.0.0-20190108182946-7c0e3b262f30 // indirect
+	github.com/aws/aws-sdk-go v1.16.35
 	github.com/blang/semver v3.5.1+incompatible
-	github.com/ghodss/yaml v1.0.0 // indirect
-	github.com/go-ini/ini v1.38.1 // indirect
-	github.com/go-logr/glogr v0.0.0-20180706173232-03aa3c320058
-	github.com/go-logr/logr v0.0.0-20180629235805-9fb12b3b21c5 // indirect
-	github.com/go-logr/zapr v0.0.0-20180713202756-7536572e8d55 // indirect
-	github.com/gogo/protobuf v1.1.1 // indirect
+	github.com/go-logr/glogr v0.1.0
+	github.com/go-logr/logr v0.1.0 // indirect
+	github.com/go-logr/zapr v0.1.0 // indirect
+	github.com/gogo/protobuf v1.2.0 // indirect
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
-	github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7 // indirect
+	github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
 	github.com/golang/mock v1.2.0
-	github.com/golangci/golangci-lint v1.12.5 // indirect
-	github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a // indirect
+	github.com/golangci/golangci-lint v1.14.0 // indirect
+	github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c // indirect
 	github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect
 	github.com/googleapis/gnostic v0.2.0 // indirect
-	github.com/gopherjs/gopherjs v0.0.0-20181004151105-1babbf986f6f // indirect
-	github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
-	github.com/hashicorp/golang-lru v0.0.0-20180201235237-0fb14efe8c47 // indirect
-	github.com/imdario/mergo v0.0.0-20171009183408-7fe0c75c13ab
-	github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be // indirect
-	github.com/jtolds/gls v4.2.1+incompatible // indirect
-	github.com/magiconair/properties v1.7.6
-	github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a // indirect
+	github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc // indirect
+	github.com/hashicorp/golang-lru v0.5.0 // indirect
+	github.com/imdario/mergo v0.3.7
+	github.com/json-iterator/go v1.1.5 // indirect
+	github.com/magiconair/properties v1.8.0
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect
-	github.com/onsi/ginkgo v1.7.0 // indirect
-	github.com/onsi/gomega v1.4.3 // indirect
+	github.com/modern-go/reflect2 v1.0.1 // indirect
+	github.com/onsi/ginkgo v1.7.0
+	github.com/onsi/gomega v1.4.3
 	github.com/pborman/uuid v1.2.0 // indirect
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
-	github.com/pkg/errors v0.8.0
-	github.com/prometheus/client_golang v0.9.0-pre1.0.20180919114304-73edb9af667d
+	github.com/pkg/errors v0.8.1
+	github.com/prometheus/client_golang v0.9.2
 	github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910
-	github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e
-	github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d // indirect
-	github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a // indirect
+	github.com/prometheus/common v0.0.0-20181126121408-4724e9255275
 	github.com/spf13/pflag v1.0.3
 	github.com/stretchr/objx v0.1.1 // indirect
 	github.com/stretchr/testify v1.2.2
 	github.com/ticketmaster/aws-sdk-go-cache v0.0.0-20180926195306-58922816129c
 	go.uber.org/atomic v1.3.2 // indirect
 	go.uber.org/multierr v1.1.0 // indirect
 	go.uber.org/zap v1.9.1 // indirect
-	golang.org/x/crypto v0.0.0-20180723164146-c126467f60eb // indirect
-	golang.org/x/net v0.0.0-20181220203305-927f97764cc3 // indirect
-	golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890 // indirect
-	golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 // indirect
-	golang.org/x/sys v0.0.0-20190102155601-82a175fd1598 // indirect
-	golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 // indirect
-	google.golang.org/appengine v1.4.0 // indirect
-	gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
-	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
+	golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67 // indirect
+	golang.org/x/oauth2 v0.0.0-20190212230446-3e8b2be13635 // indirect
+	golang.org/x/sys v0.0.0-20190214214411-e77772198cdc // indirect
+	golang.org/x/time v0.0.0-20181108054448-85acf8d2951c // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/ini.v1 v1.38.3 // indirect
-	gopkg.in/karlseguin/expect.v1 v1.0.1 // indirect
-	gopkg.in/yaml.v2 v2.2.2 // indirect
-	k8s.io/api v0.0.0-20181126151915-b503174bad59
-	k8s.io/apiextensions-apiserver v0.0.0-20181230194713-7f0e3c78365f // indirect
-	k8s.io/apimachinery v0.0.0-20181126123746-eddba98df674
-	k8s.io/apiserver v0.0.0-20181126153457-92fdef3a232a
-	k8s.io/client-go v2.0.0-alpha.0.0.20181126152608-d082d5923d3c+incompatible
-	k8s.io/kube-openapi v0.0.0-20180719232738-d8ea2fe547a4 // indirect
-	sigs.k8s.io/controller-runtime v0.1.9
-	sigs.k8s.io/testing_frameworks v0.1.0 // indirect
+	k8s.io/api v0.0.0-20181213150558-05914d821849
+	k8s.io/apimachinery v0.0.0-20181127025237-2b1284ed4c93
+	k8s.io/apiserver v0.0.0-20190214201149-f9f16382a346
+	k8s.io/client-go v2.0.0-alpha.0.0.20181213151034-8d9ed539ba31+incompatible
+	k8s.io/klog v0.2.0
+	k8s.io/kube-openapi v0.0.0-20190208205540-d7c86cdc46e3 // indirect
+	sigs.k8s.io/controller-runtime v0.1.10
+	sigs.k8s.io/structured-merge-diff v0.0.0-20190215000154-7666d3d49c8f // indirect
+	sigs.k8s.io/yaml v1.1.0 // indirect
 )