Skip to content

Commit 73ed5a9

Browse files
authored
Merge pull request #1694 from fluxcd/backport-1693-to-release/v1.9.x
[release/v1.9.x] Fix CRD going through variable substitution
2 parents ab0e492 + 1586c4d commit 73ed5a9

2 files changed

Lines changed: 2 additions & 0 deletions

File tree

api/v1/kustomization_types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,7 @@ func (in *Kustomization) SetConditions(conditions []metav1.Condition) {
454454
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description=""
455455
// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status",description=""
456456
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].message",description=""
457+
// +kubebuilder:metadata:annotations="kustomize.toolkit.fluxcd.io/substitute=disabled"
457458

458459
// Kustomization is the Schema for the kustomizations API.
459460
type Kustomization struct {

config/crd/bases/kustomize.toolkit.fluxcd.io_kustomizations.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.21.0
7+
kustomize.toolkit.fluxcd.io/substitute: disabled
78
name: kustomizations.kustomize.toolkit.fluxcd.io
89
spec:
910
group: kustomize.toolkit.fluxcd.io

0 commit comments

Comments
 (0)