Skip to content

Commit

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

----------

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

----------

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

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

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

----------

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

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

----------

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 Aug 29, 2024
1 parent 57d8a33 commit a331c2a
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 17 deletions.
8 changes: 4 additions & 4 deletions apis/v1alpha1/ack-generate-metadata.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ack_generate_info:
build_date: "2024-08-20T20:18:07Z"
build_hash: c30e0689877bfe2083e7b2f84e1c450d2ba9bf2e
go_version: go1.22.4
version: v0.37.0-4-gc30e068
build_date: "2024-08-29T17:16:14Z"
build_hash: f8f98563404066ac3340db0a049d2e530e5c51cc
go_version: go1.22.5
version: v0.38.1
api_directory_checksum: 4bad34d3dca935f62b2fe6fa1a3d6e6ebac5995b
api_version: v1alpha1
aws_sdk_go_version: v1.51.21
Expand Down
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/wafv2-controller
newTag: 0.0.1
newTag: 0.0.2
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ go 1.22.0
toolchain go1.22.5

require (
github.com/aws-controllers-k8s/runtime v0.36.0
github.com/aws-controllers-k8s/runtime v0.38.0
github.com/aws/aws-sdk-go v1.51.21
github.com/go-logr/logr v1.4.1
github.com/spf13/pflag v1.0.5
k8s.io/api v0.30.1
k8s.io/apimachinery v0.30.1
k8s.io/client-go v0.30.1
sigs.k8s.io/controller-runtime v0.18.4
Expand All @@ -21,7 +23,6 @@ require (
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
Expand Down Expand Up @@ -66,7 +67,6 @@ require (
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.30.1 // indirect
k8s.io/apiextensions-apiserver v0.30.1 // indirect
k8s.io/klog/v2 v2.120.1 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github.com/aws-controllers-k8s/runtime v0.36.0 h1:XEMVGfUwsT9QMShihuCLHlape+daJWyYtXj45s/iJiU=
github.com/aws-controllers-k8s/runtime v0.36.0/go.mod h1:gI2pWb20UGLP2SnHf1a1VzTd7iVVy+/I9VAzT0Y+Dew=
github.com/aws-controllers-k8s/runtime v0.38.0 h1:gSEpmBm7OwTPd2kIOU+AIDIivi3teSm5FFrhROfu4wg=
github.com/aws-controllers-k8s/runtime v0.38.0/go.mod h1:gI2pWb20UGLP2SnHf1a1VzTd7iVVy+/I9VAzT0Y+Dew=
github.com/aws/aws-sdk-go v1.51.21 h1:UrT6JC9R9PkYYXDZBV0qDKTualMr+bfK2eboTknMgbs=
github.com/aws/aws-sdk-go v1.51.21/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
Expand Down
4 changes: 2 additions & 2 deletions helm/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
name: wafv2-chart
description: A Helm chart for the ACK service controller for AWS Web Application Firewall (WAF)
version: 0.0.1
appVersion: 0.0.1
version: 0.0.2
appVersion: 0.0.2
home: https://github.com/aws-controllers-k8s/wafv2-controller
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
sources:
Expand Down
2 changes: 1 addition & 1 deletion helm/templates/NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{ .Chart.Name }} has been installed.
This chart deploys "public.ecr.aws/aws-controllers-k8s/wafv2-controller:0.0.1".
This chart deploys "public.ecr.aws/aws-controllers-k8s/wafv2-controller:0.0.2".

Check its status by running:
kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"
Expand Down
7 changes: 5 additions & 2 deletions helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

image:
repository: public.ecr.aws/aws-controllers-k8s/wafv2-controller
tag: 0.0.1
tag: 0.0.2
pullPolicy: IfNotPresent
pullSecrets: []

Expand Down Expand Up @@ -158,4 +158,7 @@ leaderElection:
# can be individually enabled ("true") or disabled ("false") by adding key/value
# pairs below.
featureGates:
CARMv2: false
# Enables the Service level granularity for CARM. See https://github.com/aws-controllers-k8s/community/issues/2031
ServiceLevelCARM: false
# Enables the Team level granularity for CARM. See https://github.com/aws-controllers-k8s/community/issues/2031
TeamLevelCARM: false
6 changes: 5 additions & 1 deletion pkg/resource/ip_set/manager_factory.go

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

6 changes: 5 additions & 1 deletion pkg/resource/rule_group/manager_factory.go

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

0 comments on commit a331c2a

Please sign in to comment.