Skip to content

Commit d7d882c

Browse files
emosbaughemosbaugh
authored
chore(ci): update kustomize to v5.7.0 (#2420)
* chore(ci): update kustomize to v5.7.0 * Trigger Build
1 parent 0da9094 commit d7d882c

File tree

4 files changed

+156
-76
lines changed

4 files changed

+156
-76
lines changed

‎operator/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
9898
ENVTEST ?= $(LOCALBIN)/setup-envtest
9999

100100
## Tool Versions
101-
KUSTOMIZE_VERSION ?= v3.8.7
101+
KUSTOMIZE_VERSION ?= v5.7.0
102102
CONTROLLER_TOOLS_VERSION ?= v0.18.0
103103

104104
.PHONY: kustomize

‎operator/charts/embedded-cluster-operator/charts/crds/templates/resources.yaml

Lines changed: 75 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ spec:
6464
chartname:
6565
type: string
6666
forceUpgrade:
67-
description: 'ForceUpgrade when set to false, disables the use of the "--force" flag when upgrading the the chart (default: true).'
67+
description: 'ForceUpgrade when set to false, disables
68+
the use of the "--force" flag when upgrading the the
69+
chart (default: true).'
6870
type: boolean
6971
name:
7072
type: string
@@ -88,19 +90,24 @@ spec:
8890
type: integer
8991
repositories:
9092
items:
91-
description: Repository describes single repository entry. Fields map to the CLI flags for the "helm add" command
93+
description: Repository describes single repository entry.
94+
Fields map to the CLI flags for the "helm add" command
9295
properties:
9396
caFile:
94-
description: CA bundle file to use when verifying HTTPS-enabled servers.
97+
description: CA bundle file to use when verifying HTTPS-enabled
98+
servers.
9599
type: string
96100
certFile:
97-
description: The TLS certificate file to use for HTTPS client authentication.
101+
description: The TLS certificate file to use for HTTPS
102+
client authentication.
98103
type: string
99104
insecure:
100-
description: Whether to skip TLS certificate checks when connecting to the repository.
105+
description: Whether to skip TLS certificate checks
106+
when connecting to the repository.
101107
type: boolean
102108
keyfile:
103-
description: The TLS key file to use for HTTPS client authentication.
109+
description: The TLS key file to use for HTTPS client
110+
authentication.
104111
type: string
105112
name:
106113
description: The repository name.
@@ -140,7 +147,8 @@ spec:
140147
name:
141148
type: string
142149
nodeCount:
143-
description: NodeCount holds a series of rules for a given node role.
150+
description: NodeCount holds a series of rules for a given
151+
node role.
144152
properties:
145153
range:
146154
description: |-
@@ -174,7 +182,8 @@ spec:
174182
name:
175183
type: string
176184
nodeCount:
177-
description: NodeCount holds a series of rules for a given node role.
185+
description: NodeCount holds a series of rules for a given
186+
node role.
178187
properties:
179188
range:
180189
description: |-
@@ -207,10 +216,12 @@ spec:
207216
BuiltInExtensions holds overrides for the default add-ons we ship
208217
with Embedded Cluster.
209218
items:
210-
description: BuiltInExtension holds the override for a built-in extension (add-on).
219+
description: BuiltInExtension holds the override for a built-in
220+
extension (add-on).
211221
properties:
212222
name:
213-
description: The name of the helm chart to override values of, for instance `openebs`.
223+
description: The name of the helm chart to override values
224+
of, for instance `openebs`.
214225
type: string
215226
values:
216227
description: |-
@@ -307,7 +318,8 @@ spec:
307318
description: AdminConsoleSpec holds the admin console configuration.
308319
properties:
309320
port:
310-
description: Port holds the port on which the admin console will be served.
321+
description: Port holds the port on which the admin console will
322+
be served.
311323
type: integer
312324
type: object
313325
airGap:
@@ -368,7 +380,9 @@ spec:
368380
chartname:
369381
type: string
370382
forceUpgrade:
371-
description: 'ForceUpgrade when set to false, disables the use of the "--force" flag when upgrading the the chart (default: true).'
383+
description: 'ForceUpgrade when set to false, disables
384+
the use of the "--force" flag when upgrading the
385+
the chart (default: true).'
372386
type: boolean
373387
name:
374388
type: string
@@ -392,19 +406,25 @@ spec:
392406
type: integer
393407
repositories:
394408
items:
395-
description: Repository describes single repository entry. Fields map to the CLI flags for the "helm add" command
409+
description: Repository describes single repository
410+
entry. Fields map to the CLI flags for the "helm add"
411+
command
396412
properties:
397413
caFile:
398-
description: CA bundle file to use when verifying HTTPS-enabled servers.
414+
description: CA bundle file to use when verifying
415+
HTTPS-enabled servers.
399416
type: string
400417
certFile:
401-
description: The TLS certificate file to use for HTTPS client authentication.
418+
description: The TLS certificate file to use for
419+
HTTPS client authentication.
402420
type: string
403421
insecure:
404-
description: Whether to skip TLS certificate checks when connecting to the repository.
422+
description: Whether to skip TLS certificate checks
423+
when connecting to the repository.
405424
type: boolean
406425
keyfile:
407-
description: The TLS key file to use for HTTPS client authentication.
426+
description: The TLS key file to use for HTTPS client
427+
authentication.
408428
type: string
409429
name:
410430
description: The repository name.
@@ -444,7 +464,8 @@ spec:
444464
name:
445465
type: string
446466
nodeCount:
447-
description: NodeCount holds a series of rules for a given node role.
467+
description: NodeCount holds a series of rules for a given
468+
node role.
448469
properties:
449470
range:
450471
description: |-
@@ -478,7 +499,8 @@ spec:
478499
name:
479500
type: string
480501
nodeCount:
481-
description: NodeCount holds a series of rules for a given node role.
502+
description: NodeCount holds a series of rules for a
503+
given node role.
482504
properties:
483505
range:
484506
description: |-
@@ -493,7 +515,8 @@ spec:
493515
type: integer
494516
type: object
495517
values:
496-
description: Values holds a list of allowed node counts.
518+
description: Values holds a list of allowed node
519+
counts.
497520
items:
498521
type: integer
499522
type: array
@@ -511,10 +534,12 @@ spec:
511534
BuiltInExtensions holds overrides for the default add-ons we ship
512535
with Embedded Cluster.
513536
items:
514-
description: BuiltInExtension holds the override for a built-in extension (add-on).
537+
description: BuiltInExtension holds the override for a built-in
538+
extension (add-on).
515539
properties:
516540
name:
517-
description: The name of the helm chart to override values of, for instance `openebs`.
541+
description: The name of the helm chart to override
542+
values of, for instance `openebs`.
518543
type: string
519544
values:
520545
description: |-
@@ -559,21 +584,25 @@ spec:
559584
used at installation time.
560585
type: string
561586
highAvailability:
562-
description: HighAvailability indicates if the installation is high availability.
587+
description: HighAvailability indicates if the installation is high
588+
availability.
563589
type: boolean
564590
licenseInfo:
565-
description: LicenseInfo holds information about the license used to install the cluster.
591+
description: LicenseInfo holds information about the license used
592+
to install the cluster.
566593
properties:
567594
isDisasterRecoverySupported:
568595
type: boolean
569596
isMultiNodeEnabled:
570597
type: boolean
571598
type: object
572599
localArtifactMirror:
573-
description: LocalArtifactMirrorSpec holds the local artifact mirror configuration.
600+
description: LocalArtifactMirrorSpec holds the local artifact mirror
601+
configuration.
574602
properties:
575603
port:
576-
description: Port holds the port on which the local artifact mirror will be served.
604+
description: Port holds the port on which the local artifact mirror
605+
will be served.
577606
type: integer
578607
type: object
579608
metricsBaseURL:
@@ -606,13 +635,15 @@ spec:
606635
type: string
607636
type: object
608637
runtimeConfig:
609-
description: RuntimeConfig holds the runtime configuration used at installation time.
638+
description: RuntimeConfig holds the runtime configuration used at
639+
installation time.
610640
properties:
611641
adminConsole:
612642
description: AdminConsole holds the Admin Console configuration.
613643
properties:
614644
port:
615-
description: Port holds the port on which the admin console will be served.
645+
description: Port holds the port on which the admin console
646+
will be served.
616647
type: integer
617648
type: object
618649
dataDir:
@@ -621,25 +652,29 @@ spec:
621652
(default: /var/lib/embedded-cluster).
622653
type: string
623654
hostCABundlePath:
624-
description: HostCABundlePath holds the path to the CA bundle for the host.
655+
description: HostCABundlePath holds the path to the CA bundle
656+
for the host.
625657
type: string
626658
k0sDataDirOverride:
627659
description: |-
628660
K0sDataDirOverride holds the override for the data directory for K0s. By default the data
629661
will be stored in a subdirectory of DataDir.
630662
type: string
631663
localArtifactMirror:
632-
description: LocalArtifactMirrorPort holds the Local Artifact Mirror configuration.
664+
description: LocalArtifactMirrorPort holds the Local Artifact
665+
Mirror configuration.
633666
properties:
634667
port:
635-
description: Port holds the port on which the local artifact mirror will be served.
668+
description: Port holds the port on which the local artifact
669+
mirror will be served.
636670
type: integer
637671
type: object
638672
manager:
639673
description: Manager holds the Manager configuration.
640674
properties:
641675
port:
642-
description: Port holds the port on which the manager will be served.
676+
description: Port holds the port on which the manager will
677+
be served.
643678
type: integer
644679
type: object
645680
network:
@@ -675,16 +710,19 @@ spec:
675710
type: object
676711
type: object
677712
sourceType:
678-
description: SourceType indicates where this Installation object is stored (CRD, ConfigMap, etc...).
713+
description: SourceType indicates where this Installation object is
714+
stored (CRD, ConfigMap, etc...).
679715
type: string
680716
type: object
681717
status:
682718
description: InstallationStatus defines the observed state of Installation
683719
properties:
684720
conditions:
685-
description: Conditions is an array of current observed installation conditions.
721+
description: Conditions is an array of current observed installation
722+
conditions.
686723
items:
687-
description: Condition contains details for one aspect of the current state of this API Resource.
724+
description: Condition contains details for one aspect of the current
725+
state of this API Resource.
688726
properties:
689727
lastTransitionTime:
690728
description: |-
@@ -758,7 +796,8 @@ spec:
758796
type: object
759797
type: array
760798
pendingCharts:
761-
description: PendingCharts holds the list of charts that are being created or updated.
799+
description: PendingCharts holds the list of charts that are being
800+
created or updated.
762801
items:
763802
type: string
764803
type: array

‎operator/config/crd/kustomization.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ resources:
66
- bases/embeddedcluster.replicated.com_configs.yaml
77
#+kubebuilder:scaffold:crdkustomizeresource
88

9-
patchesStrategicMerge:
10-
- patches/labels_in_installations.yaml
11-
- patches/labels_in_configs.yaml
129
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
1310
# patches here are for enabling the conversion webhook for each CRD
1411
#- patches/webhook_in_installations.yaml
@@ -24,3 +21,8 @@ patchesStrategicMerge:
2421
# the following config is for teaching kustomize how to do kustomization for CRDs.
2522
configurations:
2623
- kustomizeconfig.yaml
24+
apiVersion: kustomize.config.k8s.io/v1beta1
25+
kind: Kustomization
26+
patches:
27+
- path: patches/labels_in_installations.yaml
28+
- path: patches/labels_in_configs.yaml

0 commit comments

Comments
 (0)