Skip to content

Commit 104f4b7

Browse files
Per Goncalves da Silvaperdasilva
Per Goncalves da Silva
authored andcommitted
Fixes CSV CRD validation issues by adding missing default values
Signed-off-by: Per Goncalves da Silva <[email protected]>
1 parent 5ff09d8 commit 104f4b7

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

Diff for: Makefile

+2
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ manifests: yq controller-gen ## Generate manifests e.g. CRD, RBAC etc
6060
@# Add missing defaults in embedded core API schemas
6161
$(YQ) --inplace '.spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.install.properties.spec.properties.deployments.items.properties.spec.properties.template.properties.spec.properties.containers.items.properties.ports.items.properties.protocol.default="TCP"' ./crds/operators.coreos.com_clusterserviceversions.yaml
6262
$(Q)$(YQ) --inplace '.spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.install.properties.spec.properties.deployments.items.properties.spec.properties.template.properties.spec.properties.initContainers.items.properties.ports.items.properties.protocol.default="TCP"' ./crds/operators.coreos.com_clusterserviceversions.yaml
63+
$(YQ) --inplace '.spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.install.properties.spec.properties.deployments.items.properties.spec.properties.template.properties.spec.properties.imagePullSecrets.items.properties.name.default=""' ./crds/operators.coreos.com_clusterserviceversions.yaml
64+
$(Q)$(YQ) --inplace '.spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.install.properties.spec.properties.deployments.items.properties.spec.properties.template.properties.spec.properties.hostAliases.items.properties.ip.default=""' ./crds/operators.coreos.com_clusterserviceversions.yaml
6365

6466
@# Preserve fields for embedded metadata fields
6567
$(Q)$(YQ) --inplace '.spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.install.properties.spec.properties.deployments.items.properties.spec.properties.template.properties.metadata.x-kubernetes-preserve-unknown-fields=true' ./crds/operators.coreos.com_clusterserviceversions.yaml

Diff for: crds/operators.coreos.com_clusterserviceversions.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -4504,6 +4504,7 @@ spec:
45044504
ip:
45054505
description: IP address of the host file entry.
45064506
type: string
4507+
default: ""
45074508
x-kubernetes-list-map-keys:
45084509
- ip
45094510
x-kubernetes-list-type: map
@@ -4558,6 +4559,7 @@ spec:
45584559
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
45594560
TODO: Add other useful fields. apiVersion, kind, uid?
45604561
type: string
4562+
default: ""
45614563
x-kubernetes-map-type: atomic
45624564
x-kubernetes-list-map-keys:
45634565
- name

Diff for: crds/zz_defs.go

+9-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)