diff --git a/meta-leda-bsp/recipes-bsp/grub/files/grub.cfg b/meta-leda-bsp/recipes-bsp/grub/files/grub.cfg index 1556a01f..bb7e153c 100644 --- a/meta-leda-bsp/recipes-bsp/grub/files/grub.cfg +++ b/meta-leda-bsp/recipes-bsp/grub/files/grub.cfg @@ -97,21 +97,21 @@ terminal_input serial # Default Kernel command line options CMDLINE="console=ttyS0,115200 rootwait" -# A full-features SDV image including convenient tools +# A full-features SDV image with container runtime and including convenient tools # Index 0 -menuentry "SDV Full (with K8S + developer tools)" { +menuentry "SDV Full (with tools)" { linux (hd0,gpt4)/boot/bzImage root=/dev/vda4 $CMDLINE rauc.slot=SDV_A } -# A minimally featured SDV image, only to start k3s and necessary dependencies +# A minimally featured SDV image, only to start containers and necessary dependencies # Index 1 -menuentry "SDV Minimal (with k8s)" { +menuentry "SDV Minimal" { linux (hd0,gpt5)/boot/bzImage root=/dev/vda5 $CMDLINE rauc.slot=SDV_B } # A minimalistic rescue partition, intended for a future "automated rescue" use case # For now, can be used for manual rescue operations. # Index 2 -menuentry "SDV Rescue (with cloud + self-updater, no K8S)" { +menuentry "SDV Rescue" { linux (hd0,gpt3)/boot/bzImage root=/dev/vda3 $CMDLINE rauc.slot=SDV_R } diff --git a/meta-leda-components/classes/sdv-container-cache.bbclass b/meta-leda-components/classes/sdv-container-cache.bbclass index 6d1337f3..68a2a760 100644 --- a/meta-leda-components/classes/sdv-container-cache.bbclass +++ b/meta-leda-components/classes/sdv-container-cache.bbclass @@ -13,14 +13,19 @@ # Define defaults, which can be overridden within the recipe export CONTAINER_ARCH +export SKOPEO_AUTH_PARAMETER CONTAINER_OS ??= "linux" -CONTAINER_REGISTRY_REQUIRES_AUTH ??= "1" +CONTAINER_REGISTRY_REQUIRES_AUTH ??= "0" CONTAINER_SKIP_MISSING_ARCH ??= "0" SDV_DL_FILENAME ??= "${PN}-${PV}-${TARGET_ARCH}-${SDV_IMAGE_TAG}.tar" SDV_DL_FILE ??= "${DL_DIR}/${SDV_DL_FILENAME}" -K3S_AGENT_PRELOAD_DIR ??= "/var/lib/rancher/k3s/agent/images" +CONTAINERS_TARGET_PATH ??= "/var/containers/images" + +# Override this to specify a different location +SKOPEO_AUTH_JSON_FILE ??= "${TOPDIR}/auth.json" +SKOPEO_AUTH_PARAMETER = "" FALSE = "0" TRUE = "1" @@ -30,6 +35,7 @@ CONTAINER_ARCH[doc] = "Specify the container machine architecture, e.g. amd64, a CONTAINER_OS[doc] = "Specify the container operatin system, e.g. linux" CONTAINER_REGISTRY_REQUIRES_AUTH[doc] = "Specify if the container registry requires authentication: 1=true (default) and 0=false" CONTAINER_SKIP_MISSING_ARCH[doc] = "Set to 1 to ignore errors due to missing container image architecture in remote container registry: 1=skip 0=fail build" +CONTAINERS_TARGET_PATH[doc] = "The location on the rootfs to store container archives" SDV_DL_FILE[doc] = "Specify how the archive is downloaded" do_fetch_container[depends] += "skopeo-native:do_populate_sysroot" @@ -39,7 +45,7 @@ do_fetch_container[depends] += "jq-native:do_populate_sysroot" do_compile[noexec] = "1" do_fetch_container[nostamp] = "1" do_unpack_container[nostamp] = "1" - +do_fetch_container[network] = "1" contains_tag() { retvalue="${TRUE}" @@ -74,10 +80,24 @@ do_fetch_container() { if [ ${CONTAINER_REGISTRY_REQUIRES_AUTH} -eq 1 ] then - if ! PATH=/usr/bin:${PATH} skopeo login --authfile ~/auth.json ${CONTAINER_REGISTRY} ; + if [ -z "${SKOPEO_AUTH_JSON_FILE}" ] then - bbwarn "Not logged into ${CONTAINER_REGISTRY}, download of container image ${SDV_IMAGE_REF} may fail!" - fi + bbfatal "Auth file for skopeo not set, please set SKOPEO_AUTH_JSON_FILE" + exit 1 + else + if [ ! -r "${SKOPEO_AUTH_JSON_FILE}" ] + then + bbfatal "Auth file as set by SKOPEO_AUTH_JSON_FILE not found: ${SKOPEO_AUTH_JSON_FILE}" + exit 2 + fi + SKOPEO_AUTH_PARAMETER="--authfile ${SKOPEO_AUTH_JSON_FILE}" + if ! PATH=/usr/bin:${PATH} skopeo login ${SKOPEO_AUTH_PARAMETER} ${CONTAINER_REGISTRY} ; + then + bbwarn "Not logged into ${CONTAINER_REGISTRY}, download of container image ${SDV_IMAGE_REF} may fail!" + fi + fi + else + SKOPEO_AUTH_PARAMETER="" fi if [ -z "$CONTAINER_ARCH" ] @@ -122,7 +142,7 @@ do_fetch_container() { --override-arch ${CONTAINER_ARCH} \ --override-os ${CONTAINER_OS} \ copy \ - --authfile ~/auth.json \ + ${SKOPEO_AUTH_PARAMETER} \ --additional-tag ${SDV_IMAGE_REF}:${SDV_IMAGE_TAG} \ docker://${SDV_IMAGE_REF}:${SDV_IMAGE_TAG} \ docker-archive:${SDV_DL_FILE}:${SDV_IMAGE_REF} ; @@ -163,13 +183,13 @@ do_unpack_container() { } do_install() { - mkdir -p ${D}${K3S_AGENT_PRELOAD_DIR} - cp --no-dereference --preserve=mode,links -v ${S}/${SDV_DL_FILENAME} ${D}${K3S_AGENT_PRELOAD_DIR}/ + mkdir -p ${D}${CONTAINERS_TARGET_PATH} + cp --no-dereference --preserve=mode,links -v ${S}/${SDV_DL_FILENAME} ${D}${CONTAINERS_TARGET_PATH}/ } addtask do_fetch_container before do_unpack_container after do_fetch addtask do_unpack_container before do_install after do_fetch_container -FILES:${PN} += "${K3S_AGENT_PRELOAD_DIR}/${SDV_DL_FILENAME}" +FILES:${PN} += "${CONTAINERS_TARGET_PATH}/${SDV_DL_FILENAME}" PACKAGES = "${PN}" diff --git a/meta-leda-components/recipes-sdv/sdv-containers/files/10_k3s_kubeconfig.sh b/meta-leda-components/recipes-sdv/sdv-containers/files/10_k3s_kubeconfig.sh deleted file mode 100644 index 9e03277c..00000000 --- a/meta-leda-components/recipes-sdv/sdv-containers/files/10_k3s_kubeconfig.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -# /******************************************************************************** -# * Copyright (c) 2021 Contributors to the Eclipse Foundation -# * -# * See the NOTICE file(s) distributed with this work for additional -# * information regarding copyright ownership. -# * -# * This program and the accompanying materials are made available under the -# * terms of the Eclipse Public License 2.0 which is available at -# * http://www.eclipse.org/legal/epl-2.0 -# * -# * SPDX-License-Identifier: EPL-2.0 -# ********************************************************************************/ -# -# Set the default location of K3S Yaml file as environment variable -# so that all k3s-related tools (such as k9s) can utilize the correct -# tokens. -# -export KUBECONFIG=/etc/rancher/k3s/k3s.yaml -export CONTAINERD_ADDRESS=/run/k3s/containerd/containerd.sock \ No newline at end of file diff --git a/meta-leda-components/recipes-sdv/sdv-containers/files/LICENSE b/meta-leda-components/recipes-sdv/sdv-containers/files/LICENSE index e23ece2c..d6456956 100644 --- a/meta-leda-components/recipes-sdv/sdv-containers/files/LICENSE +++ b/meta-leda-components/recipes-sdv/sdv-containers/files/LICENSE @@ -1,277 +1,202 @@ -Eclipse Public License - v 2.0 - - THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE - PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION - OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - -1. DEFINITIONS - -"Contribution" means: - - a) in the case of the initial Contributor, the initial content - Distributed under this Agreement, and - - b) in the case of each subsequent Contributor: - i) changes to the Program, and - ii) additions to the Program; - where such changes and/or additions to the Program originate from - and are Distributed by that particular Contributor. A Contribution - "originates" from a Contributor if it was added to the Program by - such Contributor itself or anyone acting on such Contributor's behalf. - Contributions do not include changes or additions to the Program that - are not Modified Works. - -"Contributor" means any person or entity that Distributes the Program. - -"Licensed Patents" mean patent claims licensable by a Contributor which -are necessarily infringed by the use or sale of its Contribution alone -or when combined with the Program. - -"Program" means the Contributions Distributed in accordance with this -Agreement. - -"Recipient" means anyone who receives the Program under this Agreement -or any Secondary License (as applicable), including Contributors. - -"Derivative Works" shall mean any work, whether in Source Code or other -form, that is based on (or derived from) the Program and for which the -editorial revisions, annotations, elaborations, or other modifications -represent, as a whole, an original work of authorship. - -"Modified Works" shall mean any work in Source Code or other form that -results from an addition to, deletion from, or modification of the -contents of the Program, including, for purposes of clarity any new file -in Source Code form that contains any contents of the Program. Modified -Works shall not include works that contain only declarations, -interfaces, types, classes, structures, or files of the Program solely -in each case in order to link to, bind by name, or subclass the Program -or Modified Works thereof. - -"Distribute" means the acts of a) distributing or b) making available -in any manner that enables the transfer of a copy. - -"Source Code" means the form of a Program preferred for making -modifications, including but not limited to software source code, -documentation source, and configuration files. - -"Secondary License" means either the GNU General Public License, -Version 2.0, or any later versions of that license, including any -exceptions or additional permissions as identified by the initial -Contributor. - -2. GRANT OF RIGHTS - - a) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free copyright - license to reproduce, prepare Derivative Works of, publicly display, - publicly perform, Distribute and sublicense the Contribution of such - Contributor, if any, and such Derivative Works. - - b) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free patent - license under Licensed Patents to make, use, sell, offer to sell, - import and otherwise transfer the Contribution of such Contributor, - if any, in Source Code or other form. This patent license shall - apply to the combination of the Contribution and the Program if, at - the time the Contribution is added by the Contributor, such addition - of the Contribution causes such combination to be covered by the - Licensed Patents. The patent license shall not apply to any other - combinations which include the Contribution. No hardware per se is - licensed hereunder. - - c) Recipient understands that although each Contributor grants the - licenses to its Contributions set forth herein, no assurances are - provided by any Contributor that the Program does not infringe the - patent or other intellectual property rights of any other entity. - Each Contributor disclaims any liability to Recipient for claims - brought by any other entity based on infringement of intellectual - property rights or otherwise. As a condition to exercising the - rights and licenses granted hereunder, each Recipient hereby - assumes sole responsibility to secure any other intellectual - property rights needed, if any. For example, if a third party - patent license is required to allow Recipient to Distribute the - Program, it is Recipient's responsibility to acquire that license - before distributing the Program. - - d) Each Contributor represents that to its knowledge it has - sufficient copyright rights in its Contribution, if any, to grant - the copyright license set forth in this Agreement. - - e) Notwithstanding the terms of any Secondary License, no - Contributor makes additional grants to any Recipient (other than - those set forth in this Agreement) as a result of such Recipient's - receipt of the Program under the terms of a Secondary License - (if permitted under the terms of Section 3). - -3. REQUIREMENTS - -3.1 If a Contributor Distributes the Program in any form, then: - - a) the Program must also be made available as Source Code, in - accordance with section 3.2, and the Contributor must accompany - the Program with a statement that the Source Code for the Program - is available under this Agreement, and informs Recipients how to - obtain it in a reasonable manner on or through a medium customarily - used for software exchange; and - - b) the Contributor may Distribute the Program under a license - different than this Agreement, provided that such license: - i) effectively disclaims on behalf of all other Contributors all - warranties and conditions, express and implied, including - warranties or conditions of title and non-infringement, and - implied warranties or conditions of merchantability and fitness - for a particular purpose; - - ii) effectively excludes on behalf of all other Contributors all - liability for damages, including direct, indirect, special, - incidental and consequential damages, such as lost profits; - - iii) does not attempt to limit or alter the recipients' rights - in the Source Code under section 3.2; and - - iv) requires any subsequent distribution of the Program by any - party to be under a license that satisfies the requirements - of this section 3. - -3.2 When the Program is Distributed as Source Code: - - a) it must be made available under this Agreement, or if the - Program (i) is combined with other material in a separate file or - files made available under a Secondary License, and (ii) the initial - Contributor attached to the Source Code the notice described in - Exhibit A of this Agreement, then the Program may be made available - under the terms of such Secondary Licenses, and - - b) a copy of this Agreement must be included with each copy of - the Program. - -3.3 Contributors may not remove or alter any copyright, patent, -trademark, attribution notices, disclaimers of warranty, or limitations -of liability ("notices") contained within the Program from any copy of -the Program which they Distribute, provided that Contributors may add -their own appropriate notices. - -4. COMMERCIAL DISTRIBUTION - -Commercial distributors of software may accept certain responsibilities -with respect to end users, business partners and the like. While this -license is intended to facilitate the commercial use of the Program, -the Contributor who includes the Program in a commercial product -offering should do so in a manner which does not create potential -liability for other Contributors. Therefore, if a Contributor includes -the Program in a commercial product offering, such Contributor -("Commercial Contributor") hereby agrees to defend and indemnify every -other Contributor ("Indemnified Contributor") against any losses, -damages and costs (collectively "Losses") arising from claims, lawsuits -and other legal actions brought by a third party against the Indemnified -Contributor to the extent caused by the acts or omissions of such -Commercial Contributor in connection with its distribution of the Program -in a commercial product offering. The obligations in this section do not -apply to any claims or Losses relating to any actual or alleged -intellectual property infringement. In order to qualify, an Indemnified -Contributor must: a) promptly notify the Commercial Contributor in -writing of such claim, and b) allow the Commercial Contributor to control, -and cooperate with the Commercial Contributor in, the defense and any -related settlement negotiations. The Indemnified Contributor may -participate in any such claim at its own expense. - -For example, a Contributor might include the Program in a commercial -product offering, Product X. That Contributor is then a Commercial -Contributor. If that Commercial Contributor then makes performance -claims, or offers warranties related to Product X, those performance -claims and warranties are such Commercial Contributor's responsibility -alone. Under this section, the Commercial Contributor would have to -defend claims against the other Contributors related to those performance -claims and warranties, and if a court requires any other Contributor to -pay any damages as a result, the Commercial Contributor must pay -those damages. - -5. NO WARRANTY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT -PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" -BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR -IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF -TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR -PURPOSE. Each Recipient is solely responsible for determining the -appropriateness of using and distributing the Program and assumes all -risks associated with its exercise of rights under this Agreement, -including but not limited to the risks and costs of program errors, -compliance with applicable laws, damage to or loss of data, programs -or equipment, and unavailability or interruption of operations. - -6. DISCLAIMER OF LIABILITY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT -PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS -SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST -PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE -EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - -7. GENERAL - -If any provision of this Agreement is invalid or unenforceable under -applicable law, it shall not affect the validity or enforceability of -the remainder of the terms of this Agreement, and without further -action by the parties hereto, such provision shall be reformed to the -minimum extent necessary to make such provision valid and enforceable. - -If Recipient institutes patent litigation against any entity -(including a cross-claim or counterclaim in a lawsuit) alleging that the -Program itself (excluding combinations of the Program with other software -or hardware) infringes such Recipient's patent(s), then such Recipient's -rights granted under Section 2(b) shall terminate as of the date such -litigation is filed. - -All Recipient's rights under this Agreement shall terminate if it -fails to comply with any of the material terms or conditions of this -Agreement and does not cure such failure in a reasonable period of -time after becoming aware of such noncompliance. If all Recipient's -rights under this Agreement terminate, Recipient agrees to cease use -and distribution of the Program as soon as reasonably practicable. -However, Recipient's obligations under this Agreement and any licenses -granted by Recipient relating to the Program shall continue and survive. - -Everyone is permitted to copy and distribute copies of this Agreement, -but in order to avoid inconsistency the Agreement is copyrighted and -may only be modified in the following manner. The Agreement Steward -reserves the right to publish new versions (including revisions) of -this Agreement from time to time. No one other than the Agreement -Steward has the right to modify this Agreement. The Eclipse Foundation -is the initial Agreement Steward. The Eclipse Foundation may assign the -responsibility to serve as the Agreement Steward to a suitable separate -entity. Each new version of the Agreement will be given a distinguishing -version number. The Program (including Contributions) may always be -Distributed subject to the version of the Agreement under which it was -received. In addition, after a new version of the Agreement is published, -Contributor may elect to Distribute the Program (including its -Contributions) under the new version. - -Except as expressly stated in Sections 2(a) and 2(b) above, Recipient -receives no rights or licenses to the intellectual property of any -Contributor under this Agreement, whether expressly, by implication, -estoppel or otherwise. All rights in the Program not expressly granted -under this Agreement are reserved. Nothing in this Agreement is intended -to be enforceable by any entity that is not a Contributor or Recipient. -No third-party beneficiary rights are created under this Agreement. - -Exhibit A - Form of Secondary Licenses Notice - -"This Source Code may also be made available under the following -Secondary Licenses when the conditions for such availability set forth -in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), -version(s), and exceptions or additional permissions here}." - - Simply including a copy of this Agreement, including this Exhibit A - is not sufficient to license the Source Code under Secondary Licenses. - - If it is not possible or desirable to put the notice in a particular - file, then You may include the notice in a location (such as a LICENSE - file in a relevant directory) where a recipient would be likely to - look for such a notice. - - You may add additional accurate notices of copyright ownership. \ No newline at end of file + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. diff --git a/meta-leda-components/recipes-sdv/sdv-containers/files/README.txt b/meta-leda-components/recipes-sdv/sdv-containers/files/README.txt index 3775ba5b..322950ef 100644 --- a/meta-leda-components/recipes-sdv/sdv-containers/files/README.txt +++ b/meta-leda-components/recipes-sdv/sdv-containers/files/README.txt @@ -1 +1 @@ -Pre-loaded container images and custom configurations for k3s +Pre-loaded container images \ No newline at end of file diff --git a/meta-leda-components/recipes-sdv/sdv-containers/rancher-container-coredns_1.8.bb b/meta-leda-components/recipes-sdv/sdv-containers/rancher-container-coredns_1.8.bb deleted file mode 100644 index 1ab87e20..00000000 --- a/meta-leda-components/recipes-sdv/sdv-containers/rancher-container-coredns_1.8.bb +++ /dev/null @@ -1,28 +0,0 @@ -# /******************************************************************************** -# * Copyright (c) 2022 Contributors to the Eclipse Foundation -# * -# * See the NOTICE file(s) distributed with this work for additional -# * information regarding copyright ownership. -# * -# * This program and the accompanying materials are made available under the -# * terms of the Apache License 2.0 which is available at -# * https://www.apache.org/licenses/LICENSE-2.0 -# * -# * SPDX-License-Identifier: Apache-2.0 -# ********************************************************************************/ - -SUMMARY = "Rancher CoreDNS Air-Gap Installation" -DESCRIPTION = "Pre-load Rancher K3S core containers to the device filesystem" - -inherit sdv-container-cache - -SRC_URI += "file://README.txt \ - file://LICENSE" - -# According to https://wiki.yoctoproject.org/wiki/License_Infrastructure_Interest_Group -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=d9fc0efef5228704e7f5b37f27192723" - -# Define image to be pulled -SDV_IMAGE_REF = "rancher/coredns-coredns" -SDV_IMAGE_TAG = "1.8.3" diff --git a/meta-leda-components/recipes-sdv/sdv-containers/rancher-container-klipper_0.2.bb b/meta-leda-components/recipes-sdv/sdv-containers/rancher-container-klipper_0.2.bb deleted file mode 100644 index 148f5d48..00000000 --- a/meta-leda-components/recipes-sdv/sdv-containers/rancher-container-klipper_0.2.bb +++ /dev/null @@ -1,28 +0,0 @@ -# /******************************************************************************** -# * Copyright (c) 2022 Contributors to the Eclipse Foundation -# * -# * See the NOTICE file(s) distributed with this work for additional -# * information regarding copyright ownership. -# * -# * This program and the accompanying materials are made available under the -# * terms of the Apache License 2.0 which is available at -# * https://www.apache.org/licenses/LICENSE-2.0 -# * -# * SPDX-License-Identifier: Apache-2.0 -# ********************************************************************************/ - -SUMMARY = "Rancher Klipper Air-Gap Installation" -DESCRIPTION = "Pre-load Rancher K3S core containers to the device filesystem" - -inherit sdv-container-cache - -SRC_URI += "file://README.txt \ - file://LICENSE" - -# According to https://wiki.yoctoproject.org/wiki/License_Infrastructure_Interest_Group -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=d9fc0efef5228704e7f5b37f27192723" - -# Define image to be pulled -SDV_IMAGE_REF = "rancher/klipper-lb" -SDV_IMAGE_TAG = "v0.2.0" diff --git a/meta-leda-components/recipes-sdv/sdv-containers/rancher-container-local-path-provisioner_0.0.19.bb b/meta-leda-components/recipes-sdv/sdv-containers/rancher-container-local-path-provisioner_0.0.19.bb deleted file mode 100644 index 5bee75ca..00000000 --- a/meta-leda-components/recipes-sdv/sdv-containers/rancher-container-local-path-provisioner_0.0.19.bb +++ /dev/null @@ -1,28 +0,0 @@ -# /******************************************************************************** -# * Copyright (c) 2022 Contributors to the Eclipse Foundation -# * -# * See the NOTICE file(s) distributed with this work for additional -# * information regarding copyright ownership. -# * -# * This program and the accompanying materials are made available under the -# * terms of the Apache License 2.0 which is available at -# * https://www.apache.org/licenses/LICENSE-2.0 -# * -# * SPDX-License-Identifier: Apache-2.0 -# ********************************************************************************/ - -SUMMARY = "Rancher Local Path Provisioner Air-Gap Installation" -DESCRIPTION = "Pre-load Rancher K3S core containers to the device filesystem" - -inherit sdv-container-cache - -SRC_URI += "file://README.txt \ - file://LICENSE" - -# According to https://wiki.yoctoproject.org/wiki/License_Infrastructure_Interest_Group -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=d9fc0efef5228704e7f5b37f27192723" - -# Define image to be pulled -SDV_IMAGE_REF = "rancher/local-path-provisioner" -SDV_IMAGE_TAG = "v0.0.19" diff --git a/meta-leda-components/recipes-sdv/sdv-containers/rancher-container-metrics_0.3.bb b/meta-leda-components/recipes-sdv/sdv-containers/rancher-container-metrics_0.3.bb deleted file mode 100644 index 8c5fe012..00000000 --- a/meta-leda-components/recipes-sdv/sdv-containers/rancher-container-metrics_0.3.bb +++ /dev/null @@ -1,28 +0,0 @@ -# /******************************************************************************** -# * Copyright (c) 2022 Contributors to the Eclipse Foundation -# * -# * See the NOTICE file(s) distributed with this work for additional -# * information regarding copyright ownership. -# * -# * This program and the accompanying materials are made available under the -# * terms of the Apache License 2.0 which is available at -# * https://www.apache.org/licenses/LICENSE-2.0 -# * -# * SPDX-License-Identifier: Apache-2.0 -# ********************************************************************************/ - -SUMMARY = "Rancher Metrics Server Air-Gap Installation" -DESCRIPTION = "Pre-load Rancher K3S core containers to the device filesystem" - -inherit sdv-container-cache - -SRC_URI += "file://README.txt \ - file://LICENSE" - -# According to https://wiki.yoctoproject.org/wiki/License_Infrastructure_Interest_Group -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=d9fc0efef5228704e7f5b37f27192723" - -# Define image to be pulled -SDV_IMAGE_REF = "rancher/metrics-server" -SDV_IMAGE_TAG = "v0.3.6" diff --git a/meta-leda-components/recipes-sdv/sdv-containers/rancher-container-traefik_2.4.bb b/meta-leda-components/recipes-sdv/sdv-containers/rancher-container-traefik_2.4.bb deleted file mode 100644 index a17b46c4..00000000 --- a/meta-leda-components/recipes-sdv/sdv-containers/rancher-container-traefik_2.4.bb +++ /dev/null @@ -1,28 +0,0 @@ -# /******************************************************************************** -# * Copyright (c) 2022 Contributors to the Eclipse Foundation -# * -# * See the NOTICE file(s) distributed with this work for additional -# * information regarding copyright ownership. -# * -# * This program and the accompanying materials are made available under the -# * terms of the Apache License 2.0 which is available at -# * https://www.apache.org/licenses/LICENSE-2.0 -# * -# * SPDX-License-Identifier: Apache-2.0 -# ********************************************************************************/ - -SUMMARY = "Rancher Traefik Air-Gap Installation" -DESCRIPTION = "Pre-load Rancher K3S core containers to the device filesystem" - -inherit sdv-container-cache - -SRC_URI += "file://README.txt \ - file://LICENSE" - -# According to https://wiki.yoctoproject.org/wiki/License_Infrastructure_Interest_Group -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=d9fc0efef5228704e7f5b37f27192723" - -# Define image to be pulled -SDV_IMAGE_REF = "rancher/library-traefik" -SDV_IMAGE_TAG = "2.4.8" diff --git a/meta-leda-components/recipes-sdv/sdv-containers/sdv-container-cloudagent_0.1.bb b/meta-leda-components/recipes-sdv/sdv-containers/sdv-container-cloudagent_0.1.bb index 6cfae241..04cdc330 100644 --- a/meta-leda-components/recipes-sdv/sdv-containers/sdv-container-cloudagent_0.1.bb +++ b/meta-leda-components/recipes-sdv/sdv-containers/sdv-container-cloudagent_0.1.bb @@ -17,18 +17,19 @@ DESCRIPTION = "Docker container of the Eclipse Kanto Cloud Connector" inherit sdv-container-cache SRC_URI += "file://README.txt \ - file://LICENSE" + git://github.com/eclipse-leda/leda-contrib-cloud-connector;protocol=https;branch=main" +SRCREV = "${AUTOREV}" # According to https://wiki.yoctoproject.org/wiki/License_Infrastructure_Interest_Group LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=d9fc0efef5228704e7f5b37f27192723" +LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9" # Define image to be pulled -SDV_IMAGE_REF="ghcr.io/eclipse-leda/leda-incubator-cloudagent/cloudagent" -SDV_IMAGE_TAG="v0.4" +SDV_IMAGE_REF="ghcr.io/eclipse-leda/leda-incubator-cloud-connector/cloudconnector" +SDV_IMAGE_TAG="main-13add98ec32e077d0f125e333a24aaf908187c9b" # Override container architecture. If not set, recipe tries autodetection for target machine architecture. #CONTAINER_ARCH="arm64" # Skip pre-caching of a container if target architecture does not exist -CONTAINER_SKIP_MISSING_ARCH="1" +CONTAINER_SKIP_MISSING_ARCH="0" diff --git a/meta-leda-components/recipes-sdv/sdv-containers/sdv-container-databroker_0.1.bb b/meta-leda-components/recipes-sdv/sdv-containers/sdv-container-databroker_0.1.bb deleted file mode 100644 index 199320e7..00000000 --- a/meta-leda-components/recipes-sdv/sdv-containers/sdv-container-databroker_0.1.bb +++ /dev/null @@ -1,34 +0,0 @@ -# /******************************************************************************** -# * Copyright (c) 2022 Contributors to the Eclipse Foundation -# * -# * See the NOTICE file(s) distributed with this work for additional -# * information regarding copyright ownership. -# * -# * This program and the accompanying materials are made available under the -# * terms of the Apache License 2.0 which is available at -# * https://www.apache.org/licenses/LICENSE-2.0 -# * -# * SPDX-License-Identifier: Apache-2.0 -# ********************************************************************************/ - -SUMMARY = "Embed SDV container archives into the system" -DESCRIPTION = "Pull the container images, save them in the rootfs." - -inherit sdv-container-cache - -SRC_URI += "file://README.txt \ - file://LICENSE" - -# According to https://wiki.yoctoproject.org/wiki/License_Infrastructure_Interest_Group -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=d9fc0efef5228704e7f5b37f27192723" - -# Define image to be pulled -SDV_IMAGE_REF = "ghcr.io/eclipse-leda/leda-incubator-vehicleapi/databroker" -SDV_IMAGE_TAG = "v0.18.0" - -# Override container architecture. If not set, recipe tries autodetection for target machine architecture. -#CONTAINER_ARCH="arm64" - -# Skip pre-caching of a container if target architecture does not exist -CONTAINER_SKIP_MISSING_ARCH="1" diff --git a/meta-leda-components/recipes-sdv/sdv-containers/sdv-container-helloworld_0.1.bb b/meta-leda-components/recipes-sdv/sdv-containers/sdv-container-helloworld_0.1.bb index 652494ac..af6b53f7 100644 --- a/meta-leda-components/recipes-sdv/sdv-containers/sdv-container-helloworld_0.1.bb +++ b/meta-leda-components/recipes-sdv/sdv-containers/sdv-container-helloworld_0.1.bb @@ -17,11 +17,12 @@ DESCRIPTION = "Pull the container images, save them in the rootfs." inherit sdv-container-cache SRC_URI += "file://README.txt \ - file://LICENSE" + git://github.com/docker-library/hello-world/;protocol=https;branch=master" +SRCREV = "${AUTOREV}" # According to https://wiki.yoctoproject.org/wiki/License_Infrastructure_Interest_Group -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=d9fc0efef5228704e7f5b37f27192723" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=4c512a2a4a9c2efd5e63d5865e1e9fcb" # Define image to be pulled SDV_IMAGE_REF="hello-world" diff --git a/meta-leda-components/recipes-sdv/sdv-containers/sdv-containers-dapr_1.8.bb b/meta-leda-components/recipes-sdv/sdv-containers/sdv-containers-dapr_1.8.bb deleted file mode 100644 index 833965ba..00000000 --- a/meta-leda-components/recipes-sdv/sdv-containers/sdv-containers-dapr_1.8.bb +++ /dev/null @@ -1,28 +0,0 @@ -# /******************************************************************************** -# * Copyright (c) 2022 Contributors to the Eclipse Foundation -# * -# * See the NOTICE file(s) distributed with this work for additional -# * information regarding copyright ownership. -# * -# * This program and the accompanying materials are made available under the -# * terms of the Apache License 2.0 which is available at -# * https://www.apache.org/licenses/LICENSE-2.0 -# * -# * SPDX-License-Identifier: Apache-2.0 -# ********************************************************************************/ - -SUMMARY = "DAPR Air-Gap Installation" -DESCRIPTION = "Pre-load DAPR containers to the device filesystem" - -inherit sdv-container-cache - -SRC_URI += "file://README.txt \ - file://LICENSE" - -# According to https://wiki.yoctoproject.org/wiki/License_Infrastructure_Interest_Group -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=d9fc0efef5228704e7f5b37f27192723" - -# Define image to be pulled -SDV_IMAGE_REF = "docker.io/daprio/dapr" -SDV_IMAGE_TAG = "1.8.0" diff --git a/meta-leda-components/recipes-sdv/sdv-containers/sdv-k3s-config_0.1.bb b/meta-leda-components/recipes-sdv/sdv-containers/sdv-k3s-config_0.1.bb deleted file mode 100644 index dc2ce3f3..00000000 --- a/meta-leda-components/recipes-sdv/sdv-containers/sdv-k3s-config_0.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "SDV Configuration of k3s" -DESCRIPTION = "Custom configuration for Kubernetes" - -SRC_URI += "file://README.txt \ - file://10_k3s_kubeconfig.sh \ - file://LICENSE" - -# According to https://wiki.yoctoproject.org/wiki/License_Infrastructure_Interest_Group -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=d9fc0efef5228704e7f5b37f27192723" - -do_install() { - install -d ${D}${sysconfdir}/profile.d - install -m 0755 ${WORKDIR}/10_k3s_kubeconfig.sh ${D}${sysconfdir}/profile.d/ -} diff --git a/meta-leda-components/recipes-sdv/sdv-core/files/first-boot-initservice/dapr-init.service b/meta-leda-components/recipes-sdv/sdv-core/files/first-boot-initservice/dapr-init.service deleted file mode 100644 index 63813825..00000000 --- a/meta-leda-components/recipes-sdv/sdv-core/files/first-boot-initservice/dapr-init.service +++ /dev/null @@ -1,27 +0,0 @@ -# /******************************************************************************** -# * Copyright (c) 2022 Contributors to the Eclipse Foundation -# * -# * See the NOTICE file(s) distributed with this work for additional -# * information regarding copyright ownership. -# * -# * This program and the accompanying materials are made available under the -# * terms of the Eclipse Public License 2.0 which is available at -# * http://www.eclipse.org/legal/epl-2.0 -# * -# * SPDX-License-Identifier: EPL-2.0 -# ********************************************************************************/ -# - -[Unit] -Description=Start dapr-init script upon first boot -After=k3s.service - -[Install] -WantedBy=multi-user.target - -[Service] -Type=simple -Restart=on-failure -RestartSec=15s -ExecStartPre=systemctl is-active k3s.service -ExecStart=/usr/sbin/dapr-init.sh diff --git a/meta-leda-components/recipes-sdv/sdv-core/files/first-boot-initservice/dapr-init.sh b/meta-leda-components/recipes-sdv/sdv-core/files/first-boot-initservice/dapr-init.sh deleted file mode 100644 index 8c74be4d..00000000 --- a/meta-leda-components/recipes-sdv/sdv-core/files/first-boot-initservice/dapr-init.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# /******************************************************************************** -# * Copyright (c) 2021 Contributors to the Eclipse Foundation -# * -# * See the NOTICE file(s) distributed with this work for additional -# * information regarding copyright ownership. -# * -# * This program and the accompanying materials are made available under the -# * terms of the Eclipse Public License 2.0 which is available at -# * http://www.eclipse.org/legal/epl-2.0 -# * -# * SPDX-License-Identifier: EPL-2.0 -# ********************************************************************************/ -# -echo "Will call dapr init -k --wait" - -export KUBECONFIG=/etc/rancher/k3s/k3s.yaml - -if ! dapr status -k; -then - kubectl delete namespace dapr-system - dapr init -k --wait --timeout 6000 - if [ "$?" = "0" ]; - then - if ! dapr status -k; - then - # DAPR initialized successfully, remove initialization from systemd - systemctl disable dapr-init.service - echo "Dapr installed successfully. dapr-init.service was disabled" - exit 0 - fi - fi -else - systemctl disable dapr-init.service - echo "dapr status indicates dapr is installed and currently activating" - exit 0 -fi - -exit 1 \ No newline at end of file diff --git a/meta-leda-components/recipes-sdv/sdv-core/files/sdv-core-bundle-pods/can-feeder.yaml b/meta-leda-components/recipes-sdv/sdv-core/files/sdv-core-bundle-pods/can-feeder.yaml deleted file mode 100644 index 8fd0da3f..00000000 --- a/meta-leda-components/recipes-sdv/sdv-core/files/sdv-core-bundle-pods/can-feeder.yaml +++ /dev/null @@ -1,38 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: feedercan - labels: - app: feedercan -spec: - replicas: 1 - selector: - matchLabels: - app: feedercan - template: - metadata: - labels: - app: feedercan - annotations: - dapr.io/enabled: "true" - dapr.io/app-id: "feedercan" - dapr.io/log-level: "info" - dapr.io/app-protocol: "grpc" - spec: - containers: - - name: feedercan - image: ghcr.io/eclipse-leda/leda-incubator-vehicleapi/feeder_can:v0.18.0 - resources: - requests: - cpu: "50m" - limits: - memory: "128Mi" - cpu: "500m" - imagePullPolicy: IfNotPresent - env: - - name: VEHICLEDATABROKER_DAPR_APP_ID - value: vehicledatabroker - - name: LOG_LEVEL - value: "info,databroker=info,dbcfeeder.broker_client=info,dbcfeeder=info" - imagePullSecrets: - - name: ghcr-io diff --git a/meta-leda-components/recipes-sdv/sdv-core/files/sdv-core-bundle-pods/cloud-connector.yaml b/meta-leda-components/recipes-sdv/sdv-core/files/sdv-core-bundle-pods/cloud-connector.yaml deleted file mode 100644 index dcbea523..00000000 --- a/meta-leda-components/recipes-sdv/sdv-core/files/sdv-core-bundle-pods/cloud-connector.yaml +++ /dev/null @@ -1,41 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: cloud-connector -spec: - selector: - matchLabels: - app: cloud-connector - template: - metadata: - labels: - app: cloud-connector - spec: - containers: - - name: cloudagent - image: ghcr.io/eclipse-leda/leda-incubator-cloudagent/cloudagent:v0.4 - imagePullPolicy: IfNotPresent - env: - - name: CONNECTION_STRING - valueFrom: - secretKeyRef: - name: cloudagent - key: PrimaryConnectionString - optional: false - - name: LOCAL_ADDRESS - value: tcp://mosquitto:1883 - - name: LOG_FILE - value: '' - - name: LOG_LEVEL - value: INFO - - name: CA_CERT_PATH - value: '/app/iothub.crt' - - name: MESSAGE_MAPPER_CONFIG - value: '/app/message-mapper-config.json' - - name: ALLOWED_CLOUD_MESSAGE_TYPES_LIST - value: 'vss.setPosition,updateme,subscribeOnceCommand,vss.set' - - name: ALLOWED_LOCAL_TOPICS_LIST - value: 'cloudConnector/#' - imagePullSecrets: - - name: ghcr-io ---- diff --git a/meta-leda-components/recipes-sdv/sdv-core/files/sdv-core-bundle-pods/dapr/components/pubsub.yaml b/meta-leda-components/recipes-sdv/sdv-core/files/sdv-core-bundle-pods/dapr/components/pubsub.yaml deleted file mode 100644 index 0af24a11..00000000 --- a/meta-leda-components/recipes-sdv/sdv-core/files/sdv-core-bundle-pods/dapr/components/pubsub.yaml +++ /dev/null @@ -1,30 +0,0 @@ -# /******************************************************************************** -# * Copyright (c) 2021 Contributors to the Eclipse Foundation -# * -# * See the NOTICE file(s) distributed with this work for additional -# * information regarding copyright ownership. -# * -# * This program and the accompanying materials are made available under the -# * terms of the Eclipse Public License 2.0 which is available at -# * http://www.eclipse.org/legal/epl-2.0 -# * -# * SPDX-License-Identifier: EPL-2.0 -# ********************************************************************************/ - -apiVersion: dapr.io/v1alpha1 -kind: Component -metadata: - name: mqtt-pubsub - namespace: default -spec: - type: pubsub.mqtt - version: v1 - metadata: - - name: url - value: "tcp://mosquitto:1883" - - name: qos - value: 1 - - name: retain - value: "false" - - name: cleanSession - value: "false" diff --git a/meta-leda-components/recipes-sdv/sdv-core/files/sdv-core-bundle-pods/dapr/dapr-config.yaml b/meta-leda-components/recipes-sdv/sdv-core/files/sdv-core-bundle-pods/dapr/dapr-config.yaml deleted file mode 100644 index 4c7b398f..00000000 --- a/meta-leda-components/recipes-sdv/sdv-core/files/sdv-core-bundle-pods/dapr/dapr-config.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: dapr.io/v1alpha1 -kind: Configuration -metadata: - name: daprsystem - namespace: dapr-system -spec: - tracing: - samplingRate: "1" - zipkin: - endpointAddress: "http://zipkin.default.svc.cluster.local:9411/api/v2/spans" - features: - - name: proxy.grpc - enabled: true diff --git a/meta-leda-components/recipes-sdv/sdv-core/files/sdv-core-bundle-pods/mosquitto/configmap.yaml b/meta-leda-components/recipes-sdv/sdv-core/files/sdv-core-bundle-pods/mosquitto/configmap.yaml deleted file mode 100644 index d4897c00..00000000 --- a/meta-leda-components/recipes-sdv/sdv-core/files/sdv-core-bundle-pods/mosquitto/configmap.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: mosquitto-config -data: - mosquitto.conf: |- - # Ip/hostname to listen to. - # If not given, will listen on all interfaces - #bind_address - - # Port to use for the default listener. - port 1883 - - # Allow anonymous users to connect? - # If not, the password file should be created - allow_anonymous true - - # The password file. - # Use the `mosquitto_passwd` utility. - # If TLS is not compiled, plaintext "username:password" lines bay be used - # password_file /mosquitto/config/passwd \ No newline at end of file diff --git a/meta-leda-components/recipes-sdv/sdv-core/files/sdv-core-bundle-pods/mosquitto/deployment.yaml b/meta-leda-components/recipes-sdv/sdv-core/files/sdv-core-bundle-pods/mosquitto/deployment.yaml deleted file mode 100644 index a1b600a3..00000000 --- a/meta-leda-components/recipes-sdv/sdv-core/files/sdv-core-bundle-pods/mosquitto/deployment.yaml +++ /dev/null @@ -1,32 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: mosquitto -spec: - selector: - matchLabels: - app: mosquitto - template: - metadata: - labels: - app: mosquitto - spec: - containers: - - name: mosquitto - image: eclipse-mosquitto:2.0 - resources: - requests: - cpu: "50m" - limits: - memory: "128Mi" - cpu: "500m" - ports: - - containerPort: 1883 - volumeMounts: - - name: mosquitto-config - mountPath: /mosquitto/config/mosquitto.conf - subPath: mosquitto.conf - volumes: - - name: mosquitto-config - configMap: - name: mosquitto-config \ No newline at end of file diff --git a/meta-leda-components/recipes-sdv/sdv-core/files/sdv-core-bundle-pods/mosquitto/service.yaml b/meta-leda-components/recipes-sdv/sdv-core/files/sdv-core-bundle-pods/mosquitto/service.yaml deleted file mode 100644 index 413f4fc8..00000000 --- a/meta-leda-components/recipes-sdv/sdv-core/files/sdv-core-bundle-pods/mosquitto/service.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: mosquitto -spec: - type: NodePort - selector: - app: mosquitto - ports: - - port: 1883 - targetPort: 1883 - nodePort: 31883 diff --git a/meta-leda-components/recipes-sdv/sdv-core/files/sdv-core-bundle-pods/otel-collector.yaml b/meta-leda-components/recipes-sdv/sdv-core/files/sdv-core-bundle-pods/otel-collector.yaml deleted file mode 100644 index 8fd503aa..00000000 --- a/meta-leda-components/recipes-sdv/sdv-core/files/sdv-core-bundle-pods/otel-collector.yaml +++ /dev/null @@ -1,361 +0,0 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - name: otelcol-sdv ---- -apiVersion: v1 -kind: Service -metadata: - name: zipkin - labels: - component: otelcol-sdv-agent -spec: - ports: - - name: zipkin - port: 9411 - protocol: TCP - targetPort: 9411 - selector: - component: otelcol-sdv-agent ---- -apiVersion: v1 -kind: Service -metadata: - name: otelcol-sdv - labels: - component: otelcol-sdv-exporter -spec: - type: ClusterIP - ports: - - name: otlp - port: 4317 - targetPort: otlp - protocol: TCP - selector: - component: otelcol-sdv-exporter ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: otelcol-sdv-exporter -spec: - selector: - matchLabels: - component: otelcol-sdv-exporter - template: - metadata: - labels: - component: otelcol-sdv-exporter - spec: - serviceAccountName: otelcol-sdv - securityContext: - {} - containers: - - name: otelcol-sdv-exporter - command: - - ./otel-sdv-exporter - securityContext: - {} - image: ghcr.io/eclipse-leda/leda-incubator-otel/otelcol-sdv-exporter:v0.0.1 - imagePullPolicy: IfNotPresent - ports: - - name: otlp - containerPort: 4317 - protocol: TCP - env: - - name: RUST_LOG - value: info - - name: MQTT_BROKER_HOST - value: mosquitto - imagePullSecrets: - - name: ghcr-io ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: otelcol-sdv -data: - relay: | - exporters: - otlp: - endpoint: otelcol-sdv:4317 - tls: - insecure: true - compression: none - processors: - batch: - send_batch_size: 1600 - timeout: 30s - receivers: - zipkin: - endpoint: 0.0.0.0:9411 - filelog: - exclude: [] - include: - - /var/log/pods/default_*/*/*.log - include_file_name: false - include_file_path: true - start_at: beginning - operators: - - type: regex_parser - id: parser-containerd - parse_to: body - output: extract_metadata_from_filepath - regex: '^(?P