Skip to content

Commit a51d9b8

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

21 files changed

+276
-531
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: "2023-02-03T20:58:11Z"
3-
build_hash: ef775017fc8021baf85ad3ff2ec115df7a543568
4-
go_version: go1.19.1
5-
version: v0.23.1-1-gef77501
2+
build_date: "2023-03-22T22:33:20Z"
3+
build_hash: fa24753ea8b657d8815ae3eac7accd0958f5f9fb
4+
go_version: go1.19
5+
version: v0.25.0
66
api_directory_checksum: 1066e3b0ac63732903ec4155dba6b658fd83ef84
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.44.93

‎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/emrcontainers-controller
9-
newTag: v1.0.0
9+
newTag: v1.0.1

‎config/crd/bases/emrcontainers.services.k8s.aws_jobruns.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ spec:
8282
is submitted.
8383
type: string
8484
virtualClusterRef:
85-
description: 'AWSResourceReferenceWrapper provides a wrapper around
85+
description: "AWSResourceReferenceWrapper provides a wrapper around
8686
*AWSResourceReference type to provide more user friendly syntax
87-
for references using ''from'' field Ex: APIIDRef: from: name: my-api'
87+
for references using 'from' field Ex: APIIDRef: \n from: name: my-api"
8888
properties:
8989
from:
9090
description: AWSResourceReference provides all the values necessary

‎config/crd/kustomization.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
3-
bases:
4-
- common
53
resources:
4+
- common
65
- bases/emrcontainers.services.k8s.aws_jobruns.yaml
76
- bases/emrcontainers.services.k8s.aws_virtualclusters.yaml

‎config/default/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#commonLabels:
1313
# someName: someValue
1414

15-
bases:
15+
resources:
1616
- ../crd
1717
- ../rbac
1818
- ../controller

‎go.mod‎

Lines changed: 43 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,67 +3,76 @@ module github.com/aws-controllers-k8s/emrcontainers-controller
33
go 1.19
44

55
require (
6-
github.com/aws-controllers-k8s/runtime v0.23.0
6+
github.com/aws-controllers-k8s/runtime v0.25.0
77
github.com/aws/aws-sdk-go v1.44.93
88
github.com/ghodss/yaml v1.0.0
9-
github.com/go-logr/logr v1.2.0
9+
github.com/go-logr/logr v1.2.3
1010
github.com/spf13/pflag v1.0.5
11-
k8s.io/api v0.23.0
12-
k8s.io/apimachinery v0.23.0
13-
k8s.io/client-go v0.23.0
14-
sigs.k8s.io/controller-runtime v0.11.0
11+
k8s.io/api v0.26.1
12+
k8s.io/apimachinery v0.26.1
13+
k8s.io/client-go v0.26.1
14+
sigs.k8s.io/controller-runtime v0.14.5
1515
)
1616

1717
require (
1818
github.com/beorn7/perks v1.0.1 // indirect
19-
github.com/cenkalti/backoff/v4 v4.1.2 // indirect
20-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
19+
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
20+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
2121
github.com/davecgh/go-spew v1.1.1 // indirect
22-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
23-
github.com/fsnotify/fsnotify v1.5.1 // indirect
24-
github.com/go-logr/zapr v1.2.0 // indirect
22+
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
23+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
24+
github.com/fsnotify/fsnotify v1.6.0 // indirect
25+
github.com/go-logr/zapr v1.2.3 // indirect
26+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
27+
github.com/go-openapi/jsonreference v0.20.0 // indirect
28+
github.com/go-openapi/swag v0.19.14 // indirect
2529
github.com/gogo/protobuf v1.3.2 // indirect
2630
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
2731
github.com/golang/protobuf v1.5.2 // indirect
28-
github.com/google/go-cmp v0.5.5 // indirect
32+
github.com/google/gnostic v0.5.7-v3refs // indirect
33+
github.com/google/go-cmp v0.5.9 // indirect
2934
github.com/google/gofuzz v1.1.0 // indirect
3035
github.com/google/uuid v1.1.2 // indirect
31-
github.com/googleapis/gnostic v0.5.5 // indirect
3236
github.com/imdario/mergo v0.3.12 // indirect
3337
github.com/itchyny/gojq v0.12.6 // indirect
3438
github.com/itchyny/timefmt-go v0.1.3 // indirect
3539
github.com/jaypipes/envutil v1.0.0 // indirect
3640
github.com/jmespath/go-jmespath v0.4.0 // indirect
41+
github.com/josharian/intern v1.0.0 // indirect
3742
github.com/json-iterator/go v1.1.12 // indirect
38-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
43+
github.com/mailru/easyjson v0.7.6 // indirect
44+
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
3945
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4046
github.com/modern-go/reflect2 v1.0.2 // indirect
47+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4148
github.com/pkg/errors v0.9.1 // indirect
42-
github.com/prometheus/client_golang v1.11.0 // indirect
43-
github.com/prometheus/client_model v0.2.0 // indirect
44-
github.com/prometheus/common v0.28.0 // indirect
45-
github.com/prometheus/procfs v0.6.0 // indirect
49+
github.com/prometheus/client_golang v1.14.0 // indirect
50+
github.com/prometheus/client_model v0.3.0 // indirect
51+
github.com/prometheus/common v0.37.0 // indirect
52+
github.com/prometheus/procfs v0.8.0 // indirect
53+
github.com/samber/lo v1.37.0 // indirect
4654
go.uber.org/atomic v1.7.0 // indirect
4755
go.uber.org/multierr v1.6.0 // indirect
48-
go.uber.org/zap v1.19.1 // indirect
49-
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
50-
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
51-
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
52-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
53-
golang.org/x/text v0.3.7 // indirect
54-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
56+
go.uber.org/zap v1.24.0 // indirect
57+
golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect
58+
golang.org/x/net v0.7.0 // indirect
59+
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
60+
golang.org/x/sys v0.5.0 // indirect
61+
golang.org/x/term v0.5.0 // indirect
62+
golang.org/x/text v0.7.0 // indirect
63+
golang.org/x/time v0.3.0 // indirect
5564
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
5665
google.golang.org/appengine v1.6.7 // indirect
57-
google.golang.org/protobuf v1.27.1 // indirect
66+
google.golang.org/protobuf v1.28.1 // indirect
5867
gopkg.in/inf.v0 v0.9.1 // indirect
5968
gopkg.in/yaml.v2 v2.4.0 // indirect
60-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
61-
k8s.io/apiextensions-apiserver v0.23.0 // indirect
62-
k8s.io/component-base v0.23.0 // indirect
63-
k8s.io/klog/v2 v2.30.0 // indirect
64-
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
65-
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
66-
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
67-
sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
69+
gopkg.in/yaml.v3 v3.0.1 // indirect
70+
k8s.io/apiextensions-apiserver v0.26.1 // indirect
71+
k8s.io/component-base v0.26.1 // indirect
72+
k8s.io/klog/v2 v2.80.1 // indirect
73+
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
74+
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
75+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
76+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
6877
sigs.k8s.io/yaml v1.3.0 // indirect
6978
)

0 commit comments

Comments
 (0)