Skip to content

Commit 77305c6

Browse files
ack-botack-bot
authored
Update ACK runtime to v0.14.1 (#6)
### Update ACK runtime to `v0.14.1` #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building eks-controller ==== Copying common custom resource definitions into eks Building Kubernetes API objects for eks Generating deepcopy code for eks Generating custom resource definitions for eks Building service controller for eks Generating RBAC manifests for eks Running gofmt against generated code for eks Updating additional GitHub repository maintenance files ==== building eks-controller release artifacts ==== Building release artifacts for eks-v0.0.0-non-release-version Generating common custom resource definitions Generating custom resource definitions for eks Generating RBAC manifests for eks ``` By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent ad3da64 commit 77305c6

Some content is hidden

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

42 files changed

+268
-139
lines changed

Diff for: ‎CODE_OF_CONDUCT.md

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
## Code of Conduct
2-
32
This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct).
43
For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact
54
[email protected] with any additional questions or comments.
6-

Diff for: ‎CONTRIBUTING.md

+52-18
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,85 @@
11
# Contributing Guidelines
22

3-
Thank you for your interest in contributing to our project. Whether it's a bug report, new feature, correction, or additional documentation, we greatly value feedback and contributions from our community.
3+
Thank you for your interest in contributing to our project. Whether it's a bug
4+
report, new feature, correction, or additional documentation, we greatly value
5+
feedback and contributions from our community.
46

5-
Please read through this document before submitting any issues or pull requests to ensure we have all the necessary information to effectively respond to your bug report or contribution.
7+
Please read through this document before submitting any issues or pull requests
8+
to ensure we have all the necessary information to effectively respond to your
9+
bug report or contribution.
610

711
## Reporting Bugs/Feature Requests
812

9-
We welcome you to use the GitHub issue tracker to report bugs or suggest features.
13+
We welcome you to use the GitHub issue tracker to report bugs or suggest
14+
features.
1015

11-
When filing an issue, please check existing open, or recently closed, issues to make sure somebody else hasn't already reported the issue. Please try to include as much information as you can. Details like these are incredibly useful:
16+
When filing an issue, please check existing open, or recently closed, issues to
17+
make sure somebody else hasn't already reported the issue. Please try to
18+
include as much information as you can. Details like these are incredibly
19+
useful:
1220

1321
* A reproducible test case or series of steps
1422
* The version of our code being used
1523
* Any modifications you've made relevant to the bug
1624
* Anything unusual about your environment or deployment
1725

1826
## Contributing via Pull Requests
19-
Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that:
27+
28+
Contributions via pull requests are much appreciated. Before sending us a pull
29+
request, please ensure that:
2030

2131
1. You are working against the latest source on the *main* branch.
22-
2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
23-
3. You open an issue to discuss any significant work - we would hate for your time to be wasted.
32+
2. You check existing open, and recently merged, pull requests to make sure
33+
someone else hasn't addressed the problem already.
34+
3. You open an issue to discuss any significant work - we would hate for your
35+
time to be wasted.
2436

2537
To send us a pull request, please:
2638

2739
1. Fork the repository.
28-
2. Modify the source; please focus on the specific change you are contributing. If you also reformat all the code, it will be hard for us to focus on your change.
40+
2. Modify the source; please focus on the specific change you are contributing.
41+
If you also reformat all the code, it will be hard for us to focus on your
42+
change.
2943
3. Ensure local tests pass.
3044
4. Commit to your fork using clear commit messages.
31-
5. Send us a pull request, answering any default questions in the pull request interface.
32-
6. Pay attention to any automated CI failures reported in the pull request, and stay involved in the conversation.
45+
5. Send us a pull request, answering any default questions in the pull request
46+
interface.
47+
6. Pay attention to any automated CI failures reported in the pull request, and
48+
stay involved in the conversation.
49+
50+
GitHub provides additional document on [forking a repository][fork] and
51+
[creating a pull request][pr].
3352

