This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new 834ac752e chore(docs): kamelet reference cleaning
834ac752e is described below
commit 834ac752ef81d5dfc2ec50fc588b70f543b9f3ed
Author: Pasquale Congiusti <[email protected]>
AuthorDate: Tue Sep 17 10:28:16 2024 +0200
chore(docs): kamelet reference cleaning
---
docs/antora.yml | 2 --
docs/modules/ROOT/pages/index.adoc | 10 ++----
script/Makefile | 5 ---
script/release_kustomize.sh | 74 --------------------------------------
script/update_default_camel.sh | 18 +---------
script/update_docs.sh | 16 ---------
6 files changed, 3 insertions(+), 122 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index f647c8804..43b882629 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -28,8 +28,6 @@ asciidoc:
attributes:
requires: "'util=camel-website-util,ck=xref:js/ck.js'"
prerelease: true
- camel-kamelets-version: '4.4.1'
- camel-kamelets-docs-version: 4.4.x
camel-k-runtime-version: 3.8.1
camel-api-versions: camel.apache.org/v1 camel.apache.org/v1alpha1 # from
Makefile BUNDLE_CAMEL_APIS
camel-version: 4.4.1
diff --git a/docs/modules/ROOT/pages/index.adoc
b/docs/modules/ROOT/pages/index.adoc
index 48dde87fd..e66aebbc1 100644
--- a/docs/modules/ROOT/pages/index.adoc
+++ b/docs/modules/ROOT/pages/index.adoc
@@ -36,11 +36,7 @@ The integration code will immediately run in the cloud.
Continue reading the doc
== Camel dependencies matrix
--
-ifdef::lts[This is a long term service release.]
-ifndef::lts[]
-ifdef::prerelease[This is a development version of {page-component-title}. It
should not be used in production.]
-ifndef::prerelease[This release will not be updated, but rather replaced by a
new release.]
-endif::[]
+ifdef::prerelease[NOTE: This is a development version of
{page-component-title}. It should not be used in production.]
--
From Camel K version 2 onward you will be able to use any Camel K Runtime.
Each runtime depends on a Camel Quarkus, Camel and Quarkus Platform version.
Every Camel K has a default runtime used, but you can
xref:configuration/runtime-version.adoc[pick any Camel K Runtime available]
(backward and forward compatible).
@@ -54,13 +50,11 @@ From Camel K version 2 onward you will be able to use any
Camel K Runtime. Each
|Camel Quarkus
|Camel
|Quarkus
-|Kamelets
-|LTS
|Branch
|===
//cannot use top level index.adoc as the page with the query is always omitted.
-indexTable::[version="*",relative="running/running.adoc",cellformats="util.ckRef(pageComponentDisplayVersion,
pageComponentVersion)|camelKRuntimeVersion|util.camelQuarkusRef(camelQuarkusVersion,
camelQuarkusDocsVersion)|util.camelRef(camelVersion,
camelDocsVersion)|util.quarkusRef(quarkusVersion)|util.kameletsRef(camelKameletsVersion,
camelKameletsDocsVersion)|lts|ck.branch(pageComponentVersion)",
requires={requires},transform=util.sortCompatibilityItems]
+indexTable::[version="*",relative="running/running.adoc",cellformats="util.ckRef(pageComponentDisplayVersion,
pageComponentVersion)|camelKRuntimeVersion|util.camelQuarkusRef(camelQuarkusVersion,
camelQuarkusDocsVersion)|util.camelRef(camelVersion,
camelDocsVersion)|util.quarkusRef(quarkusVersion)|ck.branch(pageComponentVersion)",
requires={requires},transform=util.sortCompatibilityItems]
== Other APIs version matrix
diff --git a/script/Makefile b/script/Makefile
index 3f6a8b1d1..f55b1b504 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -530,11 +530,6 @@ release-nightly: cross-compile images-push
release-helm:
./script/release_helm.sh ${VERSION}
-release-kustomize:
- RELEASE_VERSION=$(CUSTOM_VERSION) \
- RELEASE_NAME=$(PACKAGE) \
- ./script/release_kustomize.sh
-
.PHONY: do-build build build-kamel build-kamel-platform build-resources dep
codegen images images-push images-push-staging image-build test check clean
release cross-compile package-examples set-version git-tag check-licenses
build-resources release-helm release-staging release-nightly get-staging-repo
get-version
.PHONY: controller-gen kubectl kustomize operator-sdk opm
diff --git a/script/release_kustomize.sh b/script/release_kustomize.sh
deleted file mode 100755
index 7f842420e..000000000
--- a/script/release_kustomize.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -e
-
-location=$(dirname $0)
-rootdir=$(realpath ${location}/..)
-configdir="config"
-installdir="install"
-cmdutildir="cmd/util" # make cmd a hidden directory
-
-check_env_var() {
- if [ -z "${2}" ]; then
- echo "Error: ${1} env var not defined"
- exit 1
- fi
-}
-
-check_env_var "RELEASE_VERSION" ${RELEASE_VERSION}
-check_env_var "RELEASE_NAME" ${RELEASE_NAME}
-
-pushd ${rootdir}
-
-releasedir="${RELEASE_NAME}-${RELEASE_VERSION}-installer"
-zipname="${RELEASE_NAME}-${RELEASE_VERSION}-installer.zip"
-
-if [ -d "${releasedir}" ]; then
- rm -rf "${releasedir}"
-fi
-mkdir -p ${releasedir}
-
-#
-# Copies contents of install and converts softlinks
-# to target files.
-#
-cp -rfL "${installdir}"/* "${releasedir}/"
-
-#
-# Copy the platform-check go source since its built and run during install
-#
-mkdir -p "${releasedir}/.${cmdutildir}/"
-cp -rf "${cmdutildir}/platform-check" "${releasedir}/.${cmdutildir}/"
-
-#
-# Update location of cmd to point to hidden directory version
-#
-sed -i 's~^cmdutil=.*~cmdutil=\"./.cmd/util\"~'
${releasedir}/script/check_platform.sh
-
-#
-# Copy the config directory
-#
-cp -rfL "${configdir}" "${releasedir}/"
-
-#
-# Zip up the release
-#
-if [ -f "${zipname}" ]; then
- rm -f "${zipname}"
-fi
-zip -r "${zipname}" "${releasedir}" && rm -rf "${releasedir}"
diff --git a/script/update_default_camel.sh b/script/update_default_camel.sh
index 871219e71..884d4077b 100755
--- a/script/update_default_camel.sh
+++ b/script/update_default_camel.sh
@@ -26,21 +26,5 @@ git clone --depth 1
https://github.com/apache/camel-k-runtime.git /tmp/camel-k-r
ck_runtime_version=$(mvn help:evaluate -Dexpression=project.version -q
-DforceStdout -f /tmp/camel-k-runtime/pom.xml)
echo "INFO: last Camel K runtime version set at $ck_runtime_version"
sed -i "s/^DEFAULT_RUNTIME_VERSION := .*$/DEFAULT_RUNTIME_VERSION :=
$ck_runtime_version/" $location/Makefile
-camel_version=$(grep -oPm1 "(?<=<camel-version>)[^<]+"
/tmp/camel-k-runtime/pom.xml)
-rm -rf /tmp/camel-kamelets
-git clone https://github.com/apache/camel-kamelets.git /tmp/camel-kamelets
-pushd /tmp/camel-kamelets
-echo "INFO: Looking a suitable Kamelet tag for $camel_version camel version"
-kamelets_tag=$(git tag | grep $camel_version | sort -r | head -n 1)
-
-if [[ $kamelets_tag == "" ]]; then
- echo "INFO: no tag found for $camel_version camel version. Fallback to
main branch."
- kamelets_tag="main"
-fi
-
-popd
-echo "INFO: Kamelets version set at $kamelets_tag"
-sed -i "s/^KAMELET_CATALOG_REPO_TAG := .*$/KAMELET_CATALOG_REPO_TAG :=
$kamelets_tag/" $location/Makefile
-
-rm -rf /tmp/camel-k-runtime/ /tmp/camel-kamelets
\ No newline at end of file
+rm -rf /tmp/camel-k-runtime/
\ No newline at end of file
diff --git a/script/update_docs.sh b/script/update_docs.sh
index 829f8f764..41438ce9c 100755
--- a/script/update_docs.sh
+++ b/script/update_docs.sh
@@ -27,23 +27,9 @@ if [ ! -f $CATALOG ]; then
exit 1
fi
-KAMELET_CATALOG_REPO_TAG=$(grep '^KAMELET_CATALOG_REPO_TAG := ' Makefile | sed
's/^.* \?= //')
-KAMELETS_VERSION=$(echo $KAMELET_CATALOG_REPO_TAG | sed 's/^.//')
-if [[ "$KAMELET_CATALOG_REPO_TAG" == "main" ]]; then
- KAMELETS_VERSION="latest"
- KAMELETS_DOCS_VERSION="next"
-else
- re="^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+).*$"
- if ! [[ $KAMELETS_VERSION =~ $re ]]; then
- echo "❗ argument must match semantic version: $KAMELETS_VERSION"
- exit 1
- fi
- KAMELETS_DOCS_VERSION="${BASH_REMATCH[1]}.${BASH_REMATCH[2]}.x"
-fi
KUSTOMIZE_VERSION=$(grep '^KUSTOMIZE_VERSION := ' Makefile | sed 's/^.* \?=
//' | sed 's/^.//')
echo "Camel K Runtime version: $RUNTIME_VERSION"
-echo "Kamelets version: $KAMELETS_VERSION"
echo "Kustomize version: $KUSTOMIZE_VERSION"
yq -i ".asciidoc.attributes.kustomize-version = \"$KUSTOMIZE_VERSION\""
$location/../docs/antora.yml
@@ -77,8 +63,6 @@ yq -i ".asciidoc.attributes.camel-docs-version =
\"$CAMEL_DOCS_VERSION\"" $locat
yq -i ".asciidoc.attributes.camel-quarkus-version =
\"$CAMEL_QUARKUS_VERSION\"" $location/../docs/antora.yml
yq -i ".asciidoc.attributes.camel-quarkus-docs-version =
\"$CAMEL_QUARKUS_DOCS_VERSION\"" $location/../docs/antora.yml
yq -i ".asciidoc.attributes.quarkus-version = \"$QUARKUS_VERSION\""
$location/../docs/antora.yml
-yq -i ".asciidoc.attributes.camel-kamelets-version = \"$KAMELETS_VERSION\""
$location/../docs/antora.yml
-yq -i ".asciidoc.attributes.camel-kamelets-docs-version =
\"$KAMELETS_DOCS_VERSION\"" $location/../docs/antora.yml
echo "Scraping information from go.mod"
KNATIVE_API_VERSION=$(grep '^.*knative.dev/eventing ' $location/../go.mod |
sed 's/^.* //' | sed 's/^.//')
