diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index dd61b4a0..dc8db1bc 100755 --- a/apis/v1alpha1/ack-generate-metadata.yaml +++ b/apis/v1alpha1/ack-generate-metadata.yaml @@ -1,8 +1,8 @@ ack_generate_info: - build_date: "2021-10-18T18:57:57Z" - build_hash: 385779a205bea50e8762b76bc75cab957cf723b9 - go_version: go1.15.2 - version: v0.15.1 + build_date: "2021-10-27T21:15:31Z" + build_hash: d2b063806d25cfcae4f2d4eb44f8e3f713b23e8e + go_version: go1.15 + version: v0.15.2 api_directory_checksum: 8e4808b17b3a814f0a624eee8d68a0b45ba5e2c4 api_version: v1alpha1 aws_sdk_go_version: v1.38.52 diff --git a/go.mod b/go.mod index 0428406e..4a5fbb04 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/aws-controllers-k8s/elasticache-controller go 1.14 require ( - github.com/aws-controllers-k8s/runtime v0.15.1 + github.com/aws-controllers-k8s/runtime v0.15.2 github.com/aws/aws-sdk-go v1.38.52 github.com/ghodss/yaml v1.0.0 github.com/go-logr/logr v0.1.0 diff --git a/go.sum b/go.sum index 70f2a205..5889285b 100644 --- a/go.sum +++ b/go.sum @@ -23,8 +23,8 @@ github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= 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.15.1 h1:3P+6MKWe8ITJynmoxmDnMPlkoI9nuVgn8XD9Pt/XHE8= -github.com/aws-controllers-k8s/runtime v0.15.1/go.mod h1:W0Txdhb1Npx5kg72w2WFwIpGFvSsMxXlJzzNHAwCLeY= +github.com/aws-controllers-k8s/runtime v0.15.2 h1:waRPQGw+b/9huNHcMG+LQoVW4VP2YIBqZNdB+JAh//E= +github.com/aws-controllers-k8s/runtime v0.15.2/go.mod h1:W0Txdhb1Npx5kg72w2WFwIpGFvSsMxXlJzzNHAwCLeY= github.com/aws/aws-sdk-go v1.37.10/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.38.52 h1:7NKcUyTG/CyDX835kq04DDNe8vXaJhbGW8ThemHb18A= github.com/aws/aws-sdk-go v1.38.52/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= diff --git a/helm/Chart.yaml b/helm/Chart.yaml index dd933ba2..fe838a66 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: elasticache-chart description: A Helm chart for the ACK service controller for Amazon ElastiCache (ElastiCache) -version: v0.0.6 -appVersion: v0.0.6 +version: v0.0.7 +appVersion: v0.0.7 home: https://github.com/aws-controllers-k8s/elasticache-controller icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png sources: diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml index 3cce9b35..b0ade59f 100644 --- a/helm/templates/deployment.yaml +++ b/helm/templates/deployment.yaml @@ -61,8 +61,6 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - - name: AWS_ACCOUNT_ID - value: {{ .Values.aws.account_id | quote }} - name: AWS_REGION value: {{ .Values.aws.region }} - name: AWS_ENDPOINT_URL diff --git a/helm/values.yaml b/helm/values.yaml index d1452b1b..4306df32 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -4,7 +4,7 @@ image: repository: public.ecr.aws/aws-controllers-k8s/elasticache-controller - tag: v0.0.6 + tag: v0.0.7 pullPolicy: IfNotPresent pullSecrets: [] @@ -38,7 +38,6 @@ resources: aws: # If specified, use the AWS region for AWS API calls region: "" - account_id: "" endpoint_url: "" # log level for the controller diff --git a/pkg/resource/cache_parameter_group/sdk.go b/pkg/resource/cache_parameter_group/sdk.go index f28dc8f9..eca77235 100644 --- a/pkg/resource/cache_parameter_group/sdk.go +++ b/pkg/resource/cache_parameter_group/sdk.go @@ -17,6 +17,7 @@ package cache_parameter_group import ( "context" + "reflect" "strings" ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1" @@ -42,6 +43,7 @@ var ( _ = ackv1alpha1.AWSAccountID("") _ = &ackerr.NotFound _ = &ackcondition.NotManagedMessage + _ = &reflect.Value{} ) // sdkFind returns SDK-specific information about a supplied resource diff --git a/pkg/resource/cache_subnet_group/sdk.go b/pkg/resource/cache_subnet_group/sdk.go index 426d84b3..274fd054 100644 --- a/pkg/resource/cache_subnet_group/sdk.go +++ b/pkg/resource/cache_subnet_group/sdk.go @@ -17,6 +17,7 @@ package cache_subnet_group import ( "context" + "reflect" "strings" ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1" @@ -42,6 +43,7 @@ var ( _ = ackv1alpha1.AWSAccountID("") _ = &ackerr.NotFound _ = &ackcondition.NotManagedMessage + _ = &reflect.Value{} ) // sdkFind returns SDK-specific information about a supplied resource diff --git a/pkg/resource/replication_group/sdk.go b/pkg/resource/replication_group/sdk.go index 8fa6e096..eabe6f53 100644 --- a/pkg/resource/replication_group/sdk.go +++ b/pkg/resource/replication_group/sdk.go @@ -17,6 +17,7 @@ package replication_group import ( "context" + "reflect" "strings" ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1" @@ -42,6 +43,7 @@ var ( _ = ackv1alpha1.AWSAccountID("") _ = &ackerr.NotFound _ = &ackcondition.NotManagedMessage + _ = &reflect.Value{} ) // sdkFind returns SDK-specific information about a supplied resource diff --git a/pkg/resource/snapshot/sdk.go b/pkg/resource/snapshot/sdk.go index a044061d..20550eea 100644 --- a/pkg/resource/snapshot/sdk.go +++ b/pkg/resource/snapshot/sdk.go @@ -17,6 +17,7 @@ package snapshot import ( "context" + "reflect" "strings" ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1" @@ -42,6 +43,7 @@ var ( _ = ackv1alpha1.AWSAccountID("") _ = &ackerr.NotFound _ = &ackcondition.NotManagedMessage + _ = &reflect.Value{} ) // sdkFind returns SDK-specific information about a supplied resource diff --git a/pkg/resource/user/sdk.go b/pkg/resource/user/sdk.go index 0c79e1ae..f0062d6e 100644 --- a/pkg/resource/user/sdk.go +++ b/pkg/resource/user/sdk.go @@ -17,6 +17,7 @@ package user import ( "context" + "reflect" "strings" ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1" @@ -42,6 +43,7 @@ var ( _ = ackv1alpha1.AWSAccountID("") _ = &ackerr.NotFound _ = &ackcondition.NotManagedMessage + _ = &reflect.Value{} ) // sdkFind returns SDK-specific information about a supplied resource diff --git a/pkg/resource/user_group/sdk.go b/pkg/resource/user_group/sdk.go index c841bee4..e6988476 100644 --- a/pkg/resource/user_group/sdk.go +++ b/pkg/resource/user_group/sdk.go @@ -17,6 +17,7 @@ package user_group import ( "context" + "reflect" "strings" ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1" @@ -42,6 +43,7 @@ var ( _ = ackv1alpha1.AWSAccountID("") _ = &ackerr.NotFound _ = &ackcondition.NotManagedMessage + _ = &reflect.Value{} ) // sdkFind returns SDK-specific information about a supplied resource