Skip to content
Open
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
7 changes: 7 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,16 @@ generated: | vendor ; $(info $(M) update generated files) ## Update generated fi
$Q ./hack/update-codegen.sh

##@ CRD Generation
# Inject preserveUnknownFields: false (the explicit default) right after
# controller-gen writes generated-crds/: the apiserver fills this field in
# server-side, so omitting it makes ArgoCD server-side-apply flag every CRD
# as OutOfSync. Done here, not in sync-helm-crds.sh, so a bare
# `make generate-crds` cannot silently drop the field from the kustomize
# source of truth.
.PHONY: generate-crds
generate-crds: | $(CONTROLLER_GEN) ; $(info $(M) generating CRDs from Go types…) ## Generate CRD manifests from Go types
$Q $(CONTROLLER_GEN) crd:allowDangerousTypes=true paths="./pkg/apis/operator/v1alpha1/..." output:crd:artifacts:config=config/base/generated-crds
$Q for f in config/base/generated-crds/*.yaml; do grep -q '^ preserveUnknownFields:' $$f || perl -i -pe 's/^spec:\n/spec:\n preserveUnknownFields: false\n/' $$f; done

.PHONY: sync-helm-crds
sync-helm-crds: generate-crds ; $(info $(M) syncing CRDs to config and Helm chart…) ## Sync generated CRDs to config/ and Helm chart
Expand Down
13 changes: 13 additions & 0 deletions charts/tekton-operator/templates/kubernetes-crds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ metadata:
version: "devel"
operator.tekton.dev/release: "devel"
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: ManualApprovalGate
Expand Down Expand Up @@ -655,6 +656,7 @@ metadata:
version: "devel"
operator.tekton.dev/release: "devel"
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: OpenShiftPipelinesAsCode
Expand Down Expand Up @@ -1378,6 +1380,7 @@ metadata:
version: "devel"
operator.tekton.dev/release: "devel"
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: TektonChain
Expand Down Expand Up @@ -2350,6 +2353,7 @@ metadata:
version: "devel"
operator.tekton.dev/release: "devel"
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: TektonConfig
Expand Down Expand Up @@ -4452,6 +4456,7 @@ metadata:
version: "devel"
operator.tekton.dev/release: "devel"
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: TektonDashboard
Expand Down Expand Up @@ -4667,6 +4672,7 @@ metadata:
version: "devel"
operator.tekton.dev/release: "devel"
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: TektonInstallerSet
Expand Down Expand Up @@ -4781,6 +4787,7 @@ metadata:
version: "devel"
operator.tekton.dev/release: "devel"
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: TektonPipeline
Expand Down Expand Up @@ -5652,6 +5659,7 @@ metadata:
version: "devel"
operator.tekton.dev/release: "devel"
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: TektonResult
Expand Down Expand Up @@ -6541,6 +6549,7 @@ metadata:
version: "devel"
operator.tekton.dev/release: "devel"
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: TektonTrigger
Expand Down Expand Up @@ -7244,6 +7253,7 @@ metadata:
version: "devel"
operator.tekton.dev/release: "devel"
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: TektonPruner
Expand Down Expand Up @@ -8067,6 +8077,7 @@ metadata:
version: "devel"
operator.tekton.dev/release: "devel"
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: TektonScheduler
Expand Down Expand Up @@ -8742,6 +8753,7 @@ metadata:
version: "devel"
operator.tekton.dev/release: "devel"
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: TektonMulticlusterProxyAAE
Expand Down Expand Up @@ -9386,6 +9398,7 @@ metadata:
version: "devel"
operator.tekton.dev/release: "devel"
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: SyncerService
Expand Down
13 changes: 13 additions & 0 deletions charts/tekton-operator/templates/openshift-crds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ metadata:
version: "devel"
operator.tekton.dev/release: "devel"
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: ManualApprovalGate
Expand Down Expand Up @@ -655,6 +656,7 @@ metadata:
version: "devel"
operator.tekton.dev/release: "devel"
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: OpenShiftPipelinesAsCode
Expand Down Expand Up @@ -1378,6 +1380,7 @@ metadata:
version: "devel"
operator.tekton.dev/release: "devel"
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: TektonAddon
Expand Down Expand Up @@ -1572,6 +1575,7 @@ metadata:
version: "devel"
operator.tekton.dev/release: "devel"
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: TektonChain
Expand Down Expand Up @@ -2544,6 +2548,7 @@ metadata:
version: "devel"
operator.tekton.dev/release: "devel"
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: TektonConfig
Expand Down Expand Up @@ -4646,6 +4651,7 @@ metadata:
version: "devel"
operator.tekton.dev/release: "devel"
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: TektonInstallerSet
Expand Down Expand Up @@ -4760,6 +4766,7 @@ metadata:
version: "devel"
operator.tekton.dev/release: "devel"
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: TektonPipeline
Expand Down Expand Up @@ -5631,6 +5638,7 @@ metadata:
version: "devel"
operator.tekton.dev/release: "devel"
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: TektonResult
Expand Down Expand Up @@ -6520,6 +6528,7 @@ metadata:
version: "devel"
operator.tekton.dev/release: "devel"
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: TektonTrigger
Expand Down Expand Up @@ -7223,6 +7232,7 @@ metadata:
version: "devel"
operator.tekton.dev/release: "devel"
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: TektonPruner
Expand Down Expand Up @@ -8046,6 +8056,7 @@ metadata:
version: "devel"
operator.tekton.dev/release: "devel"
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: TektonScheduler
Expand Down Expand Up @@ -8721,6 +8732,7 @@ metadata:
version: "devel"
operator.tekton.dev/release: "devel"
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: TektonMulticlusterProxyAAE
Expand Down Expand Up @@ -9365,6 +9377,7 @@ metadata:
version: "devel"
operator.tekton.dev/release: "devel"
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: SyncerService
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
controller-gen.kubebuilder.io/version: v0.18.0
name: manualapprovalgates.operator.tekton.dev
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: ManualApprovalGate
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
controller-gen.kubebuilder.io/version: v0.18.0
name: openshiftpipelinesascodes.operator.tekton.dev
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: OpenShiftPipelinesAsCode
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
controller-gen.kubebuilder.io/version: v0.18.0
name: syncerservices.operator.tekton.dev
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: SyncerService
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
controller-gen.kubebuilder.io/version: v0.18.0
name: tektonaddons.operator.tekton.dev
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: TektonAddon
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
controller-gen.kubebuilder.io/version: v0.18.0
name: tektonchains.operator.tekton.dev
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: TektonChain
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
controller-gen.kubebuilder.io/version: v0.18.0
name: tektonconfigs.operator.tekton.dev
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: TektonConfig
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
controller-gen.kubebuilder.io/version: v0.18.0
name: tektondashboards.operator.tekton.dev
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: TektonDashboard
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
controller-gen.kubebuilder.io/version: v0.18.0
name: tektoninstallersets.operator.tekton.dev
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: TektonInstallerSet
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
controller-gen.kubebuilder.io/version: v0.18.0
name: tektonmulticlusterproxyaaes.operator.tekton.dev
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: TektonMulticlusterProxyAAE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
controller-gen.kubebuilder.io/version: v0.18.0
name: tektonpipelines.operator.tekton.dev
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: TektonPipeline
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
controller-gen.kubebuilder.io/version: v0.18.0
name: tektonpruners.operator.tekton.dev
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: TektonPruner
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
controller-gen.kubebuilder.io/version: v0.18.0
name: tektonresults.operator.tekton.dev
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: TektonResult
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
controller-gen.kubebuilder.io/version: v0.18.0
name: tektonschedulers.operator.tekton.dev
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: TektonScheduler
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
controller-gen.kubebuilder.io/version: v0.18.0
name: tektontriggers.operator.tekton.dev
spec:
preserveUnknownFields: false
group: operator.tekton.dev
names:
kind: TektonTrigger
Expand Down
Loading