diff --git a/Makefile b/Makefile index d65e0221..32028a98 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ GO111MODULE=on AWS_SERVICE=$(shell echo $(SERVICE) | tr '[:upper:]' '[:lower:]') # Build ldflags -VERSION ?= "v0.10.0" +VERSION ?= "v0.11.0" GITCOMMIT=$(shell git rev-parse HEAD) BUILDDATE=$(shell date -u +'%Y-%m-%dT%H:%M:%SZ') IMPORT_PATH=github.com/aws-controllers-k8s/code-generator diff --git a/go.mod b/go.mod index 2f425668..17003e07 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/aws-controllers-k8s/code-generator go 1.14 require ( - github.com/aws-controllers-k8s/runtime v0.10.0 + github.com/aws-controllers-k8s/runtime v0.11.0 github.com/aws/aws-sdk-go v1.37.10 github.com/dlclark/regexp2 v1.4.0 // pin to v0.1.1 due to release problem with v0.1.2 diff --git a/go.sum b/go.sum index 4a980a25..6555735e 100644 --- a/go.sum +++ b/go.sum @@ -67,8 +67,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPd github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -github.com/aws-controllers-k8s/runtime v0.10.0 h1:MPZ4mPeap2mP/EKU6Pk7a7phiBSYaeZ9QJX38OPecXo= -github.com/aws-controllers-k8s/runtime v0.10.0/go.mod h1:kG2WM4JAmLgf67cgZV9IZUkY2DsrUzsaNbmhFMfb05c= +github.com/aws-controllers-k8s/runtime v0.11.0 h1:M8gSC6qs2yxLDRh75htYdal4lPf3Uodh0SKeiXSgPno= +github.com/aws-controllers-k8s/runtime v0.11.0/go.mod h1:kG2WM4JAmLgf67cgZV9IZUkY2DsrUzsaNbmhFMfb05c= github.com/aws/aws-sdk-go v1.37.10 h1:LRwl+97B4D69Z7tz+eRUxJ1C7baBaIYhgrn5eLtua+Q= github.com/aws/aws-sdk-go v1.37.10/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= diff --git a/templates/cmd/controller/main.go.tpl b/templates/cmd/controller/main.go.tpl index 8b95539f..d0078f6c 100644 --- a/templates/cmd/controller/main.go.tpl +++ b/templates/cmd/controller/main.go.tpl @@ -14,6 +14,7 @@ import ( clientgoscheme "k8s.io/client-go/kubernetes/scheme" ctrlrt "sigs.k8s.io/controller-runtime" ctrlrtmetrics "sigs.k8s.io/controller-runtime/pkg/metrics" + svcsdk "github.com/aws/aws-sdk-go/service/{{ .ServiceIDClean }}" ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1" svcresource "github.com/aws-controllers-k8s/{{ .ServiceIDClean }}-controller/pkg/resource" @@ -26,6 +27,7 @@ import ( var ( awsServiceAPIGroup = "{{ .APIGroup }}" awsServiceAlias = "{{ .ServiceIDClean }}" + awsServiceEndpointsID = svcsdk.EndpointsID scheme = runtime.NewScheme() setupLog = ctrlrt.Log.WithName("setup") ) @@ -84,7 +86,7 @@ func main() { "aws.service", awsServiceAlias, ) sc := ackrt.NewServiceController( - awsServiceAlias, awsServiceAPIGroup, + awsServiceAlias, awsServiceAPIGroup, awsServiceEndpointsID, ackrt.VersionInfo{}, // TODO: populate version info ).WithLogger( ctrlrt.Log,