Skip to content

Commit 60123a0

Browse files
authored
Merge pull request #912 from fluxcd/disable-varsub-crds
Disable variable substitution in CRDs
2 parents 7321cf9 + f901929 commit 60123a0

4 files changed

Lines changed: 4 additions & 0 deletions

File tree

api/v1/imagepolicy_types.go

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

207208
// ImagePolicy is the Schema for the imagepolicies API
208209
type ImagePolicy struct {

api/v1/imagerepository_types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ func (in ImageRepository) GetRequeueAfter() time.Duration {
217217
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].message",description=""
218218
// +kubebuilder:printcolumn:name="Last scan",type=string,JSONPath=`.status.lastScanResult.scanTime`,priority=1
219219
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description=""
220+
// +kubebuilder:metadata:annotations="kustomize.toolkit.fluxcd.io/substitute=disabled"
220221

221222
// ImageRepository is the Schema for the imagerepositories API
222223
type ImageRepository struct {

config/crd/bases/image.toolkit.fluxcd.io_imagepolicies.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: imagepolicies.image.toolkit.fluxcd.io
89
spec:
910
group: image.toolkit.fluxcd.io

config/crd/bases/image.toolkit.fluxcd.io_imagerepositories.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: imagerepositories.image.toolkit.fluxcd.io
89
spec:
910
group: image.toolkit.fluxcd.io

0 commit comments

Comments
 (0)