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
commit b16a649b0a54d214804282d89889f77b06065fa4 Author: Pasquale Congiusti <[email protected]> AuthorDate: Wed Sep 20 14:54:56 2023 +0200 fix(ci): license check Ref #4700 --- .github/ISSUE_TEMPLATE/config.yml | 17 +++++++++++++++++ pkg/base/root.go | 3 ++- pkg/builder/jib.go | 2 ++ pkg/resources/resources.go | 27 ++++++++++++++++++++++----- pkg/util/jib/configuration_test.go | 3 ++- script/camel-k-runtime-archetype/pom.xml | 16 ++++++++++++++++ 6 files changed, 61 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index b6423007f..86d5e091f 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,3 +1,20 @@ +# --------------------------------------------------------------------------- +# 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. +# --------------------------------------------------------------------------- + blank_issues_enabled: false contact_links: - name: "Question via Camel K Zulip Chat" diff --git a/pkg/base/root.go b/pkg/base/root.go index 0e2f774ba..0ebf1e733 100644 --- a/pkg/base/root.go +++ b/pkg/base/root.go @@ -6,7 +6,7 @@ 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 + 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, @@ -14,6 +14,7 @@ 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. */ + package base import ( diff --git a/pkg/builder/jib.go b/pkg/builder/jib.go index 6ae130d00..75a8c26f8 100644 --- a/pkg/builder/jib.go +++ b/pkg/builder/jib.go @@ -5,7 +5,9 @@ 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. diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go index 243a7c7fc..e37a77d3b 100644 --- a/pkg/resources/resources.go +++ b/pkg/resources/resources.go @@ -174,6 +174,18 @@ var assets = func() http.FileSystem { name: "manager", modTime: time.Time{}, }, + "/manager/bundle": &vfsgen۰DirInfo{ + name: "bundle", + modTime: time.Time{}, + }, + "/manager/bundle/manifests": &vfsgen۰DirInfo{ + name: "manifests", + modTime: time.Time{}, + }, + "/manager/bundle/metadata": &vfsgen۰DirInfo{ + name: "metadata", + modTime: time.Time{}, + }, "/manager/operator-deployment.yaml": &vfsgen۰CompressedFileInfo{ name: "operator-deployment.yaml", modTime: time.Time{}, @@ -615,12 +627,12 @@ var assets = func() http.FileSystem { compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\xc1\x8e\xdb\x36\x14\xbc\xf3\x2b\x06\xd6\x25\x01\xd6\x72\xdb\x53\xe1\x9e\xdc\xcd\x6e\x2b\x34\xb0\x81\x95\xd3\x20\xc7\x67\xe9\x59\x7a\x58\x8a\x54\x1f\xa9\x55\xb6\x5f\x5f\x90\x96\xbb\x0e\xda\x63\x78\xb1\x05\x8d\xe6\xcd\xbc\x19\x16\x58\x7f\xbf\x63\x0a\x7c\x94\x86\x5d\xe0\x16\xd1\x23\xf6\x8c\xdd\x48\x4d\xcf\xa8\xfd\x39\xce\xa4\x8c\x47\x3f\xb9\x96\xa2\x78\x87\x77\xbb\xfa\xf1\x3d\x26\xd7\xb2\xc2\x3b\x86\x57\x0c\x5e\x [...] }, - "/camel-catalog-2.16.0.yaml": &vfsgen۰CompressedFileInfo{ - name: "camel-catalog-2.16.0.yaml", + "/camel-catalog-3.2.0.yaml": &vfsgen۰CompressedFileInfo{ + name: "camel-catalog-3.2.0.yaml", modTime: time.Time{}, - uncompressedSize: 91002, + uncompressedSize: 87987, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x4b\x77\xdb\xb8\xb2\xee\x3c\xbf\x82\xab\x33\x39\x67\xdd\x4d\x74\x77\x7a\xdf\xdd\x77\xf5\x1d\x39\x4a\x9c\xd8\x89\x13\x27\xf2\x4e\x67\xf7\xa4\x17\x44\x42\x12\x2c\x92\xa0\x01\x50\x96\xf3\xeb\xcf\x02\x08\x3e\x25\x17\x1f\x2e\xf8\x78\x60\x52\x44\xe1\x2b\xd4\x07\x10\x6f\x16\x5e\x06\x21\xde\xdf\x8b\x97\xc1\x47\x1e\xb1\x4c\xb1\x38\xd0\x22\xd0\x5b\x16\x9c\xe5\x34\xda\xb2\x60\x29\xd6\xfa\x9e\x4a\x16\x9c\x8b\x22\x8b\xa9\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x5b\x77\xdc\xb6\xb2\xe6\xbb\x7f\x05\x57\xfc\x72\xce\x9a\x4d\x24\x71\xf6\x9c\xcc\xca\x3c\xc9\xb2\x65\x5b\xb6\x6c\xd9\xad\x9d\x78\xef\x97\x2c\x34\x89\xee\x86\x9a\x24\x28\x00\x6c\xb5\xfc\xeb\x67\x01\x04\xaf\x4d\x15\x2f\x2a\x68\xf4\x20\xb2\x89\xc2\x57\xa8\xaf\x40\xdc\x09\xbc\x0c\x42\xbc\xbf\x17\x2f\x83\x4f\x3c\x62\x99\x62\x71\xa0\x45\xa0\x77\x2c\x38\xcb\x69\xb4\x63\xc1\x4a\x6c\xf4\x3d\x95\x2c\xb8\x10\x45\x16\x53\x [...] }, "/traits.yaml": &vfsgen۰CompressedFileInfo{ name: "traits.yaml", @@ -633,7 +645,7 @@ var assets = func() http.FileSystem { fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{ fs["/addons"].(os.FileInfo), fs["/builder"].(os.FileInfo), - fs["/camel-catalog-2.16.0.yaml"].(os.FileInfo), + fs["/camel-catalog-3.2.0.yaml"].(os.FileInfo), fs["/crd"].(os.FileInfo), fs["/manager"].(os.FileInfo), fs["/prometheus"].(os.FileInfo), @@ -672,6 +684,7 @@ var assets = func() http.FileSystem { fs["/crd/bases/camel.apache.org_pipes.yaml"].(os.FileInfo), } fs["/manager"].(*vfsgen۰DirInfo).entries = []os.FileInfo{ + fs["/manager/bundle"].(os.FileInfo), fs["/manager/operator-deployment.yaml"].(os.FileInfo), fs["/manager/operator-service-account.yaml"].(os.FileInfo), fs["/manager/patch-image-pull-policy-always.yaml"].(os.FileInfo), @@ -683,6 +696,10 @@ var assets = func() http.FileSystem { fs["/manager/patch-toleration.yaml"].(os.FileInfo), fs["/manager/patch-watch-namespace-global.yaml"].(os.FileInfo), } + fs["/manager/bundle"].(*vfsgen۰DirInfo).entries = []os.FileInfo{ + fs["/manager/bundle/manifests"].(os.FileInfo), + fs["/manager/bundle/metadata"].(os.FileInfo), + } fs["/prometheus"].(*vfsgen۰DirInfo).entries = []os.FileInfo{ fs["/prometheus/operator-pod-monitor.yaml"].(os.FileInfo), fs["/prometheus/operator-prometheus-rule.yaml"].(os.FileInfo), diff --git a/pkg/util/jib/configuration_test.go b/pkg/util/jib/configuration_test.go index 159382237..9f5f8ca90 100644 --- a/pkg/util/jib/configuration_test.go +++ b/pkg/util/jib/configuration_test.go @@ -6,7 +6,7 @@ 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 + 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, @@ -14,6 +14,7 @@ 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. */ + package jib import ( diff --git a/script/camel-k-runtime-archetype/pom.xml b/script/camel-k-runtime-archetype/pom.xml index dcc812d4a..7d58690cd 100644 --- a/script/camel-k-runtime-archetype/pom.xml +++ b/script/camel-k-runtime-archetype/pom.xml @@ -1,4 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> + +<!-- + 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. +--> + <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.camel.k.integration</groupId>
