Skip to content

Commit

Permalink
Update to ACK runtime v0.29.2, code-generator v0.29.2 (#11)
Browse files Browse the repository at this point in the history
### Update to ACK runtime `v0.29.2`, code-generator `v0.29.2`

----------

* ACK code-generator `v0.29.2` [release notes](https://github.com/aws-controllers-k8s/code-generator/releases/tag/v0.29.2)
* ACK runtime `v0.29.2` [release notes](https://github.com/aws-controllers-k8s/runtime/releases/tag/v0.29.2)

----------

NOTE:
This PR increments the release version of service controller from `v0.0.2` to `v0.0.3`

Once this PR is merged, release `v0.0.3` will be automatically created for `route53resolver-controller`

**Please close this PR, if you do not want the new patch release for `route53resolver-controller`**

----------

#### stdout for `make build-controller`:

```
building ack-generate ... ok.
==== building route53resolver-controller ====
Copying common custom resource definitions into route53resolver
Building Kubernetes API objects for route53resolver
Generating deepcopy code for route53resolver
Generating custom resource definitions for route53resolver
Building service controller for route53resolver
Generating RBAC manifests for route53resolver
Running gofmt against generated code for route53resolver
Updating additional GitHub repository maintenance files
==== building route53resolver-controller release artifacts ====
Building release artifacts for route53resolver-v0.0.3
Generating common custom resource definitions
Generating custom resource definitions for route53resolver
Generating RBAC manifests for route53resolver
```

----------

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
  • Loading branch information
ack-bot authored Jan 29, 2024
1 parent 264e29c commit cfaa29d
Show file tree
Hide file tree
Showing 27 changed files with 624 additions and 757 deletions.
10 changes: 5 additions & 5 deletions apis/v1alpha1/ack-generate-metadata.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
ack_generate_info:
build_date: "2023-08-24T09:36:38Z"
build_hash: 5e27da33ea64b2a6ce958a72a8a8c43e65f815ca
go_version: go1.19
version: v0.26.1-10-g5e27da3
api_directory_checksum: c0922b065d0f77097536ec816227f1d7ff2308cc
build_date: "2024-01-29T07:05:57Z"
build_hash: 92f531cde5631865cfc3dfa778cbc9611f3a64c3
go_version: go1.21.5
version: v0.29.2
api_directory_checksum: db7b85ae40c80ffe3e267cfb8c787f315b1f1d8f
api_version: v1alpha1
aws_sdk_go_version: v1.44.300
generator_config_info:
Expand Down
2 changes: 1 addition & 1 deletion apis/v1alpha1/resolver_endpoint.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apis/v1alpha1/resolver_rule.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 32 additions & 9 deletions cmd/controller/main.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 10 additions & 3 deletions config/controller/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,16 @@ spec:
- "$(AWS_REGION)"
- --aws-endpoint-url
- "$(AWS_ENDPOINT_URL)"
- --enable-development-logging
- "$(ACK_ENABLE_DEVELOPMENT_LOGGING)"
- --enable-development-logging=$(ACK_ENABLE_DEVELOPMENT_LOGGING)
- --log-level
- "$(ACK_LOG_LEVEL)"
- --resource-tags
- "$(ACK_RESOURCE_TAGS)"
- --watch-namespace
- "$(ACK_WATCH_NAMESPACE)"
- --enable-leader-election=$(ENABLE_LEADER_ELECTION)
- --leader-election-namespace
- "$(LEADER_ELECTION_NAMESPACE)"
image: controller:latest
name: controller
ports:
Expand Down Expand Up @@ -66,6 +68,10 @@ spec:
value: "info"
- name: ACK_RESOURCE_TAGS
value: "services.k8s.aws/controller-version=%CONTROLLER_SERVICE%-%CONTROLLER_VERSION%,services.k8s.aws/namespace=%K8S_NAMESPACE%"
- name: ENABLE_LEADER_ELECTION
value: "false"
- name: LEADER_ELECTION_NAMESPACE
value: "ack-system"
securityContext:
allowPrivilegeEscalation: false
privileged: false
Expand All @@ -79,5 +85,6 @@ spec:
terminationGracePeriodSeconds: 10
serviceAccountName: ack-route53resolver-controller
hostIPC: false
hostNetwork: false
hostPID: false
hostNetwork: false
dnsPolicy: ClusterFirst
2 changes: 1 addition & 1 deletion config/controller/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ kind: Kustomization
images:
- name: controller
newName: public.ecr.aws/aws-controllers-k8s/route53resolver-controller
newTag: 0.0.2
newTag: 0.0.3
3 changes: 2 additions & 1 deletion config/rbac/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ resources:
- role-reader.yaml
- role-writer.yaml
- service-account.yaml

- leader-election-role.yaml
- leader-election-role-binding.yaml
14 changes: 14 additions & 0 deletions config/rbac/leader-election-role-binding.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
namespace: ack-system
name: route53resolver-leader-election-rolebinding
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: route53resolver-leader-election-role
subjects:
- kind: ServiceAccount
name: ack-route53resolver-controller
namespace: ack-system
26 changes: 26 additions & 0 deletions config/rbac/leader-election-role.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: route53resolver-leader-election-role
namespace: ack-system
rules:
- apiGroups:
- coordination.k8s.io
resources:
- leases
verbs:
- get
- list
- watch
- create
- update
- patch
- delete
- apiGroups:
- ""
resources:
- events
verbs:
- create
- patch
89 changes: 45 additions & 44 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,78 +1,79 @@
module github.com/aws-controllers-k8s/route53resolver-controller

go 1.19
go 1.21

toolchain go1.21.5

require (
github.com/aws-controllers-k8s/runtime v0.26.0
github.com/aws/aws-sdk-go v1.44.300
github.com/aws-controllers-k8s/ec2-controller v1.0.4
github.com/aws-controllers-k8s/runtime v0.29.2
github.com/aws/aws-sdk-go v1.49.0
github.com/go-logr/logr v1.2.4
github.com/samber/lo v1.37.0
github.com/spf13/pflag v1.0.5
k8s.io/apimachinery v0.26.1
k8s.io/client-go v0.26.1
sigs.k8s.io/controller-runtime v0.14.5
k8s.io/api v0.28.3
k8s.io/apimachinery v0.28.3
k8s.io/client-go v0.28.3
sigs.k8s.io/controller-runtime v0.16.3
)

require (
github.com/aws-controllers-k8s/ec2-controller v1.0.4 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/zapr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
github.com/go-logr/zapr v1.2.4 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/uuid v1.1.2 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/itchyny/gojq v0.12.6 // indirect
github.com/itchyny/timefmt-go v0.1.3 // indirect
github.com/jaypipes/envutil v1.0.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/samber/lo v1.37.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/term v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.3.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.1 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.26.1 // indirect
k8s.io/apiextensions-apiserver v0.26.1 // indirect
k8s.io/component-base v0.26.1 // indirect
k8s.io/klog/v2 v2.80.1 // indirect
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
k8s.io/apiextensions-apiserver v0.28.3 // indirect
k8s.io/component-base v0.28.3 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)
Loading

0 comments on commit cfaa29d

Please sign in to comment.