diff --git a/go.mod b/go.mod index 0bba7cde..81530ba6 100644 --- a/go.mod +++ b/go.mod @@ -17,5 +17,4 @@ require ( github.com/stretchr/testify v1.7.0 golang.org/x/mod v0.4.1 k8s.io/apimachinery v0.20.1 - k8s.io/utils v0.0.0-20201110183641-67b214c5f920 ) diff --git a/go.sum b/go.sum index 75e8f4ad..1051be44 100644 --- a/go.sum +++ b/go.sum @@ -61,8 +61,8 @@ github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmV github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= 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.1.0 h1:XTBQf7hn0792yuCRy58IZpbZoGMrGCpSK2mZXkof5W4= -github.com/aws-controllers-k8s/runtime v0.1.0/go.mod h1:xA2F18PJerBHaqrS4de1lpP7skeSMeStkmh+3x5sWvw= +github.com/aws-controllers-k8s/runtime v0.2.0 h1:gd0Kq8xGelgkZoNjr8yZbHfpvPA1R+wfMCi1lT4H8x4= +github.com/aws-controllers-k8s/runtime v0.2.0/go.mod h1:xA2F18PJerBHaqrS4de1lpP7skeSMeStkmh+3x5sWvw= github.com/aws/aws-sdk-go v1.37.4 h1:tWxrpMK/oRSXVnjUzhGeCWLR00fW0WF4V4sycYPPrJ8= github.com/aws/aws-sdk-go v1.37.4/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= diff --git a/templates/helm/templates/deployment.yaml b/templates/helm/templates/deployment.yaml index df56611d..1b1a5248 100644 --- a/templates/helm/templates/deployment.yaml +++ b/templates/helm/templates/deployment.yaml @@ -60,10 +60,16 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + - name: AWS_ACCOUNT_ID + value: {{ .Values.aws.account_id | quote }} - name: AWS_REGION value: {{ .Values.aws.region }} - name: ACK_WATCH_NAMESPACE value: {{ .Values.watchNamespace }} + - name: ACK_ENABLE_DEVELOPMENT_LOGGING + value: {{ .Values.log.enable_development_logging }} + - name: ACK_LOG_LEVEL + value: {{ .Values.log.log_level }} - name: ACK_RESOURCE_TAGS value: {{ join "," .Values.resourceTags | quote }} terminationGracePeriodSeconds: 10 diff --git a/templates/helm/values.yaml.tpl b/templates/helm/values.yaml.tpl index 5f45e9e9..3840e889 100644 --- a/templates/helm/values.yaml.tpl +++ b/templates/helm/values.yaml.tpl @@ -27,6 +27,12 @@ resources: aws: # If specified, use the AWS region for AWS API calls region: "" + account_id: "" + +# log level for the controller +log: + enable_development_logging: true + log_level: info # If specified, the service controller will watch for object creation only in the provided namespace watchNamespace: ""