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.
aws-controllers-k8s · Sep 23, 2021 · 77305c6 · 77305c6
1 parent ad3da64
commit 77305c6
Show file tree

Hide file tree

Showing 42 changed files with 268 additions and 139 deletions.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -1,6 +1,4 @@
 ## Code of Conduct
-
 This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct).
 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.
-
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,51 +1,85 @@
 # Contributing Guidelines
 
-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.
+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.
 
-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.
+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.
 
 ## Reporting Bugs/Feature Requests
 
-We welcome you to use the GitHub issue tracker to report bugs or suggest features.
+We welcome you to use the GitHub issue tracker to report bugs or suggest
+features.
 
-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:
+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:
 
 * A reproducible test case or series of steps
 * The version of our code being used
 * Any modifications you've made relevant to the bug
 * Anything unusual about your environment or deployment
 
 ## Contributing via Pull Requests
-Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that:
+
+Contributions via pull requests are much appreciated. Before sending us a pull
+request, please ensure that:
 
 1. You are working against the latest source on the *main* branch.
-2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
-3. You open an issue to discuss any significant work - we would hate for your time to be wasted.
+2. You check existing open, and recently merged, pull requests to make sure
+   someone else hasn't addressed the problem already.
+3. You open an issue to discuss any significant work - we would hate for your
+   time to be wasted.
 
 To send us a pull request, please:
 
 1. Fork the repository.
-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.
+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.
 3. Ensure local tests pass.
 4. Commit to your fork using clear commit messages.
-5. Send us a pull request, answering any default questions in the pull request interface.
-6. Pay attention to any automated CI failures reported in the pull request, and stay involved in the conversation.
+5. Send us a pull request, answering any default questions in the pull request
+   interface.
+6. Pay attention to any automated CI failures reported in the pull request, and
+   stay involved in the conversation.
+
+GitHub provides additional document on [forking a repository][fork] and
+[creating a pull request][pr].
 
-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/).
+[fork]: https://help.github.com/articles/fork-a-repo/
+[pr]: https://help.github.com/articles/creating-a-pull-request/
 
 ## Finding contributions to work on
-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.
+
+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.
 
 ## Developer documentation
-[See the documentation](https://aws-controllers-k8s.github.io/community/dev-docs/overview/) for detailed development information.
+
+[See the documentation][dev-docs] for detailed development information.
+
+[dev-docs]: https://aws-controllers-k8s.github.io/community/docs/contributor-docs/overview/
 
 ## Code of Conduct
-This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct).
 
-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.
+We adhere to the [Amazon Open Source Code of Conduct][coc].
+
+[coc]: https://aws.github.io/code-of-conduct
 
 ## Security issue notifications
-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.
 
-## Licensing
-See the [LICENSE](LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
+If you discover a potential security issue in this project we ask that you
+notify AWS/Amazon Security via our [vulnerability reporting page][vuln]. Please
+do **not** create a public Github issue.
+
+[vuln]: http://aws.amazon.com/security/vulnerability-reporting/
+
+## License
+
+This project is [licensed][./LICENSE] under the Apache-2.0 License.
diff --git a/GOVERNANCE.md b/GOVERNANCE.md
@@ -9,8 +9,8 @@ In the context of ACK, we consider the following roles:
 
 * __Users__ ... everyone using ACK, typically willing to provide feedback on ACK by proposing features and/or filing issues.
 * __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).
-* __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.
-* __Advisory Board__ ... is responsible for defining the guidelines and processes that the project operates under. 
+*	__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.
+*	__Advisory Board__ ... is responsible for defining the guidelines and processes that the project operates under. 
 
 The initial members of the Advisory Board are `@jaypipes` and `@mhausenblas`.
 
@@ -34,4 +34,3 @@ The Advisory Board will propose a release management proposal via a GitHub issue
 
 * The ACK [Contributing Guidelines](CONTRIBUTING.md)
 * Our [Code of Conduct](CODE_OF_CONDUCT.md)
-
diff --git a/NOTICE b/NOTICE
@@ -1,2 +1 @@
-Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
+Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml
@@ -1,14 +1,13 @@
 ack_generate_info:
