Skip to content

Commit a4d9186

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

34 files changed

+463
-105
lines changed

CODE_OF_CONDUCT.md

Lines changed: 0 additions & 2 deletions
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
opensource-codeofconduct@amazon.com with any additional questions or comments.
6-

CONTRIBUTING.md

Lines changed: 53 additions & 19 deletions
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:
2027

21-
1. You are working against the latest source on the *master* 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.
28+
Contributions via pull requests are much appreciated. Before sending us a pull
29+
request, please ensure that:
30+
31+
1. You are working against the latest source on the *main* branch.
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.github.io/aws-controllers-k8s/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 opensource-codeofconduct@amazon.com 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.

GOVERNANCE.md

Lines changed: 2 additions & 3 deletions
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-

LICENSE

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,4 +173,3 @@
173173
defend, and hold each Contributor harmless for any liability
174174
incurred by, or claims asserted against, such Contributor by reason
175175
of your accepting any such warranty or additional liability.
176-

NOTICE

Lines changed: 1 addition & 2 deletions
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.
Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
ack_generate_info:
2-
build_date: "2021-06-24T15:56:57Z"
3-
build_hash: 9c35918f8a98b41ada10cb3aa460dbf463428463
4-
go_version: go1.16.4 linux/amd64
5-
version: v0.2.3
6-
api_directory_checksum: 47e144cfdead35e46f2c19a5e9444d9b007a73cd
2+
build_date: "2021-09-23T18:48:34Z"
3+
build_hash: e4d7c2aabd8113176b0662bb3d31751914e2c5e9
4+
go_version: go1.16.5
5+
version: v0.14.1
6+
api_directory_checksum: f9f6f75a4ec0768aad1bb43e329e72a14291cd2b
77
api_version: v1alpha1
8-
aws_sdk_go_version: v1.38.60
8+
aws_sdk_go_version: v1.37.10
99
generator_config_info:
1010
file_checksum: fa56fb1e36e77b89a1cdbaa40e311c356914edb6
1111
original_file_name: generator.yaml
1212
last_modification:
1313
reason: API generation
14-
timestamp: 2021-06-24 15:56:58.608690064 +0000 UTC

apis/v1alpha1/broker.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/v1alpha1/generator.yaml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
ignore:
2+
resource_names:
3+
- Configuration
4+
- User
5+
resources:
6+
Broker:
7+
hooks:
8+
sdk_update_pre_build_request:
9+
template_path: hooks/sdk_update_pre_build_request.go.tpl
10+
sdk_delete_pre_build_request:
11+
template_path: hooks/sdk_delete_pre_build_request.go.tpl
12+
sdk_read_one_post_set_output:
13+
template_path: hooks/sdk_read_one_post_set_output.go.tpl
14+
sdk_update_pre_set_output:
15+
template_path: hooks/sdk_update_pre_set_output.go.tpl
16+
renames:
17+
operations:
18+
CreateBroker:
19+
input_fields:
20+
BrokerName: Name
21+
fields:
22+
BrokerState:
23+
from:
24+
operation: DescribeBroker
25+
path: BrokerState
26+
is_read_only: true
27+
BrokerInstances:
28+
from:
29+
operation: DescribeBroker
30+
path: BrokerInstances
31+
is_read_only: true
32+
Users:
33+
compare:
34+
# NOTE(jaypipes): For RabbitMQ brokers, the Users field returned by
35+
# DescribeBroker is *always* an empty slice because the only settable
36+
# user information at the moment is for the single admin user. So, as
37+
# a workaround for right now to prevent update calls from being made
38+
# unnecessarily, we ignore Users for the purposes of comparing
39+
# resources.
40+
is_ignored: true
41+
Users..Password:
42+
is_secret: true

cmd/controller/main.go

Lines changed: 35 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/controller/deployment.yaml

Lines changed: 2 additions & 1 deletion
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

0 commit comments

Comments
 (0)