From ab7af3eaf245418f0730c5d1ef451a1aab3873e5 Mon Sep 17 00:00:00 2001 From: Ricardo Zanini Date: Tue, 15 Oct 2024 13:25:54 -0400 Subject: [PATCH 1/2] [9.101.prod][SRVLOGIC-413] - Add replaces attribute to CSV Signed-off-by: Ricardo Zanini --- Makefile.prod | 4 ++-- .../manifests/logic-operator-rhel8.clusterserviceversion.yaml | 1 + bundle.prod/manifests/sonataflow.org_sonataflows.yaml | 4 ++-- config/crd/bases/sonataflow.org_sonataflows.yaml | 4 ++-- .../bases/logic-operator-rhel8.clusterserviceversion.yaml | 1 + 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile.prod b/Makefile.prod index efcf2b13b..2d4ee3d41 100644 --- a/Makefile.prod +++ b/Makefile.prod @@ -223,14 +223,14 @@ CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen ENVTEST ?= $(LOCALBIN)/setup-envtest ## Tool Versions -KUSTOMIZE_VERSION ?= v4.5.2 +KUSTOMIZE_VERSION ?= v5.5.0 CONTROLLER_TOOLS_VERSION ?= v0.9.2 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" .PHONY: kustomize kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary. $(KUSTOMIZE): $(LOCALBIN) - test -s $(LOCALBIN)/kustomize || GO111MODULE=on GOBIN=$(LOCALBIN) go install sigs.k8s.io/kustomize/kustomize/v4@$(KUSTOMIZE_VERSION) + test -s $(LOCALBIN)/kustomize || GO111MODULE=on GOBIN=$(LOCALBIN) go install sigs.k8s.io/kustomize/kustomize/v5@$(KUSTOMIZE_VERSION) .PHONY: controller-gen controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary. diff --git a/bundle.prod/manifests/logic-operator-rhel8.clusterserviceversion.yaml b/bundle.prod/manifests/logic-operator-rhel8.clusterserviceversion.yaml index 27062c358..1380571a6 100644 --- a/bundle.prod/manifests/logic-operator-rhel8.clusterserviceversion.yaml +++ b/bundle.prod/manifests/logic-operator-rhel8.clusterserviceversion.yaml @@ -893,4 +893,5 @@ spec: minKubeVersion: 1.23.0 provider: name: Red Hat + replaces: logic-operator-rhel8.v1.33.0 version: 1.34.0 diff --git a/bundle.prod/manifests/sonataflow.org_sonataflows.yaml b/bundle.prod/manifests/sonataflow.org_sonataflows.yaml index 4dc1ae28b..f2c73fe9e 100644 --- a/bundle.prod/manifests/sonataflow.org_sonataflows.yaml +++ b/bundle.prod/manifests/sonataflow.org_sonataflows.yaml @@ -80,8 +80,8 @@ spec: constants: additionalProperties: description: RawMessage is a raw encoded JSON value. It implements - Marshaler and Unmarshaler and can be used to delay JSON decoding - or precompute a JSON encoding. + [Marshaler] and [Unmarshaler] and can be used to delay JSON + decoding or precompute a JSON encoding. format: byte type: string description: Constants Workflow constants are used to define static, diff --git a/config/crd/bases/sonataflow.org_sonataflows.yaml b/config/crd/bases/sonataflow.org_sonataflows.yaml index fa24f8dfc..1e5e6c95e 100644 --- a/config/crd/bases/sonataflow.org_sonataflows.yaml +++ b/config/crd/bases/sonataflow.org_sonataflows.yaml @@ -81,8 +81,8 @@ spec: constants: additionalProperties: description: RawMessage is a raw encoded JSON value. It implements - Marshaler and Unmarshaler and can be used to delay JSON decoding - or precompute a JSON encoding. + [Marshaler] and [Unmarshaler] and can be used to delay JSON + decoding or precompute a JSON encoding. format: byte type: string description: Constants Workflow constants are used to define static, diff --git a/config/manifests/prod/bases/logic-operator-rhel8.clusterserviceversion.yaml b/config/manifests/prod/bases/logic-operator-rhel8.clusterserviceversion.yaml index 8708d5bd1..47302a1f9 100644 --- a/config/manifests/prod/bases/logic-operator-rhel8.clusterserviceversion.yaml +++ b/config/manifests/prod/bases/logic-operator-rhel8.clusterserviceversion.yaml @@ -283,4 +283,5 @@ spec: name: IMAGE_LOGIC_SWF_BUILDER - image: registry.redhat.io/openshift4/ose-kube-rbac-proxy@sha256:4564ca3dc5bac80d6faddaf94c817fbbc270698a9399d8a21ee1005d85ceda56 name: IMAGE_KUBE_RBAC_PROXY + replaces: logic-operator-rhel8.v1.33.0 version: 0.0.0 From 3430fc31cb2e1fd462da037da8c75dcaf3dd8d4d Mon Sep 17 00:00:00 2001 From: Ricardo Zanini Date: Tue, 15 Oct 2024 15:21:17 -0400 Subject: [PATCH 2/2] Fix files generation Signed-off-by: Ricardo Zanini --- bundle/manifests/sonataflow.org_sonataflows.yaml | 4 ++-- operator.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bundle/manifests/sonataflow.org_sonataflows.yaml b/bundle/manifests/sonataflow.org_sonataflows.yaml index 4dc1ae28b..f2c73fe9e 100644 --- a/bundle/manifests/sonataflow.org_sonataflows.yaml +++ b/bundle/manifests/sonataflow.org_sonataflows.yaml @@ -80,8 +80,8 @@ spec: constants: additionalProperties: description: RawMessage is a raw encoded JSON value. It implements - Marshaler and Unmarshaler and can be used to delay JSON decoding - or precompute a JSON encoding. + [Marshaler] and [Unmarshaler] and can be used to delay JSON + decoding or precompute a JSON encoding. format: byte type: string description: Constants Workflow constants are used to define static, diff --git a/operator.yaml b/operator.yaml index 76aab2681..107134948 100644 --- a/operator.yaml +++ b/operator.yaml @@ -16983,8 +16983,8 @@ spec: constants: additionalProperties: description: RawMessage is a raw encoded JSON value. It implements - Marshaler and Unmarshaler and can be used to delay JSON decoding - or precompute a JSON encoding. + [Marshaler] and [Unmarshaler] and can be used to delay JSON + decoding or precompute a JSON encoding. format: byte type: string description: Constants Workflow constants are used to define static,