Skip to content

Commit a042ad8

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

File tree

33 files changed

+1539
-1497
lines changed

33 files changed

+1539
-1497
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-04-25T13:24:38Z"
3-
build_hash: d0f3d78cbea8061f822cbceac3786128f091efe6
4-
go_version: go1.19.6
5-
version: v0.24.2
2+
build_date: "2023-05-01T22:29:41Z"
3+
build_hash: 6657565bb742e5cd4cd340d01d5e4786b5fbabc0
4+
go_version: go1.19
5+
version: v0.26.0
66
api_directory_checksum: 6e86aa4f26729ce014485b1096286db654459af7
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.44.93

cmd/controller/main.go

Lines changed: 8 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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/ec2-controller
9-
newTag: v1.0.1
9+
newTag: v1.0.2

config/crd/kustomization.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
3-
bases:
4-
- common
53
resources:
4+
- common
65
- bases/ec2.services.k8s.aws_dhcpoptions.yaml
76
- bases/ec2.services.k8s.aws_elasticipaddresses.yaml
87
- bases/ec2.services.k8s.aws_instances.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: 41 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,69 +3,75 @@ module github.com/aws-controllers-k8s/ec2-controller
33
go 1.19
44

55
require (
6-
github.com/aws-controllers-k8s/runtime v0.24.0
6+
github.com/aws-controllers-k8s/runtime v0.26.0
77
github.com/aws/aws-sdk-go v1.44.93
8-
github.com/go-logr/logr v1.2.0
8+
github.com/go-logr/logr v1.2.3
99
github.com/spf13/pflag v1.0.5
10-
k8s.io/api v0.23.0
11-
k8s.io/apimachinery v0.23.0
12-
k8s.io/client-go v0.23.0
13-
sigs.k8s.io/controller-runtime v0.11.0
10+
k8s.io/api v0.26.1
11+
k8s.io/apimachinery v0.26.1
12+
k8s.io/client-go v0.26.1
13+
sigs.k8s.io/controller-runtime v0.14.5
1414
)
1515

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

0 commit comments

Comments
 (0)