-  build_date: "2021-08-24T18:22:24Z"
-  build_hash: be9e3abf09e334d8585d14404a99d8adae0daec7
-  go_version: go1.15.6 linux/amd64
-  version: v0.12.0
-api_directory_checksum: 93dac39771f80f75f6498e89289ac5674c4de0df
+  build_date: "2021-09-23T16:16:10Z"
+  build_hash: fe3ca1f5ee52a0e49be0f8458b4e5058a8f0fd47
+  go_version: go1.15
+  version: v0.14.1
+api_directory_checksum: 69eae3154f9f431c193d19b4cfd2107fc6650660
 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-08-24 18:22:29.303293978 +0000 UTC
diff --git a/apis/v1alpha1/nodegroup.go b/apis/v1alpha1/nodegroup.go
diff --git a/apis/v1alpha1/types.go b/apis/v1alpha1/types.go
diff --git a/apis/v1alpha1/zz_generated.deepcopy.go b/apis/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/controller/deployment.yaml b/config/controller/deployment.yaml
@@ -41,7 +41,8 @@ spec:
         image: controller:latest
         name: controller
         ports:
-          - containerPort: 8080
+          - name: http
+            containerPort: 8080
         resources:
           limits:
             cpu: 100m

diff --git a/config/controller/service.yaml b/config/controller/service.yaml
@@ -9,6 +9,6 @@ spec:
   ports:
     - name: metricsport
       port: 8080
-      targetPort: 8080
+      targetPort: http
       protocol: TCP
-  type: NodePort
+  type: NodePort
diff --git a/config/crd/bases/eks.services.k8s.aws_addons.yaml b/config/crd/bases/eks.services.k8s.aws_addons.yaml
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.6.1
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: addons.eks.services.k8s.aws
 spec:

diff --git a/config/crd/bases/eks.services.k8s.aws_clusters.yaml b/config/crd/bases/eks.services.k8s.aws_clusters.yaml
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.6.1
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: clusters.eks.services.k8s.aws
 spec:

diff --git a/config/crd/bases/eks.services.k8s.aws_fargateprofiles.yaml b/config/crd/bases/eks.services.k8s.aws_fargateprofiles.yaml
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.6.1
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: fargateprofiles.eks.services.k8s.aws
 spec:

