From 26856fb33aa7034425101a8c1314fc5557dd988b 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 5e74b137279..d7ac1abf60e 100644 --- a/Makefile +++ b/Makefile @@ -316,7 +316,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 125d7a71f61e854a10761159ceee4d45a9a5a189 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 d7ac1abf60e..3d515dbb413 100644 --- a/Makefile +++ b/Makefile @@ -316,7 +316,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 65a51b021c8329f22795793a55ab739ea6a01876 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 3d515dbb413..603b4eaabde 100644 --- a/Makefile +++ b/Makefile @@ -316,7 +316,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 0e19f4c411271fcbeff54ef7d86c023facbe15d5 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 603b4eaabde..121507b254f 100644 --- a/Makefile +++ b/Makefile @@ -316,7 +316,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: