This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 2256bd9c50103441ff06aaf0cd33b9a66c648cc7 Author: nicolaferraro <[email protected]> AuthorDate: Wed Apr 21 09:16:49 2021 +0200 chore: change references to use "main" --- .github/workflows/automatic-changelog-update.yml | 2 +- README.adoc | 2 +- docs/charts/index.yaml | 22 +++++++++--------- docs/modules/ROOT/pages/architecture/cr/build.adoc | 2 +- .../ROOT/pages/architecture/cr/camel-catalog.adoc | 2 +- .../pages/architecture/cr/integration-kit.adoc | 2 +- .../architecture/cr/integration-platform.adoc | 2 +- .../ROOT/pages/architecture/cr/integration.adoc | 2 +- docs/modules/ROOT/pages/architecture/operator.adoc | 2 +- .../ROOT/pages/contributing/developers.adoc | 26 +++++++++++----------- .../ROOT/pages/running/run-from-github.adoc | 2 +- .../ROOT/pages/tutorials/tekton/tekton.adoc | 4 ++-- e2e/common/cli/run_test.go | 2 +- script/Makefile | 4 ++-- 14 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.github/workflows/automatic-changelog-update.yml b/.github/workflows/automatic-changelog-update.yml index ee91376..be6356b 100644 --- a/.github/workflows/automatic-changelog-update.yml +++ b/.github/workflows/automatic-changelog-update.yml @@ -29,7 +29,7 @@ jobs: name: Generate changelog for main branch if: github.ref == 'refs/heads/main' && github.repository == 'apache/camel-k' steps: - - name: "Checkout camel-kafka-connector" + - name: "Checkout camel-k" uses: actions/checkout@v2 with: persist-credentials: false diff --git a/README.adoc b/README.adoc index 1fe75e7..5acb722 100644 --- a/README.adoc +++ b/README.adoc @@ -11,7 +11,7 @@ image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg["Chat on Zuli image:https://github.com/apache/camel-k/workflows/kubernetes/badge.svg["Kubernetes";, link="https://github.com/apache/camel-k/actions";] image:https://github.com/apache/camel-k/workflows/knative/badge.svg["Knative";, link="https://github.com/apache/camel-k/actions";] -image:https://img.shields.io/travis/apache/camel-k/master.svg?label=openshift["OpenShift";, link="https://travis-ci.org/apache/camel-k";] +image:https://img.shields.io/travis/apache/camel-k/main.svg?label=openshift["OpenShift";, link="https://travis-ci.org/apache/camel-k";] Apache Camel K is a lightweight integration platform, born on Kubernetes, with serverless superpowers. diff --git a/docs/charts/index.yaml b/docs/charts/index.yaml index 902701e..ff2bedd 100644 --- a/docs/charts/index.yaml +++ b/docs/charts/index.yaml @@ -8,7 +8,7 @@ entries: superpowers digest: a011dd36bbfb07a23ca18baabec945274d2ac1164e08414147ecf683cccf8a21 home: https://camel.apache.org/camel-k/latest/ - icon: https://github.com/apache/camel/raw/master/docs/img/logo64-d.png + icon: https://github.com/apache/camel/raw/main/docs/img/logo64-d.png keywords: - serverless - integration @@ -33,7 +33,7 @@ entries: superpowers digest: 30d999fb1a24c741829cd3ad1c1ba3c8ac4d0571a9ad1258c327c426913312d7 home: https://camel.apache.org/camel-k/latest/ - icon: https://github.com/apache/camel/raw/master/docs/img/logo64-d.png + icon: https://github.com/apache/camel/raw/main/docs/img/logo64-d.png keywords: - serverless - integration @@ -58,7 +58,7 @@ entries: superpowers digest: 222b6b51ac7c836e1a7cfe44228de3666cb2b4c559c64bee35afaef9cbfe2449 home: https://camel.apache.org/camel-k/latest/ - icon: https://github.com/apache/camel/raw/master/docs/img/logo64-d.png + icon: https://github.com/apache/camel/raw/main/docs/img/logo64-d.png keywords: - serverless - integration @@ -83,7 +83,7 @@ entries: superpowers digest: 393f4e4b32119824442ee2abdfc34a34bc49ec0fc6e957057e955cb5dd63aece home: https://camel.apache.org/camel-k/latest/ - icon: https://github.com/apache/camel/raw/master/docs/img/logo64-d.png + icon: https://github.com/apache/camel/raw/main/docs/img/logo64-d.png keywords: - serverless - integration @@ -108,7 +108,7 @@ entries: superpowers digest: c47863e13644340b857acf5c688004927e0ad126a9c39e8c90fa6d84e2c445b9 home: https://camel.apache.org/camel-k/latest/ - icon: https://github.com/apache/camel/raw/master/docs/img/logo64-d.png + icon: https://github.com/apache/camel/raw/main/docs/img/logo64-d.png keywords: - serverless - integration @@ -133,7 +133,7 @@ entries: superpowers digest: 46771bd1c0e52097f07e9c17e657690872716ed845b196cd0c981c97b984b573 home: https://camel.apache.org/camel-k/latest/ - icon: https://github.com/apache/camel/raw/master/docs/img/logo64-d.png + icon: https://github.com/apache/camel/raw/main/docs/img/logo64-d.png keywords: - serverless - integration @@ -158,7 +158,7 @@ entries: superpowers digest: d7453b9b6281355caad37896c6760be64735f69009bc312a54cbc17e8a1f6697 home: https://camel.apache.org/camel-k/latest/ - icon: https://github.com/apache/camel/raw/master/docs/img/logo64-d.png + icon: https://github.com/apache/camel/raw/main/docs/img/logo64-d.png keywords: - serverless - integration @@ -183,7 +183,7 @@ entries: superpowers digest: 610a2b024d539451ee278b72179f34c242a67b7949e2a4eae7b0fa2d8d3630e3 home: https://camel.apache.org/camel-k/latest/ - icon: https://github.com/apache/camel/raw/master/docs/img/logo64-d.png + icon: https://github.com/apache/camel/raw/main/docs/img/logo64-d.png keywords: - serverless - integration @@ -208,7 +208,7 @@ entries: superpowers digest: 3d5397e111004a8735849dcebd55c9827e687aa3ab28b5c28de8fe69595e1b8f home: https://camel.apache.org/camel-k/latest/ - icon: https://github.com/apache/camel/raw/master/docs/img/logo64-d.png + icon: https://github.com/apache/camel/raw/main/docs/img/logo64-d.png keywords: - serverless - integration @@ -233,7 +233,7 @@ entries: superpowers digest: 43fa5d9563ce76d25695e4132c5870279541b26be2ac8023537b587483853260 home: https://camel.apache.org/camel-k/latest/ - icon: https://github.com/apache/camel/raw/master/docs/img/logo64-d.png + icon: https://github.com/apache/camel/raw/main/docs/img/logo64-d.png keywords: - serverless - integration @@ -258,7 +258,7 @@ entries: superpowers digest: 3bc8c53c4d781c4b4e4aac254d291339b348c2d8b4cf24b579ceb4330a48edd5 home: https://camel.apache.org/camel-k/latest/ - icon: https://raw.githubusercontent.com/apache/camel/master/docs/img/logo-d.svg + icon: https://raw.githubusercontent.com/apache/camel/main/docs/img/logo-d.svg keywords: - serverless - integration diff --git a/docs/modules/ROOT/pages/architecture/cr/build.adoc b/docs/modules/ROOT/pages/architecture/cr/build.adoc index 47cd198..60cc9ca 100644 --- a/docs/modules/ROOT/pages/architecture/cr/build.adoc +++ b/docs/modules/ROOT/pages/architecture/cr/build.adoc @@ -20,7 +20,7 @@ type BuildSpec struct { [NOTE] ==== -the full go definition can be found https://github.com/apache/camel-k/blob/master/pkg/apis/camel/v1/build_types.go[here] +the full go definition can be found https://github.com/apache/camel-k/blob/main/pkg/apis/camel/v1/build_types.go[here] ==== image::architecture/camel-k-state-machine-build.png[life cycle] diff --git a/docs/modules/ROOT/pages/architecture/cr/camel-catalog.adoc b/docs/modules/ROOT/pages/architecture/cr/camel-catalog.adoc index 815dc18..ca59c77 100644 --- a/docs/modules/ROOT/pages/architecture/cr/camel-catalog.adoc +++ b/docs/modules/ROOT/pages/architecture/cr/camel-catalog.adoc @@ -5,5 +5,5 @@ The *CamelCatalog* is a static side resource that provides metadata related to w [NOTE] ==== -the full go definition can be found https://github.com/apache/camel-k/blob/master/pkg/apis/camel/v1/camelcatalog_types.go[here] +the full go definition can be found https://github.com/apache/camel-k/blob/main/pkg/apis/camel/v1/camelcatalog_types.go[here] ==== \ No newline at end of file diff --git a/docs/modules/ROOT/pages/architecture/cr/integration-kit.adoc b/docs/modules/ROOT/pages/architecture/cr/integration-kit.adoc index 5f3edfc..4ae9b47 100644 --- a/docs/modules/ROOT/pages/architecture/cr/integration-kit.adoc +++ b/docs/modules/ROOT/pages/architecture/cr/integration-kit.adoc @@ -28,7 +28,7 @@ type IntegrationKitSpec struct { [NOTE] ==== -the full go definition can be found https://github.com/apache/camel-k/blob/master/pkg/apis/camel/v1/integrationkit_types.go[here] +the full go definition can be found https://github.com/apache/camel-k/blob/main/pkg/apis/camel/v1/integrationkit_types.go[here] ==== image::architecture/camel-k-state-machine-integrationkit.png[life cycle] diff --git a/docs/modules/ROOT/pages/architecture/cr/integration-platform.adoc b/docs/modules/ROOT/pages/architecture/cr/integration-platform.adoc index 0abbde7..8bb85b8 100644 --- a/docs/modules/ROOT/pages/architecture/cr/integration-platform.adoc +++ b/docs/modules/ROOT/pages/architecture/cr/integration-platform.adoc @@ -27,7 +27,7 @@ type IntegrationPlatformSpec struct { [NOTE] ==== -the full go definition can be found https://github.com/apache/camel-k/blob/master/pkg/apis/camel/v1/integrationplatform_types.go[here] +the full go definition can be found https://github.com/apache/camel-k/blob/main/pkg/apis/camel/v1/integrationplatform_types.go[here] ==== Upon start-up, the operator checks if the *IntegrationPlatform* is ready and if not, it executes all the steps required to be ready to operate: diff --git a/docs/modules/ROOT/pages/architecture/cr/integration.adoc b/docs/modules/ROOT/pages/architecture/cr/integration.adoc index cfa69ab..40d844d 100644 --- a/docs/modules/ROOT/pages/architecture/cr/integration.adoc +++ b/docs/modules/ROOT/pages/architecture/cr/integration.adoc @@ -30,7 +30,7 @@ type IntegrationSpec struct { [NOTE] ==== -the full go definition can be found https://github.com/apache/camel-k/blob/master/pkg/apis/camel/v1/integration_types.go[here] +the full go definition can be found https://github.com/apache/camel-k/blob/main/pkg/apis/camel/v1/integration_types.go[here] ==== image::architecture/camel-k-state-machine-integration.png[life cycle] diff --git a/docs/modules/ROOT/pages/architecture/operator.adoc b/docs/modules/ROOT/pages/architecture/operator.adoc index 3d62610..991c8f6 100644 --- a/docs/modules/ROOT/pages/architecture/operator.adoc +++ b/docs/modules/ROOT/pages/architecture/operator.adoc @@ -45,5 +45,5 @@ type Action interface { [NOTE] ==== -Since the go language does not yet support generics, there is an `Action` definition per CR, The full list of definitions can be found in the https://github.com/apache/camel-k/tree/master/pkg/controller[controller package] +Since the go language does not yet support generics, there is an `Action` definition per CR, The full list of definitions can be found in the https://github.com/apache/camel-k/tree/main/pkg/controller[controller package] ==== diff --git a/docs/modules/ROOT/pages/contributing/developers.adoc b/docs/modules/ROOT/pages/contributing/developers.adoc index 0271ba2..47a6ecf 100644 --- a/docs/modules/ROOT/pages/contributing/developers.adoc +++ b/docs/modules/ROOT/pages/contributing/developers.adoc @@ -41,15 +41,15 @@ This is a high-level overview of the project structure: [options="header"] |======================= | Path | Content -| https://github.com/apache/camel-k/tree/master/build[/build] | Contains the Docker and Maven build configuration. -| https://github.com/apache/camel-k/tree/master/cmd[/cmd] | Contains the entry points (the *main* functions) for the **camel-k** binary (manager) and the **kamel** client tool. -| https://github.com/apache/camel-k/tree/master/config[/config] | Contains Kubernetes resource files, specifically for use with the operator-sdk, that are used by the **kamel** client during installation. The `/pkg/resources/resources.go` file is kept in sync with the content of the directory (`make build-resources`), so that resources can be used from within the go code. -| https://github.com/apache/camel-k/tree/master/deploy[/deploy] | Contains Kubernetes resource files, used by the **kamel** client during installation. The `/pkg/resources.go` file is kept in sync with the content of the directory (`make build-resources`), so that resources can be used from within the go code. -| https://github.com/apache/camel-k/tree/master/docs[/docs] | Contains the documentation website based on https://antora.org/[Antora]. -| https://github.com/apache/camel-k/tree/master/e2e[/e2e] | Include integration tests to ensure that the software interacts correctly with Kubernetes and OpenShift. -| https://github.com/apache/camel-k/tree/master/examples[/examples] | Various examples of Camel K usage. -| https://github.com/apache/camel-k/tree/master/pkg[/pkg] | This is where the code resides. The code is divided in multiple subpackages. -| https://github.com/apache/camel-k/tree/master/script[/script] | Contains scripts used during make operations for building the project. +| https://github.com/apache/camel-k/tree/main/build[/build] | Contains the Docker and Maven build configuration. +| https://github.com/apache/camel-k/tree/main/cmd[/cmd] | Contains the entry points (the *main* functions) for the **camel-k** binary (manager) and the **kamel** client tool. +| https://github.com/apache/camel-k/tree/main/config[/config] | Contains Kubernetes resource files, specifically for use with the operator-sdk, that are used by the **kamel** client during installation. The `/pkg/resources/resources.go` file is kept in sync with the content of the directory (`make build-resources`), so that resources can be used from within the go code. +| https://github.com/apache/camel-k/tree/main/deploy[/deploy] | Contains Kubernetes resource files, used by the **kamel** client during installation. The `/pkg/resources.go` file is kept in sync with the content of the directory (`make build-resources`), so that resources can be used from within the go code. +| https://github.com/apache/camel-k/tree/main/docs[/docs] | Contains the documentation website based on https://antora.org/[Antora]. +| https://github.com/apache/camel-k/tree/main/e2e[/e2e] | Include integration tests to ensure that the software interacts correctly with Kubernetes and OpenShift. +| https://github.com/apache/camel-k/tree/main/examples[/examples] | Various examples of Camel K usage. +| https://github.com/apache/camel-k/tree/main/pkg[/pkg] | This is where the code resides. The code is divided in multiple subpackages. +| https://github.com/apache/camel-k/tree/main/script[/script] | Contains scripts used during make operations for building the project. |======================= [[building]] @@ -89,7 +89,7 @@ Unit tests are executed automatically as part of the build. They use the standar Integration tests (aimed at ensuring that the code integrates correctly with Kubernetes and OpenShift), need special care. The **convention** used in this repo is to name tests `xxx_test.go`. -Integration tests are all in the https://github.com/apache/camel-k/tree/master/e2e[/e2e] dir. +Integration tests are all in the https://github.com/apache/camel-k/tree/main/e2e[/e2e] dir. Since both names end with `_test.go`, both would be executed by go during the build, so you need to put a special **build tag** to mark integration tests. An integration test should start with the following line: @@ -99,7 +99,7 @@ integration tests. An integration test should start with the following line: // +build integration ---- -Look into the https://github.com/apache/camel-k/tree/master/e2e[/e2e] directory for examples of integration tests. +Look into the https://github.com/apache/camel-k/tree/main/e2e[/e2e] directory for examples of integration tests. Before running an integration test, you need to be connected to a Kubernetes/OpenShift namespace. After you log in into your cluster, you can run the following command to execute **all** integration tests: @@ -167,7 +167,7 @@ Sometimes it's useful to debug the code from the IDE when troubleshooting. .**Debugging the `kamel` binary** -It should be straightforward: just execute the https://github.com/apache/camel-k/tree/master/cmd/kamel/main.go[/cmd/kamel/main.go] file from the IDE (e.g. Goland) in debug mode. +It should be straightforward: just execute the https://github.com/apache/camel-k/tree/main/cmd/kamel/main.go[/cmd/kamel/main.go] file from the IDE (e.g. Goland) in debug mode. .**Debugging the operator** @@ -183,7 +183,7 @@ oc scale deployment/camel-k-operator --replicas 0 You can scale it back to 1 when you're done, and you have updated the operator image. -You can set up the IDE (e.g. Goland) to execute the https://github.com/apache/camel-k/blob/master/cmd/manager/main.go[/cmd/manager/main.go] file in debug mode with `operator` as the argument. +You can set up the IDE (e.g. Goland) to execute the https://github.com/apache/camel-k/blob/main/cmd/manager/main.go[/cmd/manager/main.go] file in debug mode with `operator` as the argument. When configuring the IDE task, make sure to add all required environment variables in the *IDE task configuration screen*: diff --git a/docs/modules/ROOT/pages/running/run-from-github.adoc b/docs/modules/ROOT/pages/running/run-from-github.adoc index be51e8c..cce64a7 100644 --- a/docs/modules/ROOT/pages/running/run-from-github.adoc +++ b/docs/modules/ROOT/pages/running/run-from-github.adoc @@ -23,7 +23,7 @@ is equivalent to: [source] ---- -kamel run https://raw.githubusercontent.com/apache/camel-k/master/examples/languages/Sample.java +kamel run https://raw.githubusercontent.com/apache/camel-k/main/examples/languages/Sample.java ---- but does not require to type the full GitHub RAW URL. diff --git a/docs/modules/ROOT/pages/tutorials/tekton/tekton.adoc b/docs/modules/ROOT/pages/tutorials/tekton/tekton.adoc index db083a2..823bef2 100644 --- a/docs/modules/ROOT/pages/tutorials/tekton/tekton.adoc +++ b/docs/modules/ROOT/pages/tutorials/tekton/tekton.adoc @@ -168,7 +168,7 @@ spec: ---- The integration file to be executed is set to `examples/tekton/hello.groovy` that is a simple "Hello World" integration contained in the Camel K -github repository https://github.com/apache/camel-k/tree/master/example/tekton[example/tekton directory]. +github repository https://github.com/apache/camel-k/tree/main/example/tekton[example/tekton directory]. In order to specify the actual source repository, the definition file contains also the following resource: @@ -182,7 +182,7 @@ spec: type: git params: - name: revision - value: master + value: main - name: url value: https://github.com/apache/camel-k ---- diff --git a/e2e/common/cli/run_test.go b/e2e/common/cli/run_test.go index 0aae23a..0567cfa 100644 --- a/e2e/common/cli/run_test.go +++ b/e2e/common/cli/run_test.go @@ -45,7 +45,7 @@ func TestRunExamplesFromGitHub(t *testing.T) { }) t.Run("run java from GitHub (RAW)", func(t *testing.T) { - Expect(Kamel("run", "-n", ns, "https://raw.githubusercontent.com/apache/camel-k/master/e2e/common/files/Java.java";).Execute()).To(Succeed()) + Expect(Kamel("run", "-n", ns, "https://raw.githubusercontent.com/apache/camel-k/main/e2e/common/files/Java.java";).Execute()).To(Succeed()) Eventually(IntegrationPodPhase(ns, "java"), TestTimeoutMedium).Should(Equal(v1.PodRunning)) Eventually(IntegrationCondition(ns, "java", camelv1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(v1.ConditionTrue)) Eventually(IntegrationLogs(ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) diff --git a/script/Makefile b/script/Makefile index dd3aa10..617152e 100644 --- a/script/Makefile +++ b/script/Makefile @@ -37,7 +37,7 @@ STAGING_RUNTIME_REPO := # Define here the repo containing the default Kamelet catalog (if any) KAMELET_CATALOG_REPO := https://github.com/apache/camel-kamelets.git # Optional branch for the default Kamelet catalog (change this to a tag before release) -KAMELET_CATALOG_REPO_BRANCH := v0.2.1 +KAMELET_CATALOG_REPO_BRANCH := main # When packaging artifacts into the docker image, you can "copy" them from local maven # or "download" them from Apache Snapshots and Maven Central @@ -194,7 +194,7 @@ build-resources: bundle-kamelets: ifneq (,$(findstring release,$(MAKECMDGOALS))) -ifneq (,$(findstring $(KAMELET_CATALOG_REPO_BRANCH), master main)) +ifneq (,$(findstring $(KAMELET_CATALOG_REPO_BRANCH), main)) @echo "You cannot set KAMELET_CATALOG_REPO_BRANCH=$(KAMELET_CATALOG_REPO_BRANCH) when doing a release" @exit 1 endif
![https://img.shields.io/badge/zulip-join_chat-brightgreen.svg["Chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg["Chat){kind=link}
![https://github.com/apache/camel-k/workflows/kubernetes/badge.svg["Kubernetes"](https://github.com/apache/camel-k/workflows/kubernetes/badge.svg["Kubernetes"){kind=link}
![https://github.com/apache/camel-k/workflows/knative/badge.svg["Knative"](https://github.com/apache/camel-k/workflows/knative/badge.svg["Knative"){kind=link}
![https://img.shields.io/travis/apache/camel-k/master.svg?label=openshift["OpenShift"](https://img.shields.io/travis/apache/camel-k/master.svg?label=openshift["OpenShift"){kind=link}
![https://img.shields.io/travis/apache/camel-k/main.svg?label=openshift["OpenShift"](https://img.shields.io/travis/apache/camel-k/main.svg?label=openshift["OpenShift"){kind=link}
