Skip to content

Commit 6906cc3

Browse files
SgtCoDFishSgtCoDFish
authored
Merge pull request #637 from jetstack/bump_vencon
Upgrade venafi-connection-lib dependency
2 parents b74514d + 7e2a773 commit 6906cc3

File tree

6 files changed

+121
-113
lines changed

6 files changed

+121
-113
lines changed

‎deploy/charts/venafi-kubernetes-agent/crd_bases/jetstack.io_venaficonnections.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -284,10 +284,10 @@ spec:
284284
type: object
285285
x-kubernetes-validations:
286286
- message: must have exactly one field set
287-
rule: '(has(self.secret) ? 1 : 0) + (has(self.serviceAccountToken)
287+
rule: '((has(self.secret) ? 1 : 0) + (has(self.serviceAccountToken)
288288
? 1 : 0) + (has(self.hashicorpVaultOAuth) ? 1 : 0) + (has(self.hashicorpVaultSecret)
289289
? 1 : 0) + (has(self.hashicorpVaultLDAP) ? 1 : 0) + (has(self.tppOAuth)
290-
? 1 : 0) + (has(self.vcpOAuth) ? 1 : 0) == 1'
290+
? 1 : 0) + (has(self.vcpOAuth) ? 1 : 0)) == 1'
291291
maxItems: 50
292292
type: array
293293
x-kubernetes-list-type: atomic
@@ -495,10 +495,10 @@ spec:
495495
type: object
496496
x-kubernetes-validations:
497497
- message: must have exactly one field set
498-
rule: '(has(self.secret) ? 1 : 0) + (has(self.serviceAccountToken)
498+
rule: '((has(self.secret) ? 1 : 0) + (has(self.serviceAccountToken)
499499
? 1 : 0) + (has(self.hashicorpVaultOAuth) ? 1 : 0) + (has(self.hashicorpVaultSecret)
500500
? 1 : 0) + (has(self.hashicorpVaultLDAP) ? 1 : 0) + (has(self.tppOAuth)
501-
? 1 : 0) + (has(self.vcpOAuth) ? 1 : 0) == 1'
501+
? 1 : 0) + (has(self.vcpOAuth) ? 1 : 0)) == 1'
502502
maxItems: 50
503503
type: array
504504
x-kubernetes-list-type: atomic
@@ -692,10 +692,10 @@ spec:
692692
type: object
693693
x-kubernetes-validations:
694694
- message: must have exactly one field set
695-
rule: '(has(self.secret) ? 1 : 0) + (has(self.serviceAccountToken)
695+
rule: '((has(self.secret) ? 1 : 0) + (has(self.serviceAccountToken)
696696
? 1 : 0) + (has(self.hashicorpVaultOAuth) ? 1 : 0) + (has(self.hashicorpVaultSecret)
697697
? 1 : 0) + (has(self.hashicorpVaultLDAP) ? 1 : 0) + (has(self.tppOAuth)
698-
? 1 : 0) + (has(self.vcpOAuth) ? 1 : 0) == 1'
698+
? 1 : 0) + (has(self.vcpOAuth) ? 1 : 0)) == 1'
699699
maxItems: 50
700700
type: array
701701
x-kubernetes-list-type: atomic
@@ -902,10 +902,10 @@ spec:
902902
type: object
903903
x-kubernetes-validations:
904904
- message: must have exactly one field set
905-
rule: '(has(self.secret) ? 1 : 0) + (has(self.serviceAccountToken)
905+
rule: '((has(self.secret) ? 1 : 0) + (has(self.serviceAccountToken)
906906
? 1 : 0) + (has(self.hashicorpVaultOAuth) ? 1 : 0) + (has(self.hashicorpVaultSecret)
907907
? 1 : 0) + (has(self.hashicorpVaultLDAP) ? 1 : 0) + (has(self.tppOAuth)
908-
? 1 : 0) + (has(self.vcpOAuth) ? 1 : 0) == 1'
908+
? 1 : 0) + (has(self.vcpOAuth) ? 1 : 0)) == 1'
909909
maxItems: 50
910910
type: array
911911
x-kubernetes-list-type: atomic
@@ -1099,10 +1099,10 @@ spec:
10991099
type: object
11001100
x-kubernetes-validations:
11011101
- message: must have exactly one field set
1102-
rule: '(has(self.secret) ? 1 : 0) + (has(self.serviceAccountToken)
1102+
rule: '((has(self.secret) ? 1 : 0) + (has(self.serviceAccountToken)
11031103
? 1 : 0) + (has(self.hashicorpVaultOAuth) ? 1 : 0) + (has(self.hashicorpVaultSecret)
11041104
? 1 : 0) + (has(self.hashicorpVaultLDAP) ? 1 : 0) + (has(self.tppOAuth)
1105-
? 1 : 0) + (has(self.vcpOAuth) ? 1 : 0) == 1'
1105+
? 1 : 0) + (has(self.vcpOAuth) ? 1 : 0)) == 1'
11061106
maxItems: 50
11071107
type: array
11081108
x-kubernetes-list-type: atomic

