Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -711,12 +711,12 @@ endef
define copy_v1_crds
$(eval dir := $(1))
$(eval product := $(2))
@cp $(dir)/libcalico-go/config/crd/* pkg/imports/crds/$(product)/v1.crd.projectcalico.org/ && echo "Copied $(product) CRDs"
@cp $(dir)/libcalico-go/config/crd/*.yaml pkg/imports/crds/$(product)/v1.crd.projectcalico.org/ && echo "Copied $(product) CRDs"
endef
define copy_v3_crds
$(eval dir := $(1))
$(eval product := $(2))
@cp $(dir)/api/config/crd/* pkg/imports/crds/$(product)/v3.projectcalico.org/ && echo "Copied $(product) CRDs"
@cp $(dir)/api/config/crd/*.yaml pkg/imports/crds/$(product)/v3.projectcalico.org/ && echo "Copied $(product) CRDs"
endef
define copy_k8s_policy_crds
$(eval product := $(1))
Expand All @@ -731,12 +731,12 @@ endef
define copy_eck_crds
$(eval dir := $(1))
$(eval product := $(2))
@cp $(dir)/charts/crd.projectcalico.org.v1/templates/eck/* pkg/imports/crds/$(product)/ && echo "Copied $(product) ECK CRDs"
@cp $(dir)/charts/crd.projectcalico.org.v1/templates/eck/*.yaml pkg/imports/crds/$(product)/ && echo "Copied $(product) ECK CRDs"
endef
define copy_admission_policies
$(eval dir := $(1))
$(eval product := $(2))
@cp $(dir)/api/admission/* pkg/imports/admission/$(product)/ && echo "Copied $(product) admission policies"
@cp $(dir)/api/admission/*.yaml pkg/imports/admission/$(product)/ && echo "Copied $(product) admission policies"
endef

.PHONY: read-libcalico-version read-libcalico-enterprise-version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -312,10 +312,31 @@ spec:
ValidationFailure describes a single validation
rule failure
properties:
expected:
description: |-
Expected is the value the rule requires, rendered as a string. Set from the
violation's "expected" key.
maxLength: 256
type: string
field:
description: |-
Field is the path of the setting that failed the rule, e.g.
"spec.coreRuleSet.paranoiaLevel". Populated when the rule's Rego emits the
object form of a violation with a "field" key; empty for rules that emit a
bare message. Consumers use it to point a user at the setting to change
rather than making them read the rule.
maxLength: 253
type: string
message:
description: Message explains why validation failed
maxLength: 1024
type: string
observed:
description: |-
Observed is the value the rule actually found, rendered as a string. Set
from the violation's "observed" key.
maxLength: 256
type: string
policyKind:
description: PolicyKind is Global or Namespace-scoped
enum:
Expand All @@ -329,6 +350,12 @@ spec:
that failed
maxLength: 253
type: string
remedy:
description: |-
Remedy is a short, rule-authored instruction for resolving the failure. Set
from the violation's "remedy" key.
maxLength: 512
type: string
rule:
description:
Rule is the name of the specific rule that
Expand Down Expand Up @@ -360,7 +387,6 @@ spec:
enum:
- Compliant
- Warning
- Degraded
- Critical
type: string
status:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ spec:
enum:
- Compliant
- Warning
- Degraded
- Critical
type: string
validationResults:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -312,10 +312,31 @@ spec:
ValidationFailure describes a single validation
rule failure
properties:
expected:
description: |-
Expected is the value the rule requires, rendered as a string. Set from the
violation's "expected" key.
maxLength: 256
type: string
field:
description: |-
Field is the path of the setting that failed the rule, e.g.
"spec.coreRuleSet.paranoiaLevel". Populated when the rule's Rego emits the
object form of a violation with a "field" key; empty for rules that emit a
bare message. Consumers use it to point a user at the setting to change
rather than making them read the rule.
maxLength: 253
type: string
message:
description: Message explains why validation failed
maxLength: 1024
type: string
observed:
description: |-
Observed is the value the rule actually found, rendered as a string. Set
from the violation's "observed" key.
maxLength: 256
type: string
policyKind:
description: PolicyKind is Global or Namespace-scoped
enum:
Expand All @@ -329,6 +350,12 @@ spec:
that failed
maxLength: 253
type: string
remedy:
description: |-
Remedy is a short, rule-authored instruction for resolving the failure. Set
from the violation's "remedy" key.
maxLength: 512
type: string
rule:
description:
Rule is the name of the specific rule that
Expand Down Expand Up @@ -360,7 +387,6 @@ spec:
enum:
- Compliant
- Warning
- Degraded
- Critical
type: string
status:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ spec:
enum:
- Compliant
- Warning
- Degraded
- Critical
type: string
validationResults:
Expand Down