Skip to content

Commit 6d7cf6b

Browse files
RedbackThomsonRedbackThomson
authored
Update to ACK runtime v0.12.0 (#4)
Description of changes: Updates the version of ACK runtime to `v0.12.0` By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 4693adf commit 6d7cf6b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+2908
-90
lines changed

‎Makefile

+4-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ GO_LDFLAGS=-ldflags "-X main.version=$(VERSION) \
1313

1414
AUTHENTICATED_ACCOUNT_ID=$(shell aws sts get-caller-identity --output text --query "Account")
1515

16-
.PHONY: all test
16+
.PHONY: all test local-test
1717

1818
all: test
1919

@@ -27,6 +27,9 @@ local-run-controller: ## Run a controller image locally for SERVICE
2727
test: ## Run code tests
2828
go test -v ./...
2929

30+
local-test: ## Run code tests using go.local.mod file
31+
go test -modfile=go.local.mod -v ./...
32+
3033
help: ## Show this help.
3134
@grep -F -h "##" $(MAKEFILE_LIST) | grep -F -v grep | sed -e 's/\\$$//' \
3235
| awk -F'[:#]' '{print $$1 = sprintf("%-30s", $$1), $$4}'

‎apis/v1alpha1/ack-generate-metadata.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
ack_generate_info:
2-
build_date: "2021-07-12T23:57:06Z"
3-
build_hash: 00bf248923c17be1e8e9688f909f83e7bdff3c5c
2+
build_date: "2021-08-24T18:22:24Z"
3+
build_hash: be9e3abf09e334d8585d14404a99d8adae0daec7
44
go_version: go1.15.6 linux/amd64
5-
version: v0.5.0
6-
api_directory_checksum: 4124e9ce79a6a01ecd4d6911bb659c2e768601c0
5+
version: v0.12.0
6+
api_directory_checksum: 93dac39771f80f75f6498e89289ac5674c4de0df
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.38.67
99
generator_config_info:
1010
file_checksum: 4878e381dd85bb88d0691255f3359da6775fc169
1111
original_file_name: generator.yaml
1212
last_modification:
1313
reason: API generation
14-
timestamp: 2021-07-12 23:57:12.006034402 +0000 UTC
14+
timestamp: 2021-08-24 18:22:29.303293978 +0000 UTC

‎apis/v1alpha1/addon.go

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apis/v1alpha1/cluster.go

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apis/v1alpha1/fargate_profile.go

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apis/v1alpha1/nodegroup.go

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/controller/main.go

+7-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/bases/eks.services.k8s.aws_addons.yaml

+1-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.4.0
7+
controller-gen.kubebuilder.io/version: v0.6.1
88
creationTimestamp: null
99
name: addons.eks.services.k8s.aws
1010
spec:
@@ -168,9 +168,6 @@ spec:
168168
status:
169169
description: The status of the add-on.
170170
type: string
171-
required:
172-
- ackResourceMetadata
173-
- conditions
174171
type: object
175172
type: object
176173
served: true

‎config/crd/bases/eks.services.k8s.aws_clusters.yaml

+1-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.4.0
7+
controller-gen.kubebuilder.io/version: v0.6.1
88
creationTimestamp: null
99
name: clusters.eks.services.k8s.aws
1010
spec:
@@ -234,9 +234,6 @@ spec:
234234
status:
235235
description: The current status of the cluster.
236236
type: string
237-
required:
238-
- ackResourceMetadata
239-
- conditions
240237
type: object
241238
type: object
242239
served: true

‎config/crd/bases/eks.services.k8s.aws_fargateprofiles.yaml

+1-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.4.0
7+
controller-gen.kubebuilder.io/version: v0.6.1
88
creationTimestamp: null
99
name: fargateprofiles.eks.services.k8s.aws
1010
spec:
@@ -162,9 +162,6 @@ spec:
162162
status:
163163
description: The current status of the Fargate profile.
164164
type: string
165-
required:
166-
- ackResourceMetadata
167-
- conditions
168165
type: object
169166
type: object
170167
served: true

‎config/crd/bases/eks.services.k8s.aws_nodegroups.yaml

+1-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.4.0
7+
controller-gen.kubebuilder.io/version: v0.6.1
88
creationTimestamp: null
99
name: nodegroups.eks.services.k8s.aws
1010
spec:
@@ -330,9 +330,6 @@ spec:
330330
status:
331331
description: The current status of the managed node group.
332332
type: string
333-
required:
334-
- ackResourceMetadata
335-
- conditions
336333
type: object
337334
type: object
338335
served: true

‎config/overlays/namespaced/kustomization.yaml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
resources:
2+
- ../../default
3+
patches:
4+
- path: role.json
5+
target:
6+
group: rbac.authorization.k8s.io
7+
version: v1
8+
kind: ClusterRole
9+
name: ack-eks-controller
10+
- path: role-binding.json
11+
target:
12+
group: rbac.authorization.k8s.io
13+
version: v1
14+
kind: ClusterRoleBinding
15+
name: ack-eks-controller-rolebinding

‎config/overlays/namespaced/role-binding.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[{"op": "replace", "path": "/kind", "value": "RoleBinding"},
2+
{"op": "add", "path": "/metadata/namespace", "value": "ack-system"},
3+
{"op": "replace", "path": "/roleRef/kind", "value": "Role"}]

‎config/overlays/namespaced/role.json

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[{"op": "replace", "path": "/kind", "value": "Role"},
2+
{"op": "add", "path": "/metadata/namespace", "value": "ack-system"}]

‎go.local.mod

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
module github.com/aws-controllers-k8s/eks-controller
2+
3+
go 1.14
4+
5+
replace github.com/aws-controllers-k8s/runtime => ../runtime
6+
7+
require (
8+
github.com/aws-controllers-k8s/runtime v0.12.0
9+
github.com/aws/aws-sdk-go v1.38.67
10+
github.com/go-logr/logr v0.1.0
11+
github.com/spf13/pflag v1.0.5
12+
k8s.io/api v0.18.2
13+
k8s.io/apimachinery v0.18.6
14+
k8s.io/client-go v0.18.2
15+
sigs.k8s.io/controller-runtime v0.6.0
16+
)

0 commit comments

Comments
 (0)