Skip to content

Commit

Permalink
Update to ACK runtime v0.12.0 (#4)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
RedbackThomson authored Aug 24, 2021
1 parent 4693adf commit 6d7cf6b
Show file tree
Hide file tree
Showing 54 changed files with 2,908 additions and 90 deletions.
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ GO_LDFLAGS=-ldflags "-X main.version=$(VERSION) \

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

.PHONY: all test
.PHONY: all test local-test

all: test

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

local-test: ## Run code tests using go.local.mod file
go test -modfile=go.local.mod -v ./...

help: ## Show this help.
@grep -F -h "##" $(MAKEFILE_LIST) | grep -F -v grep | sed -e 's/\\$$//' \
| awk -F'[:#]' '{print $$1 = sprintf("%-30s", $$1), $$4}'
10 changes: 5 additions & 5 deletions apis/v1alpha1/ack-generate-metadata.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
ack_generate_info:
build_date: "2021-07-12T23:57:06Z"
build_hash: 00bf248923c17be1e8e9688f909f83e7bdff3c5c
build_date: "2021-08-24T18:22:24Z"
build_hash: be9e3abf09e334d8585d14404a99d8adae0daec7
go_version: go1.15.6 linux/amd64
version: v0.5.0
api_directory_checksum: 4124e9ce79a6a01ecd4d6911bb659c2e768601c0
version: v0.12.0
api_directory_checksum: 93dac39771f80f75f6498e89289ac5674c4de0df
api_version: v1alpha1
aws_sdk_go_version: v1.38.67
generator_config_info:
file_checksum: 4878e381dd85bb88d0691255f3359da6775fc169
original_file_name: generator.yaml
last_modification:
reason: API generation
timestamp: 2021-07-12 23:57:12.006034402 +0000 UTC
timestamp: 2021-08-24 18:22:29.303293978 +0000 UTC
6 changes: 6 additions & 0 deletions apis/v1alpha1/addon.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions apis/v1alpha1/cluster.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions apis/v1alpha1/fargate_profile.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions apis/v1alpha1/nodegroup.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 7 additions & 5 deletions cmd/controller/main.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions config/crd/bases/eks.services.k8s.aws_addons.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.4.0
controller-gen.kubebuilder.io/version: v0.6.1
creationTimestamp: null
name: addons.eks.services.k8s.aws
spec:
Expand Down Expand Up @@ -168,9 +168,6 @@ spec:
status:
description: The status of the add-on.
type: string
required:
- ackResourceMetadata
- conditions
type: object
type: object
served: true
Expand Down
5 changes: 1 addition & 4 deletions config/crd/bases/eks.services.k8s.aws_clusters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.4.0
controller-gen.kubebuilder.io/version: v0.6.1
creationTimestamp: null
name: clusters.eks.services.k8s.aws
spec:
Expand Down Expand Up @@ -234,9 +234,6 @@ spec:
status:
description: The current status of the cluster.
type: string
required:
- ackResourceMetadata
- conditions
type: object
type: object
served: true
Expand Down
5 changes: 1 addition & 4 deletions config/crd/bases/eks.services.k8s.aws_fargateprofiles.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.4.0
controller-gen.kubebuilder.io/version: v0.6.1
creationTimestamp: null
name: fargateprofiles.eks.services.k8s.aws
spec:
Expand Down Expand Up @@ -162,9 +162,6 @@ spec:
status:
description: The current status of the Fargate profile.
type: string
required:
- ackResourceMetadata
- conditions
type: object
type: object
served: true
Expand Down
5 changes: 1 addition & 4 deletions config/crd/bases/eks.services.k8s.aws_nodegroups.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.4.0
controller-gen.kubebuilder.io/version: v0.6.1
creationTimestamp: null
name: nodegroups.eks.services.k8s.aws
spec:
Expand Down Expand Up @@ -330,9 +330,6 @@ spec:
status:
description: The current status of the managed node group.
type: string
required:
- ackResourceMetadata
- conditions
type: object
type: object
served: true
Expand Down
15 changes: 15 additions & 0 deletions config/overlays/namespaced/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
resources:
- ../../default
patches:
- path: role.json
target:
group: rbac.authorization.k8s.io
version: v1
kind: ClusterRole
name: ack-eks-controller
- path: role-binding.json
target:
group: rbac.authorization.k8s.io
version: v1
kind: ClusterRoleBinding
name: ack-eks-controller-rolebinding
3 changes: 3 additions & 0 deletions config/overlays/namespaced/role-binding.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[{"op": "replace", "path": "/kind", "value": "RoleBinding"},
{"op": "add", "path": "/metadata/namespace", "value": "ack-system"},
{"op": "replace", "path": "/roleRef/kind", "value": "Role"}]
2 changes: 2 additions & 0 deletions config/overlays/namespaced/role.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[{"op": "replace", "path": "/kind", "value": "Role"},
{"op": "add", "path": "/metadata/namespace", "value": "ack-system"}]
16 changes: 16 additions & 0 deletions go.local.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
module github.com/aws-controllers-k8s/eks-controller

go 1.14

replace github.com/aws-controllers-k8s/runtime => ../runtime

require (
github.com/aws-controllers-k8s/runtime v0.12.0
github.com/aws/aws-sdk-go v1.38.67
github.com/go-logr/logr v0.1.0
github.com/spf13/pflag v1.0.5
k8s.io/api v0.18.2
k8s.io/apimachinery v0.18.6
k8s.io/client-go v0.18.2
sigs.k8s.io/controller-runtime v0.6.0
)
Loading

0 comments on commit 6d7cf6b

Please sign in to comment.