Skip to content

Commit b5a57f9

Browse files
dependabot[bot]sushrk
authored andcommitted
Bump github.com/aws/amazon-vpc-cni-k8s from 1.18.1 to 1.18.3 (#446)
* Bump github.com/aws/amazon-vpc-cni-k8s from 1.18.1 to 1.18.3 Bumps [github.com/aws/amazon-vpc-cni-k8s](https://github.com/aws/amazon-vpc-cni-k8s) from 1.18.1 to 1.18.3. - [Release notes](https://github.com/aws/amazon-vpc-cni-k8s/releases) - [Changelog](https://github.com/aws/amazon-vpc-cni-k8s/blob/v1.18.3/CHANGELOG.md) - [Commits](aws/amazon-vpc-cni-k8s@v1.18.1...v1.18.3) --- updated-dependencies: - dependency-name: github.com/aws/amazon-vpc-cni-k8s dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * update decoder type to fix presubmit failures * update auto-generated CRD file --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: sushrk <[email protected]>
1 parent 6114597 commit b5a57f9

File tree

6 files changed

+16
-12
lines changed

6 files changed

+16
-12
lines changed

config/crd/bases/vpcresources.k8s.aws_securitygrouppolicies.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,13 @@ spec:
7979
items:
8080
type: string
8181
type: array
82+
x-kubernetes-list-type: atomic
8283
required:
8384
- key
8485
- operator
8586
type: object
8687
type: array
88+
x-kubernetes-list-type: atomic
8789
matchLabels:
8890
additionalProperties:
8991
type: string
@@ -139,11 +141,13 @@ spec:
139141
items:
140142
type: string
141143
type: array
144+
x-kubernetes-list-type: atomic
142145
required:
143146
- key
144147
- operator
145148
type: object
146149
type: array
150+
x-kubernetes-list-type: atomic
147151
matchLabels:
148152
additionalProperties:
149153
type: string

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/aws/amazon-vpc-resource-controller-k8s
33
go 1.22.5
44

55
require (
6-
github.com/aws/amazon-vpc-cni-k8s v1.18.1
6+
github.com/aws/amazon-vpc-cni-k8s v1.18.3
77
github.com/aws/aws-sdk-go v1.55.5
88
github.com/go-logr/logr v1.4.2
99
github.com/go-logr/zapr v1.3.0
@@ -12,7 +12,7 @@ require (
1212
github.com/onsi/ginkgo/v2 v2.22.0
1313
github.com/onsi/gomega v1.34.2
1414
github.com/pkg/errors v0.9.1
15-
github.com/prometheus/client_golang v1.19.0
15+
github.com/prometheus/client_golang v1.19.1
1616
github.com/prometheus/client_model v0.6.1
1717
github.com/prometheus/common v0.55.0
1818
github.com/stretchr/testify v1.9.0

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
22
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
3-
github.com/aws/amazon-vpc-cni-k8s v1.18.1 h1:u/OeBgnUUX6f3PCEOpA4dbG0+iZ71CnY6tEljjrl3iw=
4-
github.com/aws/amazon-vpc-cni-k8s v1.18.1/go.mod h1:m/J5GsxF0Th2iQTOE3ww4W9LFvwdC0tGyA9dIL4h6iQ=
3+
github.com/aws/amazon-vpc-cni-k8s v1.18.3 h1:qdkbo5yffFXg7FK/pmCHlxzXmEAFn+vDzzihFEkYbgM=
4+
github.com/aws/amazon-vpc-cni-k8s v1.18.3/go.mod h1:Xy7pF9qmE5mdiEkfgzr2HJNJmH3ARxKuOTWoxC1VO64=
55
github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU=
66
github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
77
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
@@ -17,8 +17,8 @@ github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxER
1717
github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
1818
github.com/evanphx/json-patch v5.7.0+incompatible h1:vgGkfT/9f8zE6tvSCe74nfpAVDQ2tG6yudJd8LBksgI=
1919
github.com/evanphx/json-patch v5.7.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
20-
github.com/evanphx/json-patch/v5 v5.8.0 h1:lRj6N9Nci7MvzrXuX6HFzU8XjmhPiXPlsKEy1u0KQro=
21-
github.com/evanphx/json-patch/v5 v5.8.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ=
20+
github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg=
21+
github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ=
2222
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
2323
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
2424
github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=

webhooks/core/annotation_validation_webhook.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ import (
3434
// AnnotationValidator validates the resource allocated to the Pod via annotations. The WebHook
3535
// prevents unauthorized user from modifying/removing these Annotations.
3636
type AnnotationValidator struct {
37-
decoder *admission.Decoder
37+
decoder admission.Decoder
3838
Condition condition.Conditions
3939
Log logr.Logger
4040
Checker healthz.Checker
4141
}
4242

43-
func NewAnnotationValidator(condition condition.Conditions, log logr.Logger, d *admission.Decoder, healthzHandler *rcHealthz.HealthzHandler) *AnnotationValidator {
43+
func NewAnnotationValidator(condition condition.Conditions, log logr.Logger, d admission.Decoder, healthzHandler *rcHealthz.HealthzHandler) *AnnotationValidator {
4444
annotationValidator := &AnnotationValidator{
4545
Condition: condition,
4646
Log: log,

webhooks/core/node_update_webhook.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ import (
1515
)
1616

1717
type NodeUpdateWebhook struct {
18-
decoder *admission.Decoder
18+
decoder admission.Decoder
1919
Condition condition.Conditions
2020
Log logr.Logger
2121
Checker healthz.Checker
2222
}
2323

24-
func NewNodeUpdateWebhook(condition condition.Conditions, log logr.Logger, d *admission.Decoder, healthzHandler *rcHealthz.HealthzHandler) *NodeUpdateWebhook {
24+
func NewNodeUpdateWebhook(condition condition.Conditions, log logr.Logger, d admission.Decoder, healthzHandler *rcHealthz.HealthzHandler) *NodeUpdateWebhook {
2525
nodeUpdateWebhook := &NodeUpdateWebhook{
2626
Condition: condition,
2727
Log: log,

webhooks/core/pod_webhook.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const (
4141

4242
// PodResourceInjector injects resources into Pods
4343
type PodMutationWebHook struct {
44-
decoder *admission.Decoder
44+
decoder admission.Decoder
4545
SGPAPI utils.SecurityGroupForPodsAPI
4646
Log logr.Logger
4747
Condition condition.Conditions
@@ -51,7 +51,7 @@ func NewPodMutationWebHook(
5151
sgpAPI utils.SecurityGroupForPodsAPI,
5252
log logr.Logger,
5353
condition condition.Conditions,
54-
d *admission.Decoder,
54+
d admission.Decoder,
5555
healthzHandler *rcHealthz.HealthzHandler,
5656
) *PodMutationWebHook {
5757
podWebhook := &PodMutationWebHook{

0 commit comments

Comments
 (0)