Skip to content

Commit bdb279e

Browse files
anik120tmshort
authored andcommitted
(makefile) Upgrade mikefarah/yq to v4 (openshift#267)
This PR upgrades the version of yq used in the makefile from v3@latest to [email protected] Upstream-repository: api Upstream-commit: b527a19c8e14e2249d5a5cdb88063cfb136fdafb
1 parent 0138a35 commit bdb279e

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

staging/api/Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,17 @@ manifests: yq controller-gen ## Generate manifests e.g. CRD, RBAC etc
5858
$(CONTROLLER_GEN) schemapatch:manifests=./crds output:dir=./crds paths=./pkg/operators/...
5959

6060
@# Add missing defaults in embedded core API schemas
61-
$(Q)$(YQ) w --inplace ./crds/operators.coreos.com_clusterserviceversions.yaml 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
62-
$(Q)$(YQ) w --inplace ./crds/operators.coreos.com_clusterserviceversions.yaml 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
61+
$(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
62+
$(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
6363

6464
@# Preserve fields for embedded metadata fields
65-
$(Q)$(YQ) w --inplace ./crds/operators.coreos.com_clusterserviceversions.yaml 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
65+
$(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
6666

6767
@# Remove OperatorCondition.spec.overrides[*].lastTransitionTime requirement
68-
$(Q)$(YQ) delete --inplace ./crds/operators.coreos.com_operatorconditions.yaml 'spec.versions[*].schema.openAPIV3Schema.properties.spec.properties.overrides.items.required(.==lastTransitionTime)'
68+
$(Q)$(YQ) --inplace 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.overrides.items.required[] | select(. == "lastTransitionTime"))' ./crds/operators.coreos.com_operatorconditions.yaml
6969

7070
@# Remove status subresource from the CRD manifests to ensure server-side apply works
71-
$(Q)for f in ./crds/*.yaml ; do $(YQ) d --inplace $$f status; done
71+
$(Q)for f in ./crds/*.yaml ; do $(YQ) --inplace 'del(.status)' $$f; done
7272

7373
@# Update embedded CRD files.
7474
$(Q)go generate ./crds/...
@@ -102,7 +102,7 @@ YQ ?= $(LOCALBIN)/yq
102102

103103
## Tool Versions
104104
CONTROLLER_TOOLS_VERSION ?= v0.9.0
105-
YQ_VERSION ?= latest
105+
YQ_VERSION ?= v4.28.1
106106

107107
.PHONY: controller-gen
108108
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
@@ -112,4 +112,4 @@ $(CONTROLLER_GEN): $(LOCALBIN)
112112
.PHONY: yq
113113
yq: $(YQ) ## Download yq locally if necessary.
114114
$(YQ): $(LOCALBIN)
115-
GOBIN=$(LOCALBIN) go install $(GO_INSTALL_OPTS) github.com/mikefarah/yq/v3@$(YQ_VERSION)
115+
GOBIN=$(LOCALBIN) go install $(GO_INSTALL_OPTS) github.com/mikefarah/yq/v4@$(YQ_VERSION)

0 commit comments

Comments
 (0)