‎deploy/charts/venafi-kubernetes-agent/templates/venafi-connection-crd.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ spec:
283283
type: object
284284
x-kubernetes-validations:
285285
- message: must have exactly one field set
286-
rule: '(has(self.secret) ? 1 : 0) + (has(self.serviceAccountToken) ? 1 : 0) + (has(self.hashicorpVaultOAuth) ? 1 : 0) + (has(self.hashicorpVaultSecret) ? 1 : 0) + (has(self.hashicorpVaultLDAP) ? 1 : 0) + (has(self.tppOAuth) ? 1 : 0) + (has(self.vcpOAuth) ? 1 : 0) == 1'
286+
rule: '((has(self.secret) ? 1 : 0) + (has(self.serviceAccountToken) ? 1 : 0) + (has(self.hashicorpVaultOAuth) ? 1 : 0) + (has(self.hashicorpVaultSecret) ? 1 : 0) + (has(self.hashicorpVaultLDAP) ? 1 : 0) + (has(self.tppOAuth) ? 1 : 0) + (has(self.vcpOAuth) ? 1 : 0)) == 1'
287287
maxItems: 50
288288
type: array
289289
x-kubernetes-list-type: atomic
@@ -484,7 +484,7 @@ spec:
484484
type: object
485485
x-kubernetes-validations:
486486
- message: must have exactly one field set
487-
rule: '(has(self.secret) ? 1 : 0) + (has(self.serviceAccountToken) ? 1 : 0) + (has(self.hashicorpVaultOAuth) ? 1 : 0) + (has(self.hashicorpVaultSecret) ? 1 : 0) + (has(self.hashicorpVaultLDAP) ? 1 : 0) + (has(self.tppOAuth) ? 1 : 0) + (has(self.vcpOAuth) ? 1 : 0) == 1'
487+
rule: '((has(self.secret) ? 1 : 0) + (has(self.serviceAccountToken) ? 1 : 0) + (has(self.hashicorpVaultOAuth) ? 1 : 0) + (has(self.hashicorpVaultSecret) ? 1 : 0) + (has(self.hashicorpVaultLDAP) ? 1 : 0) + (has(self.tppOAuth) ? 1 : 0) + (has(self.vcpOAuth) ? 1 : 0)) == 1'
488488
maxItems: 50
489489
type: array
490490
x-kubernetes-list-type: atomic
@@ -672,7 +672,7 @@ spec:
672672
type: object
673673
x-kubernetes-validations:
674674
- message: must have exactly one field set
675-
rule: '(has(self.secret) ? 1 : 0) + (has(self.serviceAccountToken) ? 1 : 0) + (has(self.hashicorpVaultOAuth) ? 1 : 0) + (has(self.hashicorpVaultSecret) ? 1 : 0) + (has(self.hashicorpVaultLDAP) ? 1 : 0) + (has(self.tppOAuth) ? 1 : 0) + (has(self.vcpOAuth) ? 1 : 0) == 1'
675+
rule: '((has(self.secret) ? 1 : 0) + (has(self.serviceAccountToken) ? 1 : 0) + (has(self.hashicorpVaultOAuth) ? 1 : 0) + (has(self.hashicorpVaultSecret) ? 1 : 0) + (has(self.hashicorpVaultLDAP) ? 1 : 0) + (has(self.tppOAuth) ? 1 : 0) + (has(self.vcpOAuth) ? 1 : 0)) == 1'
676676
maxItems: 50
677677
type: array
678678
x-kubernetes-list-type: atomic
@@ -871,7 +871,7 @@ spec:
871871
type: object
872872
x-kubernetes-validations:
873873
- message: must have exactly one field set
874-
rule: '(has(self.secret) ? 1 : 0) + (has(self.serviceAccountToken) ? 1 : 0) + (has(self.hashicorpVaultOAuth) ? 1 : 0) + (has(self.hashicorpVaultSecret) ? 1 : 0) + (has(self.hashicorpVaultLDAP) ? 1 : 0) + (has(self.tppOAuth) ? 1 : 0) + (has(self.vcpOAuth) ? 1 : 0) == 1'
874+
rule: '((has(self.secret) ? 1 : 0) + (has(self.serviceAccountToken) ? 1 : 0) + (has(self.hashicorpVaultOAuth) ? 1 : 0) + (has(self.hashicorpVaultSecret) ? 1 : 0) + (has(self.hashicorpVaultLDAP) ? 1 : 0) + (has(self.tppOAuth) ? 1 : 0) + (has(self.vcpOAuth) ? 1 : 0)) == 1'
875875
maxItems: 50
876876
type: array
877877
x-kubernetes-list-type: atomic
@@ -1059,7 +1059,7 @@ spec:
10591059
type: object
10601060
x-kubernetes-validations:
10611061
- message: must have exactly one field set
1062-
rule: '(has(self.secret) ? 1 : 0) + (has(self.serviceAccountToken) ? 1 : 0) + (has(self.hashicorpVaultOAuth) ? 1 : 0) + (has(self.hashicorpVaultSecret) ? 1 : 0) + (has(self.hashicorpVaultLDAP) ? 1 : 0) + (has(self.tppOAuth) ? 1 : 0) + (has(self.vcpOAuth) ? 1 : 0) == 1'
1062+
rule: '((has(self.secret) ? 1 : 0) + (has(self.serviceAccountToken) ? 1 : 0) + (has(self.hashicorpVaultOAuth) ? 1 : 0) + (has(self.hashicorpVaultSecret) ? 1 : 0) + (has(self.hashicorpVaultLDAP) ? 1 : 0) + (has(self.tppOAuth) ? 1 : 0) + (has(self.vcpOAuth) ? 1 : 0)) == 1'
10631063
maxItems: 50
10641064
type: array
10651065
x-kubernetes-list-type: atomic

‎go.mod

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,66 +3,72 @@ module github.com/jetstack/preflight
33
go 1.23.4
44

55
require (
6-
github.com/Venafi/vcert/v5 v5.7.1
6+
github.com/Venafi/vcert/v5 v5.8.1
77
github.com/cenkalti/backoff v2.2.1+incompatible
88
github.com/d4l3k/messagediff v1.2.1
99
github.com/fatih/color v1.17.0
1010
github.com/google/uuid v1.6.0
1111
github.com/hashicorp/go-multierror v1.1.1
12-
github.com/jetstack/venafi-connection-lib v0.1.1-0.20240909145535-cd2301fd4e7c
12+
github.com/jetstack/venafi-connection-lib v0.3.2-0.20250305134451-ec1757b9e01b
1313
github.com/maxatome/go-testdeep v1.14.0
1414
github.com/microcosm-cc/bluemonday v1.0.27
1515
github.com/pkg/errors v0.9.1
1616
github.com/pmylund/go-cache v2.1.0+incompatible
17-
github.com/prometheus/client_golang v1.20.4
17+
github.com/prometheus/client_golang v1.21.0
1818
github.com/spf13/cobra v1.8.1
1919
github.com/spf13/pflag v1.0.5
20-
github.com/stretchr/testify v1.9.0
21-
golang.org/x/sync v0.10.0
20+
github.com/stretchr/testify v1.10.0
21+
golang.org/x/sync v0.11.0
2222
gopkg.in/yaml.v2 v2.4.0
2323
k8s.io/api v0.33.0-alpha.1
2424
k8s.io/apimachinery v0.33.0-alpha.1
2525
k8s.io/client-go v0.33.0-alpha.1
26-
k8s.io/component-base v0.31.0
27-
sigs.k8s.io/controller-runtime v0.19.0
26+
k8s.io/component-base v0.32.2
27+
sigs.k8s.io/controller-runtime v0.20.2
2828
sigs.k8s.io/yaml v1.4.0
2929
)
3030

3131
require (
32+
cel.dev/expr v0.18.0 // indirect
3233
github.com/Khan/genqlient v0.7.0 // indirect
3334
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
3435
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
3536
github.com/aymerick/douceur v0.2.0 // indirect
3637
github.com/blang/semver/v4 v4.0.0 // indirect
37-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
38+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
3839
github.com/fsnotify/fsnotify v1.7.0 // indirect
3940
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
4041
github.com/go-http-utils/headers v0.0.0-20181008091004-fed159eddc2a // indirect
4142
github.com/go-logr/zapr v1.3.0 // indirect
42-
github.com/google/cel-go v0.20.1 // indirect
43+
github.com/go418/concurrentcache v0.6.0 // indirect
44+
github.com/go418/concurrentcache/logger v0.0.0-20250207095056-c0b7f8cc8bc2 // indirect
45+
github.com/google/btree v1.1.3 // indirect
46+
github.com/google/cel-go v0.22.0 // indirect
4347
github.com/google/gnostic-models v0.6.9 // indirect
4448
github.com/gorilla/css v1.0.1 // indirect
4549
github.com/gorilla/websocket v1.5.1 // indirect
4650
github.com/json-iterator/go v1.1.12 // indirect
47-
github.com/klauspost/compress v1.17.9 // indirect
51+
github.com/klauspost/compress v1.17.11 // indirect
4852
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
4953
github.com/sosodev/duration v1.2.0 // indirect
5054
github.com/stoewer/go-strcase v1.3.0 // indirect
5155
github.com/vektah/gqlparser/v2 v2.5.15 // indirect
5256
github.com/x448/float16 v0.8.4 // indirect
5357
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
58+
go.opentelemetry.io/otel v1.28.0 // indirect
59+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
5460
go.uber.org/multierr v1.11.0 // indirect
55-
go.uber.org/zap v1.26.0 // indirect
56-
golang.org/x/crypto v0.31.0 // indirect
57-
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
58-
golang.org/x/net v0.33.0 // indirect
61+
go.uber.org/zap v1.27.0 // indirect
62+
golang.org/x/crypto v0.32.0 // indirect
63+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
64+
golang.org/x/net v0.34.0 // indirect
5965
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
60-
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
61-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
66+
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
67+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
6268
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
6369
gopkg.in/ini.v1 v1.67.0 // indirect
64-
k8s.io/apiextensions-apiserver v0.31.0 // indirect
65-
k8s.io/apiserver v0.31.0 // indirect
70+
k8s.io/apiextensions-apiserver v0.32.2 // indirect
71+
k8s.io/apiserver v0.32.2 // indirect
6672
)
6773

6874
require (
@@ -88,14 +94,14 @@ require (
8894
github.com/modern-go/reflect2 v1.0.2 // indirect
8995
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
9096
github.com/prometheus/client_model v0.6.1 // indirect
91-
github.com/prometheus/common v0.55.0 // indirect
97+
github.com/prometheus/common v0.62.0 // indirect
9298
github.com/prometheus/procfs v0.15.1 // indirect
93-
golang.org/x/oauth2 v0.23.0 // indirect
94-
golang.org/x/sys v0.28.0 // indirect
95-
golang.org/x/term v0.27.0 // indirect
99+
golang.org/x/oauth2 v0.24.0 // indirect
100+
golang.org/x/sys v0.29.0 // indirect
101+
golang.org/x/term v0.28.0 // indirect
96102
golang.org/x/text v0.21.0 // indirect
97103
golang.org/x/time v0.7.0 // indirect
98-
google.golang.org/protobuf v1.35.1 // indirect
104+
google.golang.org/protobuf v1.36.1 // indirect
99105
gopkg.in/inf.v0 v0.9.1 // indirect
100106
gopkg.in/yaml.v3 v3.0.1
101107
k8s.io/klog/v2 v2.130.1

0 commit comments

Comments
 (0)