Skip to content

Commit a2db80d

Browse files
ack-botack-bot
authored
Update to ACK runtime v0.39.0, code-generator v0.39.1 (#24)
### Update to ACK runtime `v0.39.0`, code-generator `v0.39.1` ---------- * ACK code-generator `v0.39.1` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.39.1) * ACK runtime `v0.39.0` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.39.0) ---------- NOTE: This PR increments the release version of service controller from `v0.0.10` to `v0.0.11` Once this PR is merged, release `v0.0.11` will be automatically created for `secretsmanager-controller` **Please close this PR, if you do not want the new patch release for `secretsmanager-controller`** ---------- #### stdout for `make build-controller`: ``` building ack-generate ... ok. ==== building secretsmanager-controller ==== Copying common custom resource definitions into secretsmanager Building Kubernetes API objects for secretsmanager Generating deepcopy code for secretsmanager Generating custom resource definitions for secretsmanager Building service controller for secretsmanager Generating RBAC manifests for secretsmanager Running gofmt against generated code for secretsmanager Updating additional GitHub repository maintenance files ==== building secretsmanager-controller release artifacts ==== Building release artifacts for secretsmanager-v0.0.11 Generating common custom resource definitions Generating custom resource definitions for secretsmanager Generating RBAC manifests for secretsmanager ``` ---------- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 256940d commit a2db80d

16 files changed

+123
-211
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ack_generate_info:
2-
build_date: "2024-08-29T17:04:53Z"
3-
build_hash: f8f98563404066ac3340db0a049d2e530e5c51cc
4-
go_version: go1.22.5
5-
version: v0.38.1
2+
build_date: "2024-10-10T04:01:18Z"
3+
build_hash: 36c2d234498c2bc4f60773ab8df632af4067f43b
4+
go_version: go1.23.2
5+
version: v0.39.1
66
api_directory_checksum: cc390ec9f86ff4675e9b88a2a5ef5dd9aedf3b0c
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.49.0

‎config/controller/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ kind: Kustomization
66
images:
77
- name: controller
88
newName: public.ecr.aws/aws-controllers-k8s/secretsmanager-controller
9-
newTag: 0.0.10
9+
newTag: 0.0.11

‎config/crd/bases/secretsmanager.services.k8s.aws_secrets.yaml

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.16.2
77
name: secrets.secretsmanager.services.k8s.aws
88
spec:
99
group: secretsmanager.services.k8s.aws
@@ -54,15 +54,12 @@ spec:
5454
example alias/aws/secretsmanager. For more information, see About aliases
5555
(https://docs.aws.amazon.com/kms/latest/developerguide/alias-about.html).
5656
57-
5857
To use a KMS key in a different account, use the key ARN or the alias ARN.
5958
60-
6159
If you don't specify this value, then Secrets Manager uses the key aws/secretsmanager.
6260
If that key doesn't yet exist, then Secrets Manager creates it for you automatically
6361
the first time it encrypts the secret value.
6462
65-
6663
If the secret is in a different Amazon Web Services account from the credentials
6764
calling the API, then you can't use aws/secretsmanager to encrypt the secret,
6865
and you must create and use a customer managed KMS key.
@@ -71,11 +68,9 @@ spec:
7168
description: |-
7269
The name of the new secret.
7370
74-
7571
The secret name can contain ASCII letters, numbers, and the following characters:
7672
/_+=.@-
7773
78-
7974
Do not end your secret name with a hyphen followed by six characters. If
8075
you do so, you risk confusion and unexpected results when searching for a
8176
secret by partial ARN. Secrets Manager automatically adds a hyphen and six
@@ -98,10 +93,8 @@ spec:
9893
The text data to encrypt and store in this new version of the secret. We
9994
recommend you use a JSON structure of key/value pairs for your secret value.
10095
101-
10296
Either SecretString or SecretBinary must have a value, but not both.
10397
104-
10598
If you create a secret by using the Secrets Manager console then Secrets
10699
Manager puts the protected secret text in only the SecretString parameter.
107100
The Secrets Manager console stores the information as a JSON structure of
@@ -127,29 +120,24 @@ spec:
127120
A list of tags to attach to the secret. Each tag is a key and value pair
128121
of strings in a JSON text string, for example:
129122
130-
131123
[{"Key":"CostCenter","Value":"12345"},{"Key":"environment","Value":"production"}]
132124
133-
134125
Secrets Manager tag key names are case sensitive. A tag with the key "ABC"
135126
is a different tag from one with key "abc".
136127
137-
138128
If you check tags in permissions policies as part of your security strategy,
139129
then adding or removing a tag can change permissions. If the completion of
140130
this operation would result in you losing your permissions for this secret,
141131
then Secrets Manager blocks the operation and returns an Access Denied error.
142132
For more information, see Control access to secrets using tags (https://docs.aws.amazon.com/secretsmanager/latest/userguide/auth-and-access_examples.html#tag-secrets-abac)
143133
and Limit access to identities with tags that match secrets' tags (https://docs.aws.amazon.com/secretsmanager/latest/userguide/auth-and-access_examples.html#auth-and-access_tags2).
144134
145-
146135
For information about how to format a JSON parameter for the various command
147136
line tool environments, see Using JSON for Parameters (https://docs.aws.amazon.com/cli/latest/userguide/cli-using-param.html#cli-using-param-json).
148137
If your command-line tool or SDK requires quotation marks around the parameter,
149138
you should use single quotes to avoid confusion with the double quotes required
150139
in the JSON text.
151140
152-
153141
For tag quotas and naming restrictions, see Service quotas for Tagging (https://docs.aws.amazon.com/general/latest/gr/arg.html#taged-reference-quotas)
154142
in the Amazon Web Services General Reference guide.
155143
items:
@@ -181,7 +169,6 @@ spec:
181169
when it has verified that an "adopted" resource (a resource where the
182170
ARN annotation was set by the Kubernetes user on the CR) exists and
183171
matches the supplied CR's Spec field values.
184-
TODO(vijat@): Find a better strategy for resources that do not have ARN in CreateOutputResponse
185172
https://github.com/aws/aws-controllers-k8s/issues/270
186173
type: string
187174
ownerAccountID:
@@ -239,14 +226,11 @@ spec:
239226
description: |-
240227
A list of the replicas of this secret and their status:
241228
242-
243229
* Failed, which indicates that the replica was not created.
244230
245-
246231
* InProgress, which indicates that Secrets Manager is in the process of
247232
creating the replica.
248233
249-
250234
* InSync, which indicates that the replica was created.
251235
items:
252236
description: |-

‎config/crd/common/bases/services.k8s.aws_adoptedresources.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.16.2
77
name: adoptedresources.services.k8s.aws
88
spec:
99
group: services.k8s.aws
@@ -78,11 +78,9 @@ spec:
7878
automatically converts this to an arbitrary string-string map.
7979
https://github.com/kubernetes-sigs/controller-tools/issues/385
8080
81-
8281
Active discussion about inclusion of this field in the spec is happening in this PR:
8382
https://github.com/kubernetes-sigs/controller-tools/pull/395
8483
85-
8684
Until this is allowed, or if it never is, we will produce a subset of the object meta
8785
that contains only the fields which the user is allowed to modify in the metadata.
8886
properties:
@@ -105,13 +103,11 @@ spec:
105103
and may be truncated by the length of the suffix required to make the value
106104
unique on the server.
107105
108-
109106
If this field is specified and the generated name exists, the server will
110107
NOT return a 409 - instead, it will either return 201 Created or 500 with Reason
111108
ServerTimeout indicating a unique name could not be found in the time allotted, and the client
112109
should retry (optionally after the time indicated in the Retry-After header).
113110
114-
115111
Applied only if Name is not specified.
116112
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#idempotency
117113
type: string
@@ -140,7 +136,6 @@ spec:
140136
Not all objects are required to be scoped to a namespace - the value of this field for
141137
those objects will be empty.
142138
143-
144139
Must be a DNS_LABEL.
145140
Cannot be updated.
146141
More info: http://kubernetes.io/docs/user-guide/namespaces

‎config/crd/common/bases/services.k8s.aws_fieldexports.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.16.2
77
name: fieldexports.services.k8s.aws
88
spec:
99
group: services.k8s.aws

‎config/rbac/cluster-role-controller.yaml

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ rules:
88
- ""
99
resources:
1010
- configmaps
11+
- secrets
1112
verbs:
1213
- get
1314
- list
@@ -21,15 +22,6 @@ rules:
2122
- get
2223
- list
2324
- watch
24-
- apiGroups:
25-
- ""
26-
resources:
27-
- secrets
28-
verbs:
29-
- get
30-
- list
31-
- patch
32-
- watch
3325
- apiGroups:
3426
- secretsmanager.services.k8s.aws
3527
resources:
@@ -54,25 +46,6 @@ rules:
5446
- services.k8s.aws
5547
resources:
5648
- adoptedresources
57-
verbs:
58-
- create
59-
- delete
60-
- get
61-
- list
62-
- patch
63-
- update
64-
- watch
65-
- apiGroups:
66-
- services.k8s.aws
67-
resources:
68-
- adoptedresources/status
69-
verbs:
70-
- get
71-
- patch
72-
- update
73-
- apiGroups:
74-
- services.k8s.aws
75-
resources:
7649
- fieldexports
7750
verbs:
7851
- create
@@ -85,6 +58,7 @@ rules:
8558
- apiGroups:
8659
- services.k8s.aws
8760
resources:
61+
- adoptedresources/status
8862
- fieldexports/status
8963
verbs:
9064
- get

‎go.mod

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,36 @@ go 1.22.0
55
toolchain go1.22.5
66

77
require (
8-
github.com/aws-controllers-k8s/runtime v0.38.0
8+
github.com/aws-controllers-k8s/runtime v0.39.0
99
github.com/aws/aws-sdk-go v1.49.0
10-
github.com/go-logr/logr v1.4.1
10+
github.com/go-logr/logr v1.4.2
1111
github.com/spf13/pflag v1.0.5
12-
k8s.io/api v0.30.1
13-
k8s.io/apimachinery v0.30.1
14-
k8s.io/client-go v0.30.1
15-
sigs.k8s.io/controller-runtime v0.18.4
12+
k8s.io/api v0.31.0
13+
k8s.io/apimachinery v0.31.0
14+
k8s.io/client-go v0.31.0
15+
sigs.k8s.io/controller-runtime v0.19.0
1616
)
1717

1818
require (
1919
github.com/beorn7/perks v1.0.1 // indirect
20-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
21-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
22-
github.com/davecgh/go-spew v1.1.1 // indirect
20+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
21+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
22+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2323
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
2424
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
2525
github.com/fsnotify/fsnotify v1.7.0 // indirect
26+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
2627
github.com/go-logr/zapr v1.3.0 // indirect
2728
github.com/go-openapi/jsonpointer v0.19.6 // indirect
2829
github.com/go-openapi/jsonreference v0.20.2 // indirect
29-
github.com/go-openapi/swag v0.22.3 // indirect
30+
github.com/go-openapi/swag v0.22.4 // indirect
3031
github.com/gogo/protobuf v1.3.2 // indirect
3132
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3233
github.com/golang/protobuf v1.5.4 // indirect
3334
github.com/google/gnostic-models v0.6.8 // indirect
3435
github.com/google/go-cmp v0.6.0 // indirect
3536
github.com/google/gofuzz v1.2.0 // indirect
36-
github.com/google/uuid v1.3.0 // indirect
37+
github.com/google/uuid v1.6.0 // indirect
3738
github.com/imdario/mergo v0.3.12 // indirect
3839
github.com/itchyny/gojq v0.12.6 // indirect
3940
github.com/itchyny/timefmt-go v0.1.3 // indirect
@@ -42,35 +43,34 @@ require (
4243
github.com/josharian/intern v1.0.0 // indirect
4344
github.com/json-iterator/go v1.1.12 // indirect
4445
github.com/mailru/easyjson v0.7.7 // indirect
45-
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
4646
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4747
github.com/modern-go/reflect2 v1.0.2 // indirect
4848
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4949
github.com/pkg/errors v0.9.1 // indirect
50-
github.com/prometheus/client_golang v1.18.0 // indirect
51-
github.com/prometheus/client_model v0.5.0 // indirect
52-
github.com/prometheus/common v0.45.0 // indirect
53-
github.com/prometheus/procfs v0.12.0 // indirect
50+
github.com/prometheus/client_golang v1.19.1 // indirect
51+
github.com/prometheus/client_model v0.6.1 // indirect
52+
github.com/prometheus/common v0.55.0 // indirect
53+
github.com/prometheus/procfs v0.15.1 // indirect
5454
github.com/samber/lo v1.37.0 // indirect
55+
github.com/x448/float16 v0.8.4 // indirect
5556
go.uber.org/multierr v1.11.0 // indirect
5657
go.uber.org/zap v1.26.0 // indirect
57-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
58-
golang.org/x/net v0.23.0 // indirect
59-
golang.org/x/oauth2 v0.12.0 // indirect
60-
golang.org/x/sys v0.18.0 // indirect
61-
golang.org/x/term v0.18.0 // indirect
62-
golang.org/x/text v0.14.0 // indirect
58+
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
59+
golang.org/x/net v0.26.0 // indirect
60+
golang.org/x/oauth2 v0.21.0 // indirect
61+
golang.org/x/sys v0.21.0 // indirect
62+
golang.org/x/term v0.21.0 // indirect
63+
golang.org/x/text v0.16.0 // indirect
6364
golang.org/x/time v0.3.0 // indirect
6465
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
65-
google.golang.org/appengine v1.6.7 // indirect
66-
google.golang.org/protobuf v1.33.0 // indirect
66+
google.golang.org/protobuf v1.34.2 // indirect
6767
gopkg.in/inf.v0 v0.9.1 // indirect
6868
gopkg.in/yaml.v2 v2.4.0 // indirect
6969
gopkg.in/yaml.v3 v3.0.1 // indirect
70-
k8s.io/apiextensions-apiserver v0.30.1 // indirect
71-
k8s.io/klog/v2 v2.120.1 // indirect
70+
k8s.io/apiextensions-apiserver v0.31.0 // indirect
71+
k8s.io/klog/v2 v2.130.1 // indirect
7272
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
73-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
73+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
7474
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
7575
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
7676
sigs.k8s.io/yaml v1.4.0 // indirect

0 commit comments

Comments
 (0)