diff --git a/config/crd/bases/eks.services.k8s.aws_nodegroups.yaml b/config/crd/bases/eks.services.k8s.aws_nodegroups.yaml
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.6.1
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: nodegroups.eks.services.k8s.aws
 spec:

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/aws-controllers-k8s/eks-controller
 go 1.14
 
 require (
-	github.com/aws-controllers-k8s/runtime v0.12.0
+	github.com/aws-controllers-k8s/runtime v0.14.1
 	github.com/aws/aws-sdk-go v1.38.67
 	github.com/go-logr/logr v0.1.0
 	github.com/spf13/pflag v1.0.5

diff --git a/go.sum b/go.sum
@@ -23,14 +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.2.3 h1:pDDSXOJj5QLlC9OcgnGujeocQEg5U1oqQw3kUSDefLU=
-github.com/aws-controllers-k8s/runtime v0.2.3/go.mod h1:xA2F18PJerBHaqrS4de1lpP7skeSMeStkmh+3x5sWvw=
-github.com/aws-controllers-k8s/runtime v0.5.0 h1:lV2QxuEHHKS+nbJ7lYgPjwVBY6Aqw+RHJF8eDZZeswM=
-github.com/aws-controllers-k8s/runtime v0.5.0/go.mod h1:xA2F18PJerBHaqrS4de1lpP7skeSMeStkmh+3x5sWvw=
-github.com/aws-controllers-k8s/runtime v0.12.0 h1:G/lCEozh4Brsv1Ojqyl9D/whpq/YvcFtDZBWXf6YIgI=
-github.com/aws-controllers-k8s/runtime v0.12.0/go.mod h1:kG2WM4JAmLgf67cgZV9IZUkY2DsrUzsaNbmhFMfb05c=
-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/aws-controllers-k8s/runtime v0.14.1 h1:2/hCwost9rmtgsgktCtJH75U74ziWiBs0bHFOB2iaKo=
+github.com/aws-controllers-k8s/runtime v0.14.1/go.mod h1:kG2WM4JAmLgf67cgZV9IZUkY2DsrUzsaNbmhFMfb05c=
 github.com/aws/aws-sdk-go v1.37.10/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
 github.com/aws/aws-sdk-go v1.38.67 h1:OCeXMKiiM8X7HAKPCE5yD+t+sEsRaj8EwDs2tlgvX2c=
 github.com/aws/aws-sdk-go v1.38.67/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=

diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: eks-chart
-description: A Helm chart for the ACK service controller for eks
+description: A Helm chart for the ACK service controller for Amazon Elastic Kubernetes Service (EKS)
 version: v0.0.0-non-release-version
 appVersion: v0.0.0-non-release-version
 home: https://github.com/aws-controllers-k8s/eks-controller
@@ -10,7 +10,7 @@ sources:
 maintainers:
   - name: ACK Admins
     url: https://github.com/orgs/aws-controllers-k8s/teams/ack-admin
-  - name: eks Admins
+  - name: EKS Admins
     url: https://github.com/orgs/aws-controllers-k8s/teams/eks-maintainer
 keywords:
   - aws

diff --git a/helm/crds/eks.services.k8s.aws_addons.yaml b/helm/crds/eks.services.k8s.aws_addons.yaml
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.6.1
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: addons.eks.services.k8s.aws
 spec:

diff --git a/helm/crds/eks.services.k8s.aws_clusters.yaml b/helm/crds/eks.services.k8s.aws_clusters.yaml
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.6.1
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: clusters.eks.services.k8s.aws
 spec:

diff --git a/helm/crds/eks.services.k8s.aws_fargateprofiles.yaml b/helm/crds/eks.services.k8s.aws_fargateprofiles.yaml
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.6.1
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: fargateprofiles.eks.services.k8s.aws
 spec:

diff --git a/helm/crds/eks.services.k8s.aws_nodegroups.yaml b/helm/crds/eks.services.k8s.aws_nodegroups.yaml
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.6.1
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: nodegroups.eks.services.k8s.aws
 spec:

diff --git a/helm/crds/services.k8s.aws_adoptedresources.yaml b/helm/crds/services.k8s.aws_adoptedresources.yaml
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.6.1
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: adoptedresources.services.k8s.aws
 spec:

diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml
@@ -54,7 +54,8 @@ spec:
         image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
         name: controller
         ports:
-          - containerPort: {{ .Values.deployment.containerPort }}
+          - name: http
+            containerPort: {{ .Values.deployment.containerPort }}
         resources:
           {{- toYaml .Values.resources | nindent 10 }}
         env:
@@ -77,3 +78,4 @@ spec:
         - name: ACK_RESOURCE_TAGS
           value: {{ join "," .Values.resourceTags | quote }}
       terminationGracePeriodSeconds: 10
+      nodeSelector: {{ toYaml .Values.deployment.nodeSelector | nindent 8 }}
diff --git a/helm/templates/metrics-service.yaml b/helm/templates/metrics-service.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "app.fullname" . }}-metrics
+  name: {{ .Chart.Name | trimSuffix "-chart" | trunc 44 }}-controller-metrics
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ include "app.name" . }}
@@ -25,6 +25,6 @@ spec:
   ports:
   - name: metricsport
     port: 8080
-    targetPort: 8080
+    targetPort: http
     protocol: TCP
-{{- end }}
+{{- end }}
diff --git a/helm/templates/service-account.yaml b/helm/templates/service-account.yaml
@@ -10,8 +10,9 @@ metadata:
     k8s-app: {{ include "app.name" . }}
     helm.sh/chart: {{ include "chart.name-version" . }}
   name: {{ include "service-account.name" . }}
+  namespace: {{ .Release.Namespace }}
   annotations:
   {{- range $key, $value := .Values.serviceAccount.annotations }}
     {{ $key }}: {{ $value | quote }}
   {{- end }}
-{{- end }}
+{{- end }}
diff --git a/helm/values.yaml b/helm/values.yaml
@@ -15,6 +15,8 @@ deployment:
   annotations: {}
   labels: {}
   containerPort: 8080
+  nodeSelector:
+    kubernetes.io/os: linux
 
 metrics:
   service:
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.

		Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.