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 2022/04/01 09:24:31 UTC
[camel-k] branch main updated (566ed30 -> afca140)
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git.
from 566ed30 test fixing of "Global test on namespace with its own operator"
new dc33878 add k8s labels to deployment service
new afca140 customize k8s version label
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:
config/manager/operator-deployment.yaml | 7 +++++++
script/set_version.sh | 3 +++
2 files changed, 10 insertions(+)
[camel-k] 01/02: add k8s labels to deployment service
Posted by as...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit dc33878781461ec5af2ef34674aa9cba28b032e4
Author: Desire Kaleba <de...@gmail.com>
AuthorDate: Tue Mar 29 16:25:50 2022 +0300
add k8s labels to deployment service
---
config/manager/operator-deployment.yaml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/config/manager/operator-deployment.yaml b/config/manager/operator-deployment.yaml
index f788171..7c3fbcb 100644
--- a/config/manager/operator-deployment.yaml
+++ b/config/manager/operator-deployment.yaml
@@ -22,6 +22,10 @@ metadata:
labels:
app: "camel-k"
camel.apache.org/component: operator
+ name: camel-k-operator
+ app.kubernetes.io/component: operator
+ app.kubernetes.io/name: camel-k
+ app.kubernetes.io/version: "1.8.2"
spec:
replicas: 1
strategy:
@@ -35,6 +39,9 @@ spec:
name: camel-k-operator
camel.apache.org/component: operator
app: "camel-k"
+ app.kubernetes.io/component: operator
+ app.kubernetes.io/name: camel-k
+ app.kubernetes.io/version: "1.8.2"
spec:
serviceAccountName: camel-k-operator
containers:
[camel-k] 02/02: customize k8s version label
Posted by as...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit afca1402e63a2944990aab22c09a33b839ddd9b2
Author: Desire Kaleba <de...@gmail.com>
AuthorDate: Thu Mar 31 18:06:51 2022 +0300
customize k8s version label
---
script/set_version.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/script/set_version.sh b/script/set_version.sh
index ff61ab6..0d6dd11 100755
--- a/script/set_version.sh
+++ b/script/set_version.sh
@@ -26,14 +26,17 @@ location=$(dirname $0)
version=$1
image_name=${2:-docker.io\/apache\/camel-k}
sanitized_image_name=${image_name//\//\\\/}
+k8s_version_label="app.kubernetes.io\/version"
for f in $(find $location/../config/manager -type f -name "*.yaml");
do
if [[ "$OSTYPE" == "linux-gnu"* ]]; then
sed -i -r "s/image: .*/image: ${sanitized_image_name}:${version}/" $f
+ sed -i -r "s/${k8s_version_label}: .*/${k8s_version_label}: \""${version}"\"/" $f
elif [[ "$OSTYPE" == "darwin"* ]]; then
# Mac OSX
sed -i '' -E "s/image: .*/image: ${sanitized_image_name}:${version}/" $f
+ sed -i '' -E "s/${k8s_version_label}: .*/${k8s_version_label}: \""${version}"\"/" $f
fi
done