34-
GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and [creating a pull request](https://help.github.com/articles/creating-a-pull-request/).
53+
[fork]: https://help.github.com/articles/fork-a-repo/
54+
[pr]: https://help.github.com/articles/creating-a-pull-request/
3555

3656
## Finding contributions to work on
37-
Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels (enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any 'help wanted' issues is a great place to start.
57+
58+
Looking at the existing issues is a great way to find something to contribute
59+
on. As our projects, by default, use the default GitHub issue labels
60+
(enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at
61+
any 'help wanted' issues is a great place to start.
3862

3963
## Developer documentation
40-
[See the documentation](https://aws-controllers-k8s.github.io/community/dev-docs/overview/) for detailed development information.
64+
65+
[See the documentation][dev-docs] for detailed development information.
66+
67+
[dev-docs]: https://aws-controllers-k8s.github.io/community/docs/contributor-docs/overview/
4168

4269
## Code of Conduct
43-
This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct).
4470

45-
For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact [email protected] with any additional questions or comments.
71+
We adhere to the [Amazon Open Source Code of Conduct][coc].
72+
73+
[coc]: https://aws.github.io/code-of-conduct
4674

4775
## Security issue notifications
48-
If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public github issue.
4976

50-
## Licensing
51-
See the [LICENSE](LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
77+
If you discover a potential security issue in this project we ask that you
78+
notify AWS/Amazon Security via our [vulnerability reporting page][vuln]. Please
79+
do **not** create a public Github issue.
80+
81+
[vuln]: http://aws.amazon.com/security/vulnerability-reporting/
82+
83+
## License
84+
85+
This project is [licensed][./LICENSE] under the Apache-2.0 License.

Diff for: ‎GOVERNANCE.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ In the context of ACK, we consider the following roles:
99

1010
* __Users__ ... everyone using ACK, typically willing to provide feedback on ACK by proposing features and/or filing issues.
1111
* __Contributors__ ... everyone contributing code, documentation, examples, testing infra, and participating in feature proposals as well as design discussions. Code contributions will require a Developer Certificate of Origin (DCO).
12-
* __Maintainers__ ... are responsible for engaging with and assisting contributors to iterate on the contributions until it reaches acceptable quality. Maintainers can decide whether the contributions can be accepted into the project or rejected. Any active contributor meeting the project quality can be made a Maintainer by the Advisory Board.
13-
* __Advisory Board__ ... is responsible for defining the guidelines and processes that the project operates under.
12+
* __Maintainers__ ... are responsible for engaging with and assisting contributors to iterate on the contributions until it reaches acceptable quality. Maintainers can decide whether the contributions can be accepted into the project or rejected. Any active contributor meeting the project quality can be made a Maintainer by the Advisory Board.
13+
* __Advisory Board__ ... is responsible for defining the guidelines and processes that the project operates under.
1414

1515
The initial members of the Advisory Board are `@jaypipes` and `@mhausenblas`.
1616

@@ -34,4 +34,3 @@ The Advisory Board will propose a release management proposal via a GitHub issue
3434

3535
* The ACK [Contributing Guidelines](CONTRIBUTING.md)
3636
* Our [Code of Conduct](CODE_OF_CONDUCT.md)
37-

Diff for: ‎NOTICE

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2-
1+
Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.

Diff for: ‎apis/v1alpha1/ack-generate-metadata.yaml

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
ack_generate_info:
2-
build_date: "2021-08-24T18:22:24Z"
3-
build_hash: be9e3abf09e334d8585d14404a99d8adae0daec7
4-
go_version: go1.15.6 linux/amd64
5-
version: v0.12.0
6-
api_directory_checksum: 93dac39771f80f75f6498e89289ac5674c4de0df
2+
build_date: "2021-09-23T16:16:10Z"
3+
build_hash: fe3ca1f5ee52a0e49be0f8458b4e5058a8f0fd47
4+
go_version: go1.15
5+
version: v0.14.1
6+
api_directory_checksum: 69eae3154f9f431c193d19b4cfd2107fc6650660
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-08-24 18:22:29.303293978 +0000 UTC

Diff for: ‎apis/v1alpha1/nodegroup.go

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

Diff for: ‎apis/v1alpha1/types.go

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

Diff for: ‎apis/v1alpha1/zz_generated.deepcopy.go

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

Diff for: ‎config/controller/deployment.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ spec:
4141
image: controller:latest
4242
name: controller
4343
ports:
44-
- containerPort: 8080
44+
- name: http
45+
containerPort: 8080
4546
resources:
4647
limits:
4748
cpu: 100m

Diff for: ‎config/controller/service.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ spec:
99
ports:
1010
- name: metricsport
1111
port: 8080
12-
targetPort: 8080
12+
targetPort: http
1313
protocol: TCP
14-
type: NodePort
14+
type: NodePort

Diff for: ‎config/crd/bases/eks.services.k8s.aws_addons.yaml

+1-1
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.6.1
7+
controller-gen.kubebuilder.io/version: v0.7.0
88
creationTimestamp: null
99
name: addons.eks.services.k8s.aws
1010
spec:

Diff for: ‎config/crd/bases/eks.services.k8s.aws_clusters.yaml

+1-1
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.6.1
7+
controller-gen.kubebuilder.io/version: v0.7.0
88
creationTimestamp: null
99
name: clusters.eks.services.k8s.aws
1010
spec:

Diff for: ‎config/crd/bases/eks.services.k8s.aws_fargateprofiles.yaml

+1-1
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.6.1
7+
controller-gen.kubebuilder.io/version: v0.7.0
88
creationTimestamp: null
99
name: fargateprofiles.eks.services.k8s.aws
1010
spec:

Diff for: ‎config/crd/bases/eks.services.k8s.aws_nodegroups.yaml

+1-1
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.6.1
7+
controller-gen.kubebuilder.io/version: v0.7.0
88
creationTimestamp: null
99
name: nodegroups.eks.services.k8s.aws
1010
spec:

Diff for: ‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/aws-controllers-k8s/eks-controller
33
go 1.14
44

55
require (
6-
github.com/aws-controllers-k8s/runtime v0.12.0
6+
github.com/aws-controllers-k8s/runtime v0.14.1
77
github.com/aws/aws-sdk-go v1.38.67
88
github.com/go-logr/logr v0.1.0
99
github.com/spf13/pflag v1.0.5

Diff for: ‎go.sum

+2-8
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,8 @@ github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo
2323
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
2424
github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
2525
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
26-
github.com/aws-controllers-k8s/runtime v0.2.3 h1:pDDSXOJj5QLlC9OcgnGujeocQEg5U1oqQw3kUSDefLU=
27-
github.com/aws-controllers-k8s/runtime v0.2.3/go.mod h1:xA2F18PJerBHaqrS4de1lpP7skeSMeStkmh+3x5sWvw=
28-
github.com/aws-controllers-k8s/runtime v0.5.0 h1:lV2QxuEHHKS+nbJ7lYgPjwVBY6Aqw+RHJF8eDZZeswM=
29-
github.com/aws-controllers-k8s/runtime v0.5.0/go.mod h1:xA2F18PJerBHaqrS4de1lpP7skeSMeStkmh+3x5sWvw=
30-
github.com/aws-controllers-k8s/runtime v0.12.0 h1:G/lCEozh4Brsv1Ojqyl9D/whpq/YvcFtDZBWXf6YIgI=
31-
github.com/aws-controllers-k8s/runtime v0.12.0/go.mod h1:kG2WM4JAmLgf67cgZV9IZUkY2DsrUzsaNbmhFMfb05c=
32-
github.com/aws/aws-sdk-go v1.37.4 h1:tWxrpMK/oRSXVnjUzhGeCWLR00fW0WF4V4sycYPPrJ8=
33-
github.com/aws/aws-sdk-go v1.37.4/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
26+
github.com/aws-controllers-k8s/runtime v0.14.1 h1:2/hCwost9rmtgsgktCtJH75U74ziWiBs0bHFOB2iaKo=
27+
github.com/aws-controllers-k8s/runtime v0.14.1/go.mod h1:kG2WM4JAmLgf67cgZV9IZUkY2DsrUzsaNbmhFMfb05c=
3428
github.com/aws/aws-sdk-go v1.37.10/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
3529
github.com/aws/aws-sdk-go v1.38.67 h1:OCeXMKiiM8X7HAKPCE5yD+t+sEsRaj8EwDs2tlgvX2c=
3630
github.com/aws/aws-sdk-go v1.38.67/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=

Diff for: ‎helm/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v1
22
name: eks-chart
3-
description: A Helm chart for the ACK service controller for eks
3+
description: A Helm chart for the ACK service controller for Amazon Elastic Kubernetes Service (EKS)
44
version: v0.0.0-non-release-version
55
appVersion: v0.0.0-non-release-version
66
home: https://github.com/aws-controllers-k8s/eks-controller
@@ -10,7 +10,7 @@ sources:
1010
maintainers:
1111
- name: ACK Admins
1212
url: https://github.com/orgs/aws-controllers-k8s/teams/ack-admin
13-
- name: eks Admins
13+
- name: EKS Admins
1414
url: https://github.com/orgs/aws-controllers-k8s/teams/eks-maintainer
1515
keywords:
1616
- aws

Diff for: ‎helm/crds/eks.services.k8s.aws_addons.yaml

+1-1
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.6.1
7+
controller-gen.kubebuilder.io/version: v0.7.0
88
creationTimestamp: null
99
name: addons.eks.services.k8s.aws
1010
spec:

Diff for: ‎helm/crds/eks.services.k8s.aws_clusters.yaml

+1-1
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.6.1
7+
controller-gen.kubebuilder.io/version: v0.7.0
88
creationTimestamp: null
99
name: clusters.eks.services.k8s.aws
1010
spec:

Diff for: ‎helm/crds/eks.services.k8s.aws_fargateprofiles.yaml

+1-1
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.6.1
7+
controller-gen.kubebuilder.io/version: v0.7.0
88
creationTimestamp: null
99
name: fargateprofiles.eks.services.k8s.aws
1010
spec:

Diff for: ‎helm/crds/eks.services.k8s.aws_nodegroups.yaml

+1-1
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.6.1
7+
controller-gen.kubebuilder.io/version: v0.7.0
88
creationTimestamp: null
99
name: nodegroups.eks.services.k8s.aws
1010
spec:

Diff for: ‎helm/crds/services.k8s.aws_adoptedresources.yaml

+1-1
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.6.1
7+
controller-gen.kubebuilder.io/version: v0.7.0
88
creationTimestamp: null
99
name: adoptedresources.services.k8s.aws
1010
spec:

Diff for: ‎helm/templates/deployment.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ spec:
5454
image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
5555
name: controller
5656
ports:
57-
- containerPort: {{ .Values.deployment.containerPort }}
57+
- name: http
58+
containerPort: {{ .Values.deployment.containerPort }}
5859
resources:
5960
{{- toYaml .Values.resources | nindent 10 }}
6061
env:
@@ -77,3 +78,4 @@ spec:
7778
- name: ACK_RESOURCE_TAGS
7879
value: {{ join "," .Values.resourceTags | quote }}
7980
terminationGracePeriodSeconds: 10
81+
nodeSelector: {{ toYaml .Values.deployment.nodeSelector | nindent 8 }}

Diff for: ‎helm/templates/metrics-service.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: v1
33
kind: Service
44
metadata:
5-
name: {{ include "app.fullname" . }}-metrics
5+
name: {{ .Chart.Name | trimSuffix "-chart" | trunc 44 }}-controller-metrics
66
namespace: {{ .Release.Namespace }}
77
labels:
88
app.kubernetes.io/name: {{ include "app.name" . }}
@@ -25,6 +25,6 @@ spec:
2525
ports:
2626
- name: metricsport
2727
port: 8080
28-
targetPort: 8080
28+
targetPort: http
2929
protocol: TCP
30-
{{- end }}
30+
{{- end }}

Diff for: ‎helm/templates/service-account.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ metadata:
1010
k8s-app: {{ include "app.name" . }}
1111
helm.sh/chart: {{ include "chart.name-version" . }}
1212
name: {{ include "service-account.name" . }}
13+
namespace: {{ .Release.Namespace }}
1314
annotations:
1415
{{- range $key, $value := .Values.serviceAccount.annotations }}
1516
{{ $key }}: {{ $value | quote }}
1617
{{- end }}
17-
{{- end }}
18+
{{- end }}

Diff for: ‎helm/values.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ deployment:
1515
annotations: {}
1616
labels: {}
1717
containerPort: 8080
18+
nodeSelector:
19+
kubernetes.io/os: linux
1820

1921
metrics:
2022
service:

0 commit comments

Comments
 (0)