You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gi...@apache.org on 2023/10/18 23:52:41 UTC
[camel-k] branch main updated (dbb79829b -> 6461a63d4)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
from dbb79829b chore(deps): bump knative.dev/eventing from 0.38.4 to 0.38.5
new 1f68dbe2b chore: changelog automatic update
new 12a103200 chore: autogenerated project resource update
new 6461a63d4 chore: nightly SBOM update
The 3 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:
CHANGELOG.md | 4 ++
camel-k-sbom/camel-k-sbom.json | 66 +++++++++++------------
config/crd/bases/camel.apache.org_kamelets.yaml | 2 +-
docs/antora.yml | 2 +-
docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 1 -
helm/camel-k/crds/crd-kamelet.yaml | 2 +-
pkg/resources/resources.go | 4 +-
7 files changed, 42 insertions(+), 39 deletions(-)
[camel-k] 03/03: chore: nightly SBOM update
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 6461a63d4ce6dac966622fb2a83746dafdc98084
Author: github-actions[bot] <41...@users.noreply.github.com>
AuthorDate: Wed Oct 18 23:49:36 2023 +0000
chore: nightly SBOM update
---
camel-k-sbom/camel-k-sbom.json | 66 +++++++++++++++++++++---------------------
1 file changed, 33 insertions(+), 33 deletions(-)
diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json
index 981ecdfda..1a655522c 100644
--- a/camel-k-sbom/camel-k-sbom.json
+++ b/camel-k-sbom/camel-k-sbom.json
@@ -2,10 +2,10 @@
"$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.4",
- "serialNumber": "urn:uuid:609da321-5a71-45ad-b00c-4c28dd40ffdd",
+ "serialNumber": "urn:uuid:039287ac-bf5f-4e0b-9c87-ca91d15257e0",
"version": 1,
"metadata": {
- "timestamp": "2023-10-17T23:49:25Z",
+ "timestamp": "2023-10-18T23:49:36Z",
"tools": [
{
"vendor": "CycloneDX",
@@ -46,11 +46,11 @@
}
],
"component": {
- "bom-ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231017234424-4aaa110701ac?type=module",
+ "bom-ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231018234906-12a103200e63?type=module",
"type": "application",
"name": "github.com/apache/camel-k/v2",
- "version": "v0.0.0-20231017234424-4aaa110701ac",
- "purl": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231017234424-4aaa110701ac?type=module\u0026goos=linux\u0026goarch=amd64",
+ "version": "v0.0.0-20231018234906-12a103200e63",
+ "purl": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231018234906-12a103200e63?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k",
@@ -3676,18 +3676,18 @@
}
},
{
- "bom-ref": "pkg:golang/knative.dev/eventing@v0.38.4?type=module",
+ "bom-ref": "pkg:golang/knative.dev/eventing@v0.38.5?type=module",
"type": "library",
"name": "knative.dev/eventing",
- "version": "v0.38.4",
+ "version": "v0.38.5",
"scope": "required",
"hashes": [
{
"alg": "SHA-256",
- "content": "787d39f5b7de2e2963db100de95ed75ce877c2acf3e6cb28312fc2209a497e69"
+ "content": "36f4b2de57a4f486cb2d6128b77e8dc807cdbfb56424d977f05d48b552f40fab"
}
],
- "purl": "pkg:golang/knative.dev/eventing@v0.38.4?type=module\u0026goos=linux\u0026goarch=amd64",
+ "purl": "pkg:golang/knative.dev/eventing@v0.38.5?type=module\u0026goos=linux\u0026goarch=amd64",
"evidence": {
"licenses": [
{
@@ -3699,18 +3699,18 @@
}
},
{
- "bom-ref": "pkg:golang/knative.dev/networking@v0.0.0-20230718160410-75dcd54d9510?type=module",
+ "bom-ref": "pkg:golang/knative.dev/networking@v0.0.0-20231012062757-a5958051caf8?type=module",
"type": "library",
"name": "knative.dev/networking",
- "version": "v0.0.0-20230718160410-75dcd54d9510",
+ "version": "v0.0.0-20231012062757-a5958051caf8",
"scope": "required",
"hashes": [
{
"alg": "SHA-256",
- "content": "78d6d68c491bb468c2a8ae530784b40a34920dde0fbf25e6fb0edb33dff371ee"
+ "content": "a1931b0005f2883654628438a848cbeaec57acbd710557c4c90271f2c3f45c48"
}
],
- "purl": "pkg:golang/knative.dev/networking@v0.0.0-20230718160410-75dcd54d9510?type=module\u0026goos=linux\u0026goarch=amd64",
+ "purl": "pkg:golang/knative.dev/networking@v0.0.0-20231012062757-a5958051caf8?type=module\u0026goos=linux\u0026goarch=amd64",
"evidence": {
"licenses": [
{
@@ -3722,18 +3722,18 @@
}
},
{
- "bom-ref": "pkg:golang/knative.dev/pkg@v0.0.0-20230718152110-aef227e72ead?type=module",
+ "bom-ref": "pkg:golang/knative.dev/pkg@v0.0.0-20231011193800-bd99f2f98be7?type=module",
"type": "library",
"name": "knative.dev/pkg",
- "version": "v0.0.0-20230718152110-aef227e72ead",
+ "version": "v0.0.0-20231011193800-bd99f2f98be7",
"scope": "required",
"hashes": [
{
"alg": "SHA-256",
- "content": "d9d0f3a2ba4ab95656dd0a7b4db8ab30cab5e856c877c7fa6da710157f235cbc"
+ "content": "cb7a9b7d85f54ae4abff5cac5ef29fa55f2afe40b058b5a27825200210541e64"
}
],
- "purl": "pkg:golang/knative.dev/pkg@v0.0.0-20230718152110-aef227e72ead?type=module\u0026goos=linux\u0026goarch=amd64",
+ "purl": "pkg:golang/knative.dev/pkg@v0.0.0-20231011193800-bd99f2f98be7?type=module\u0026goos=linux\u0026goarch=amd64",
"evidence": {
"licenses": [
{
@@ -3745,18 +3745,18 @@
}
},
{
- "bom-ref": "pkg:golang/knative.dev/serving@v0.38.1?type=module",
+ "bom-ref": "pkg:golang/knative.dev/serving@v0.38.2?type=module",
"type": "library",
"name": "knative.dev/serving",
- "version": "v0.38.1",
+ "version": "v0.38.2",
"scope": "required",
"hashes": [
{
"alg": "SHA-256",
- "content": "00b2b2c8a0355dfd3cdc4b3648e13c1de0b2fef16115613a4dc1cdc6eac37f99"
+ "content": "c71c42e495301f3cecb12784598b3d0dcb9794db55f511cc5ff54894796a6be3"
}
],
- "purl": "pkg:golang/knative.dev/serving@v0.38.1?type=module\u0026goos=linux\u0026goarch=amd64",
+ "purl": "pkg:golang/knative.dev/serving@v0.38.2?type=module\u0026goos=linux\u0026goarch=amd64",
"evidence": {
"licenses": [
{
@@ -3853,7 +3853,7 @@
],
"dependencies": [
{
- "ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231017234424-4aaa110701ac?type=module",
+ "ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231018234906-12a103200e63?type=module",
"dependsOn": [
"pkg:golang/github.com/Masterminds/semver@v1.5.0?type=module",
"pkg:golang/github.com/container-tools/spectrum@v0.6.38?type=module",
@@ -3901,9 +3901,9 @@
"pkg:golang/k8s.io/klog/v2@v2.100.1?type=module",
"pkg:golang/k8s.io/kubectl@v0.27.4?type=module",
"pkg:golang/k8s.io/utils@v0.0.0-20230505201702-9f6742963106?type=module",
- "pkg:golang/knative.dev/eventing@v0.38.4?type=module",
- "pkg:golang/knative.dev/pkg@v0.0.0-20230718152110-aef227e72ead?type=module",
- "pkg:golang/knative.dev/serving@v0.38.1?type=module",
+ "pkg:golang/knative.dev/eventing@v0.38.5?type=module",
+ "pkg:golang/knative.dev/pkg@v0.0.0-20231011193800-bd99f2f98be7?type=module",
+ "pkg:golang/knative.dev/serving@v0.38.2?type=module",
"pkg:golang/sigs.k8s.io/controller-runtime@v0.15.2?type=module",
"pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.3.0?type=module"
]
@@ -5440,7 +5440,7 @@
]
},
{
- "ref": "pkg:golang/knative.dev/eventing@v0.38.4?type=module",
+ "ref": "pkg:golang/knative.dev/eventing@v0.38.5?type=module",
"dependsOn": [
"pkg:golang/contrib.go.opencensus.io/exporter/ocagent@v0.7.1-0.20200907061046-05415f1de66d?type=module",
"pkg:golang/contrib.go.opencensus.io/exporter/prometheus@v0.4.0?type=module",
@@ -5525,14 +5525,14 @@
"pkg:golang/k8s.io/klog/v2@v2.100.1?type=module",
"pkg:golang/k8s.io/kube-openapi@v0.0.0-20230501164219-8b0f38b5fd1f?type=module",
"pkg:golang/k8s.io/utils@v0.0.0-20230505201702-9f6742963106?type=module",
- "pkg:golang/knative.dev/pkg@v0.0.0-20230718152110-aef227e72ead?type=module",
+ "pkg:golang/knative.dev/pkg@v0.0.0-20231011193800-bd99f2f98be7?type=module",
"pkg:golang/sigs.k8s.io/json@v0.0.0-20221116044647-bc3834ca7abd?type=module",
"pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.3.0?type=module",
"pkg:golang/sigs.k8s.io/yaml@v1.3.0?type=module"
]
},
{
- "ref": "pkg:golang/knative.dev/networking@v0.0.0-20230718160410-75dcd54d9510?type=module",
+ "ref": "pkg:golang/knative.dev/networking@v0.0.0-20231012062757-a5958051caf8?type=module",
"dependsOn": [
"pkg:golang/contrib.go.opencensus.io/exporter/ocagent@v0.7.1-0.20200907061046-05415f1de66d?type=module",
"pkg:golang/contrib.go.opencensus.io/exporter/prometheus@v0.4.0?type=module",
@@ -5605,14 +5605,14 @@
"pkg:golang/k8s.io/klog/v2@v2.100.1?type=module",
"pkg:golang/k8s.io/kube-openapi@v0.0.0-20230501164219-8b0f38b5fd1f?type=module",
"pkg:golang/k8s.io/utils@v0.0.0-20230505201702-9f6742963106?type=module",
- "pkg:golang/knative.dev/pkg@v0.0.0-20230718152110-aef227e72ead?type=module",
+ "pkg:golang/knative.dev/pkg@v0.0.0-20231011193800-bd99f2f98be7?type=module",
"pkg:golang/sigs.k8s.io/json@v0.0.0-20221116044647-bc3834ca7abd?type=module",
"pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.3.0?type=module",
"pkg:golang/sigs.k8s.io/yaml@v1.3.0?type=module"
]
},
{
- "ref": "pkg:golang/knative.dev/pkg@v0.0.0-20230718152110-aef227e72ead?type=module",
+ "ref": "pkg:golang/knative.dev/pkg@v0.0.0-20231011193800-bd99f2f98be7?type=module",
"dependsOn": [
"pkg:golang/contrib.go.opencensus.io/exporter/ocagent@v0.7.1-0.20200907061046-05415f1de66d?type=module",
"pkg:golang/contrib.go.opencensus.io/exporter/prometheus@v0.4.0?type=module",
@@ -5691,7 +5691,7 @@
]
},
{
- "ref": "pkg:golang/knative.dev/serving@v0.38.1?type=module",
+ "ref": "pkg:golang/knative.dev/serving@v0.38.2?type=module",
"dependsOn": [
"pkg:golang/contrib.go.opencensus.io/exporter/ocagent@v0.7.1-0.20200907061046-05415f1de66d?type=module",
"pkg:golang/contrib.go.opencensus.io/exporter/prometheus@v0.4.0?type=module",
@@ -5778,8 +5778,8 @@
"pkg:golang/k8s.io/klog/v2@v2.100.1?type=module",
"pkg:golang/k8s.io/kube-openapi@v0.0.0-20230501164219-8b0f38b5fd1f?type=module",
"pkg:golang/k8s.io/utils@v0.0.0-20230505201702-9f6742963106?type=module",
- "pkg:golang/knative.dev/networking@v0.0.0-20230718160410-75dcd54d9510?type=module",
- "pkg:golang/knative.dev/pkg@v0.0.0-20230718152110-aef227e72ead?type=module",
+ "pkg:golang/knative.dev/networking@v0.0.0-20231012062757-a5958051caf8?type=module",
+ "pkg:golang/knative.dev/pkg@v0.0.0-20231011193800-bd99f2f98be7?type=module",
"pkg:golang/sigs.k8s.io/json@v0.0.0-20221116044647-bc3834ca7abd?type=module",
"pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.3.0?type=module",
"pkg:golang/sigs.k8s.io/yaml@v1.3.0?type=module"
[camel-k] 02/03: chore: autogenerated project resource update
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 12a103200e63ba3a6db1f0c0561db54432abe9d0
Author: github-actions[bot] <41...@users.noreply.github.com>
AuthorDate: Wed Oct 18 23:49:06 2023 +0000
chore: autogenerated project resource update
---
config/crd/bases/camel.apache.org_kamelets.yaml | 2 +-
docs/antora.yml | 2 +-
docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 1 -
helm/camel-k/crds/crd-kamelet.yaml | 2 +-
pkg/resources/resources.go | 4 ++--
5 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/config/crd/bases/camel.apache.org_kamelets.yaml b/config/crd/bases/camel.apache.org_kamelets.yaml
index e398cfc13..6848d47c4 100644
--- a/config/crd/bases/camel.apache.org_kamelets.yaml
+++ b/config/crd/bases/camel.apache.org_kamelets.yaml
@@ -41,7 +41,7 @@ spec:
- additionalPrinterColumns:
- description: The Kamelet phase
jsonPath: .status.phase
- name: Phase
+ name: Type
type: string
name: v1
schema:
diff --git a/docs/antora.yml b/docs/antora.yml
index e7f9ae4e2..e919db6fe 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -44,6 +44,6 @@ asciidoc:
kustomize-version: 4.5.4
kubernetes-api-version: 0.27.4
operator-fwk-api-version: 0.17.7
- knative-api-version: 0.38.4
+ knative-api-version: 0.38.5
service-binding-op-version: 1.4.0
prometheus-op-version: 0.67.1
diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
index ba32c10ef..ebcfe5f69 100644
--- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
+++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
@@ -3749,7 +3749,6 @@ Camel dependencies needed by the Kamelet
* <<#_camel_apache_org_v1_Kamelet, Kamelet>>
KameletStatus defines the observed state of Kamelet.
-Required since we deprecated the parameter. Any external user can still expect a Ready status here.
[cols="2,2a",options="header"]
|===
diff --git a/helm/camel-k/crds/crd-kamelet.yaml b/helm/camel-k/crds/crd-kamelet.yaml
index e398cfc13..6848d47c4 100644
--- a/helm/camel-k/crds/crd-kamelet.yaml
+++ b/helm/camel-k/crds/crd-kamelet.yaml
@@ -41,7 +41,7 @@ spec:
- additionalPrinterColumns:
- description: The Kamelet phase
jsonPath: .status.phase
- name: Phase
+ name: Type
type: string
name: v1
schema:
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 080f3393a..95910c0e1 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -159,9 +159,9 @@ var assets = func() http.FileSystem {
"/crd/bases/camel.apache.org_kamelets.yaml": &vfsgen۰CompressedFileInfo{
name: "camel.apache.org_kamelets.yaml",
modTime: time.Time{},
- uncompressedSize: 78273,
+ uncompressedSize: 78362,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x7b\x6f\xdc\x38\xb2\xef\xff\xfe\x14\x05\xe7\x00\x71\x00\x77\xdb\x8e\x93\xec\x8c\xef\x1f\x81\xd7\x49\x76\x7d\x27\x0f\xc3\x76\x76\xef\xdc\x64\x0e\xc0\x96\xd8\xdd\xdc\xa8\x29\x1d\x92\xf2\x63\x37\xf9\xee\x07\x24\x45\x3d\xba\xf5\x28\xca\x92\xed\x19\x0c\x81\x20\xee\x6e\xa9\x58\x24\x8b\xc5\xd7\xaf\x7e\x7c\x02\x93\xe1\xd2\xd6\x13\x78\xcf\x02\xca\x25\x0d\x41\xc5\xa0\x96\x14\x8e\x13\x12\x2c\x29\x5c\xc4\x73\x75\x4d\x04\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x7b\x6f\xdc\x38\xb2\xef\xff\xfe\x14\x05\xe7\x00\x71\x00\x77\xdb\x8e\x93\xec\x8c\xef\x1f\x81\xd7\x49\x76\x7d\x27\x2f\xd8\xce\xee\x9d\x9b\xcc\x01\xd8\x12\xbb\x9b\x1b\x35\xa5\x43\x52\xb6\x7b\x37\xf9\xee\x07\x24\x45\x3d\xba\xf5\x28\xca\x52\xec\x19\x0c\x81\x20\xee\x6e\xa9\x58\x24\x8b\xc5\xd7\xaf\x7e\x7c\x04\x93\xe1\xd2\xce\x23\x78\xcb\x02\xca\x25\x0d\x41\xc5\xa0\x96\x14\x4e\x13\x12\x2c\x29\x5c\xc6\x73\x75\x43\x04\x [...]
},
"/crd/bases/camel.apache.org_pipes.yaml": &vfsgen۰CompressedFileInfo{
name: "camel.apache.org_pipes.yaml",
[camel-k] 01/03: chore: changelog automatic update
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 1f68dbe2be1a36e78214ebb26e46932dea85a553
Author: github-actions[bot] <41...@users.noreply.github.com>
AuthorDate: Wed Oct 18 23:44:11 2023 +0000
chore: changelog automatic update
---
CHANGELOG.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9888448c..8be2ac6cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,9 @@
**Merged pull requests:**
+- chore\(deps\): bump knative.dev/eventing from 0.38.4 to 0.38.5 [\#4834](https://github.com/apache/camel-k/pull/4834) ([dependabot[bot]](https://github.com/apps/dependabot))
+- chore\(deps\): bump knative.dev/serving from 0.38.1 to 0.38.2 [\#4833](https://github.com/apache/camel-k/pull/4833) ([dependabot[bot]](https://github.com/apps/dependabot))
+- fix: removed unnecessary defaul value in route trait [\#4830](https://github.com/apache/camel-k/pull/4830) ([realMartinez](https://github.com/realMartinez))
- chore\(ci\): no coverage message when coverage unchanged [\#4829](https://github.com/apache/camel-k/pull/4829) ([squakez](https://github.com/squakez))
- fix\(ci\): fabric8 deps update [\#4828](https://github.com/apache/camel-k/pull/4828) ([squakez](https://github.com/squakez))
- Bump X/Net to version 0.17.0 [\#4820](https://github.com/apache/camel-k/pull/4820) ([oscerd](https://github.com/oscerd))
@@ -23,6 +26,7 @@
- feat\(trait\): let Camel runtime manages Kamelets [\#4812](https://github.com/apache/camel-k/pull/4812) ([squakez](https://github.com/squakez))
- fix\(ci\): OLM resources display name [\#4810](https://github.com/apache/camel-k/pull/4810) ([squakez](https://github.com/squakez))
- chore\(deps\): bump github.com/spf13/viper from 1.16.0 to 1.17.0 [\#4809](https://github.com/apache/camel-k/pull/4809) ([dependabot[bot]](https://github.com/apps/dependabot))
+- feat\(api\): Kamelet as static resource [\#4808](https://github.com/apache/camel-k/pull/4808) ([squakez](https://github.com/squakez))
- chore\(deps\): bump golang.org/x/oauth2 from 0.12.0 to 0.13.0 [\#4807](https://github.com/apache/camel-k/pull/4807) ([dependabot[bot]](https://github.com/apps/dependabot))
- chore\(deps\): bump github.com/container-tools/spectrum from 0.6.37 to 0.6.38 [\#4806](https://github.com/apache/camel-k/pull/4806) ([dependabot[bot]](https://github.com/apps/dependabot))
- feat\(core\): Move jib plugins versions to camelcatalog [\#4805](https://github.com/apache/camel-k/pull/4805) ([gansheer](https://github.com/gansheer))