You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by as...@apache.org on 2021/02/01 16:08:27 UTC
[camel-k] branch master updated (61b4afc -> c1f704a)
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git.
from 61b4afc proposal: provided kamelets (fix typo)
new cf9873c fix(OLM): Fix OLM bundle Dockerfile post-processing on Mac OS
new c1f704a fix(OLM): Add missing kustomize dependent target to the bundle target
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
script/Makefile | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
[camel-k] 02/02: fix(OLM): Add missing kustomize dependent target
to the bundle target
Posted by as...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit c1f704a875fa6455dc2edb8382cd83d4cdbeb823
Author: Antonin Stefanutti <an...@stefanutti.fr>
AuthorDate: Mon Feb 1 16:13:57 2021 +0100
fix(OLM): Add missing kustomize dependent target to the bundle target
---
script/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/script/Makefile b/script/Makefile
index 7fa7024..dd94dd9 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -335,7 +335,7 @@ $(BUNDLE_CAMEL_APIS):
@# Clean up temporary working api directories
rm -rf api_*
-bundle: generate-crd $(BUNDLE_CAMEL_APIS)
+bundle: generate-crd $(BUNDLE_CAMEL_APIS) kustomize
@# Build kustomize manifests
$(KUSTOMIZE) build config/manifests | operator-sdk generate bundle --overwrite --version $(OPERATOR_VERSION) $(BUNDLE_METADATA_OPTS)
@# Move the dockerfile into the bundle directory
[camel-k] 01/02: fix(OLM): Fix OLM bundle Dockerfile
post-processing on Mac OS
Posted by as...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit cf9873c77e090e46f99e49389dc5151765113928
Author: Antonin Stefanutti <an...@stefanutti.fr>
AuthorDate: Mon Feb 1 16:11:45 2021 +0100
fix(OLM): Fix OLM bundle Dockerfile post-processing on Mac OS
---
script/Makefile | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/script/Makefile b/script/Makefile
index 217e2d5..7fa7024 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -339,7 +339,11 @@ bundle: generate-crd $(BUNDLE_CAMEL_APIS)
@# Build kustomize manifests
$(KUSTOMIZE) build config/manifests | operator-sdk generate bundle --overwrite --version $(OPERATOR_VERSION) $(BUNDLE_METADATA_OPTS)
@# Move the dockerfile into the bundle directory
+ifneq ($(uname -s 2>/dev/null || echo Unknown),Darwin)
+ mv bundle.Dockerfile bundle/Dockerfile && sed -i '.bak' 's/bundle\///g' bundle/Dockerfile
+else
mv bundle.Dockerfile bundle/Dockerfile && sed -i 's/bundle\///g' bundle/Dockerfile
+endif
@# Adds the licence headers to the csv file
./script/add_license.sh bundle/manifests ./script/headers/yaml.txt
@#operator-sdk bundle validate ./bundle