Skip to content

Commit 5664ceb

Browse files
maelvlsmaelvls
committed
make: add the "make generate-crds-venconn" target
1 parent 2aeaa9b commit 5664ceb

File tree

8 files changed

+120
-64
lines changed

8 files changed

+120
-64
lines changed

‎deploy/charts/venafi-kubernetes-agent/crd_bases/crd.footer.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
{{ end }}
2+
{{ end }}

‎deploy/charts/venafi-kubernetes-agent/crd_bases/crd.header.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{{/* DO NOT EDIT. Use 'make generate-crds-venconn' to regenerate. */}}
2+
{{- if .Values.crds.venafiConnection.enabled }}
3+
{{- if (or (semverCompare "<1.25" .Capabilities.KubeVersion.GitVersion) .Values.crds.forceRemoveValidationAnnotations) }}
4+
apiVersion: apiextensions.k8s.io/v1
5+
kind: CustomResourceDefinition
6+
metadata:
7+
name: "venaficonnections.jetstack.io"
8+
{{- if .Values.crds.keep }}
9+
annotations:
10+
# This annotation prevents the CRD from being pruned by Helm when this chart
11+
# is deleted.
12+
helm.sh/resource-policy: keep
13+
{{- end }}
14+
labels:
15+
{{- include "venafi-connection.labels" . | nindent 4 }}

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

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.14.0
7+
controller-gen.kubebuilder.io/version: v0.16.1
88
name: venaficonnections.jetstack.io
99
spec:
1010
group: jetstack.io
@@ -140,7 +140,7 @@ spec:
140140
/v1/auth/oidc/login
141141
type: string
142142
clientId:
143-
description: 'DEPRECATED: This field does nothing and
143+
description: 'Deprecated: This field does nothing and
144144
will be removed in the future.'
145145
type: string
146146
role:
@@ -168,7 +168,6 @@ spec:
168168
The fields are Vault keys pointing to the secrets passed to the next
169169
SecretSource step.
170170
171-
172171
Example 1 (TPP, username and password): imagining that you have stored
173172
the username and password for TPP under the keys "username" and
174173
"password", you will want to set this field to `["username",
@@ -352,7 +351,7 @@ spec:
352351
/v1/auth/oidc/login
353352
type: string
354353
clientId:
355-
description: 'DEPRECATED: This field does nothing and
354+
description: 'Deprecated: This field does nothing and
356355
will be removed in the future.'
357356
type: string
358357
role:
@@ -380,7 +379,6 @@ spec:
380379
The fields are Vault keys pointing to the secrets passed to the next
381380
SecretSource step.
382381
383-
384382
Example 1 (TPP, username and password): imagining that you have stored
385383
the username and password for TPP under the keys "username" and
386384
"password", you will want to set this field to `["username",
@@ -550,7 +548,7 @@ spec:
550548
/v1/auth/oidc/login
551549
type: string
552550
clientId:
553-
description: 'DEPRECATED: This field does nothing and
551+
description: 'Deprecated: This field does nothing and
554552
will be removed in the future.'
555553
type: string
556554
role:
@@ -578,7 +576,6 @@ spec:
578576
The fields are Vault keys pointing to the secrets passed to the next
579577
SecretSource step.
580578
581-
582579
Example 1 (TPP, username and password): imagining that you have stored
583580
the username and password for TPP under the keys "username" and
584581
"password", you will want to set this field to `["username",
@@ -761,7 +758,7 @@ spec:
761758
/v1/auth/oidc/login
762759
type: string
763760
clientId:
764-
description: 'DEPRECATED: This field does nothing and
761+
description: 'Deprecated: This field does nothing and
765762
will be removed in the future.'
766763
type: string
767764
role:
@@ -789,7 +786,6 @@ spec:
789786
The fields are Vault keys pointing to the secrets passed to the next
790787
SecretSource step.
791788
792-
793789
Example 1 (TPP, username and password): imagining that you have stored
794790
the username and password for TPP under the keys "username" and
795791
"password", you will want to set this field to `["username",
@@ -959,7 +955,7 @@ spec:
959955
/v1/auth/oidc/login
960956
type: string
961957
clientId:
962-
description: 'DEPRECATED: This field does nothing and
958+
description: 'Deprecated: This field does nothing and
963959
will be removed in the future.'
964960
type: string
965961
role:
@@ -987,7 +983,6 @@ spec:
987983
The fields are Vault keys pointing to the secrets passed to the next
988984
SecretSource step.
989985
990-
991986
Example 1 (TPP, username and password): imagining that you have stored
992987
the username and password for TPP under the keys "username" and
993988
"password", you will want to set this field to `["username",

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

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
1-
{{- if .Values.crds.venafiConnection.include }}
2-
{{- if (or (semverCompare "<1.25" .Capabilities.KubeVersion.GitVersion) .Values.crds.forceRemoveValidationAnnotations) }}
1+
{{/* DO NOT EDIT. Use 'make generate-crds-venconn' to regenerate. */}}
2+
{{- if .Values.crds.venafiConnection.enabled }}
33
apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
6+
name: "venaficonnections.jetstack.io"
7+
{{- if .Values.crds.keep }}
68
annotations:
7-
controller-gen.kubebuilder.io/version: v0.14.0
8-
# This annotation prevents the CRD from being pruned by Helm when this chart is deleted.
9-
"helm.sh/resource-policy": keep
10-
name: venaficonnections.jetstack.io
9+
helm.sh/resource-policy: keep
10+
{{- end }}
1111
labels:
12-
{{- include "venafi-connection.labels" $ | nindent 4 }}
12+
{{- include "preflight.labels" . | nindent 4 }}
13+
---
14+
apiVersion: apiextensions.k8s.io/v1
15+
kind: CustomResourceDefinition
16+
metadata:
17+
annotations:
18+
controller-gen.kubebuilder.io/version: v0.16.1
19+
name: venaficonnections.jetstack.io
1320
spec:
1421
group: jetstack.io
1522
names:
@@ -141,7 +148,7 @@ spec:
141148
/v1/auth/oidc/login
142149
type: string
143150
clientId:
144-
description: "DEPRECATED: This field does nothing and will be removed in the future."
151+
description: 'Deprecated: This field does nothing and will be removed in the future.'
145152
type: string
146153
role:
147154
description: |-
@@ -167,7 +174,6 @@ spec:
167174
The fields are Vault keys pointing to the secrets passed to the next
168175
SecretSource step.
169176
170-
171177
Example 1 (TPP, username and password): imagining that you have stored
172178
the username and password for TPP under the keys "username" and
173179
"password", you will want to set this field to `["username",
@@ -293,7 +299,7 @@ spec:
293299
- url
294300
type: object
295301
vaas:
296-
description: "Deprecated: The 'vaas' field is deprecated use the field called 'vcp' instead."
302+
description: 'Deprecated: The ''vaas'' field is deprecated use the field called ''vcp'' instead.'
297303
properties:
298304
accessToken:
299305
description: |-
@@ -340,7 +346,7 @@ spec:
340346
/v1/auth/oidc/login
341347
type: string
342348
clientId:
343-
description: "DEPRECATED: This field does nothing and will be removed in the future."
349+
description: 'Deprecated: This field does nothing and will be removed in the future.'
344350
type: string
345351
role:
346352
description: |-
@@ -366,7 +372,6 @@ spec:
366372
The fields are Vault keys pointing to the secrets passed to the next
367373
SecretSource step.
368374
369-
370375
Example 1 (TPP, username and password): imagining that you have stored
371376
the username and password for TPP under the keys "username" and
372377
"password", you will want to set this field to `["username",
@@ -526,7 +531,7 @@ spec:
526531
/v1/auth/oidc/login
527532
type: string
528533
clientId:
529-
description: "DEPRECATED: This field does nothing and will be removed in the future."
534+
description: 'Deprecated: This field does nothing and will be removed in the future.'
530535
type: string
531536
role:
532537
description: |-
@@ -552,7 +557,6 @@ spec:
552557
The fields are Vault keys pointing to the secrets passed to the next
553558
SecretSource step.
554559
555-
556560
Example 1 (TPP, username and password): imagining that you have stored
557561
the username and password for TPP under the keys "username" and
558562
"password", you will want to set this field to `["username",
@@ -720,7 +724,7 @@ spec:
720724
/v1/auth/oidc/login
721725
type: string
722726
clientId:
723-
description: "DEPRECATED: This field does nothing and will be removed in the future."
727+
description: 'Deprecated: This field does nothing and will be removed in the future.'
724728
type: string
725729
role:
726730
description: |-
@@ -746,7 +750,6 @@ spec:
746750
The fields are Vault keys pointing to the secrets passed to the next
747751
SecretSource step.
748752
749-
750753
Example 1 (TPP, username and password): imagining that you have stored
751754
the username and password for TPP under the keys "username" and
752755
"password", you will want to set this field to `["username",
@@ -906,7 +909,7 @@ spec:
906909
/v1/auth/oidc/login
907910
type: string
908911
clientId:
909-
description: "DEPRECATED: This field does nothing and will be removed in the future."
912+
description: 'Deprecated: This field does nothing and will be removed in the future.'
910913
type: string
911914
role:
912915
description: |-
@@ -932,7 +935,6 @@ spec:
932935
The fields are Vault keys pointing to the secrets passed to the next
933936
SecretSource step.
934937
935-
936938
Example 1 (TPP, username and password): imagining that you have stored
937939
the username and password for TPP under the keys "username" and
938940
"password", you will want to set this field to `["username",
@@ -1119,5 +1121,4 @@ spec:
11191121
storage: true
11201122
subresources:
11211123
status: {}
1122-
{{- end }}
1123-
{{- end }}
1124+
{{ end }}

0 commit comments

Comments
 (0)