From 77968db2e1cd979aca41ce9905ce672a186769cf Mon Sep 17 00:00:00 2001 From: Tiger Kaovilai Date: Fri, 31 May 2024 09:42:40 -0400 Subject: [PATCH 1/4] bundle createdAt sed for macOS Signed-off-by: Tiger Kaovilai --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d398bd91fa4..eafc3d1d3f3 100644 --- a/Makefile +++ b/Makefile @@ -327,7 +327,7 @@ bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metada # TODO: update CI to use generated one cp bundle.Dockerfile build/Dockerfile.bundle GOFLAGS="-mod=mod" $(OPERATOR_SDK) bundle validate ./bundle - sed -i '/ createdAt: /c\\$(shell grep -I '^ createdAt: ' bundle/manifests/oadp-operator.clusterserviceversion.yaml)' bundle/manifests/oadp-operator.clusterserviceversion.yaml + sed -i '' 's/ createdAt: .*/$(shell grep -I '^ createdAt: ' bundle/manifests/oadp-operator.clusterserviceversion.yaml)/' bundle/manifests/oadp-operator.clusterserviceversion.yaml .PHONY: nullables nullables: From 59cc39a61276a55eebc2c7e0c3d849c677802ec5 Mon Sep 17 00:00:00 2001 From: Tiger Kaovilai Date: Fri, 31 May 2024 10:17:33 -0400 Subject: [PATCH 2/4] Explicitly add -e for expression Signed-off-by: Tiger Kaovilai --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index eafc3d1d3f3..6195212f328 100644 --- a/Makefile +++ b/Makefile @@ -327,7 +327,7 @@ bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metada # TODO: update CI to use generated one cp bundle.Dockerfile build/Dockerfile.bundle GOFLAGS="-mod=mod" $(OPERATOR_SDK) bundle validate ./bundle - sed -i '' 's/ createdAt: .*/$(shell grep -I '^ createdAt: ' bundle/manifests/oadp-operator.clusterserviceversion.yaml)/' bundle/manifests/oadp-operator.clusterserviceversion.yaml + sed -i '' -e 's/ createdAt: .*/$(shell grep -I '^ createdAt: ' bundle/manifests/oadp-operator.clusterserviceversion.yaml)/' bundle/manifests/oadp-operator.clusterserviceversion.yaml .PHONY: nullables nullables: From afe63cd98dd279a24d3986f1484ecc0f64442552 Mon Sep 17 00:00:00 2001 From: Rayford Johnson Date: Fri, 31 May 2024 09:38:46 -0500 Subject: [PATCH 3/4] Adjust -i'' --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6195212f328..a0fc2022a2b 100644 --- a/Makefile +++ b/Makefile @@ -327,7 +327,7 @@ bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metada # TODO: update CI to use generated one cp bundle.Dockerfile build/Dockerfile.bundle GOFLAGS="-mod=mod" $(OPERATOR_SDK) bundle validate ./bundle - sed -i '' -e 's/ createdAt: .*/$(shell grep -I '^ createdAt: ' bundle/manifests/oadp-operator.clusterserviceversion.yaml)/' bundle/manifests/oadp-operator.clusterserviceversion.yaml + sed -i'' -e 's/ createdAt: .*/$(shell grep -I '^ createdAt: ' bundle/manifests/oadp-operator.clusterserviceversion.yaml)/' bundle/manifests/oadp-operator.clusterserviceversion.yaml .PHONY: nullables nullables: From 9071a4f04b873d183f215adef487b417c25b8cf0 Mon Sep 17 00:00:00 2001 From: Tiger Kaovilai Date: Fri, 31 May 2024 10:46:31 -0400 Subject: [PATCH 4/4] avoid in-place and use `mv` Signed-off-by: Tiger Kaovilai --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a0fc2022a2b..ff0ecc54711 100644 --- a/Makefile +++ b/Makefile @@ -327,7 +327,8 @@ bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metada # TODO: update CI to use generated one cp bundle.Dockerfile build/Dockerfile.bundle GOFLAGS="-mod=mod" $(OPERATOR_SDK) bundle validate ./bundle - sed -i'' -e 's/ createdAt: .*/$(shell grep -I '^ createdAt: ' bundle/manifests/oadp-operator.clusterserviceversion.yaml)/' bundle/manifests/oadp-operator.clusterserviceversion.yaml + sed -e 's/ createdAt: .*/$(shell grep -I '^ createdAt: ' bundle/manifests/oadp-operator.clusterserviceversion.yaml)/' bundle/manifests/oadp-operator.clusterserviceversion.yaml > bundle/manifests/oadp-operator.clusterserviceversion.yaml.tmp + mv bundle/manifests/oadp-operator.clusterserviceversion.yaml.tmp bundle/manifests/oadp-operator.clusterserviceversion.yaml .PHONY: nullables nullables: