diff --git a/.ci/README.md b/.ci/README.md deleted file mode 100644 index 689e5351..00000000 --- a/.ci/README.md +++ /dev/null @@ -1,25 +0,0 @@ -# ci-tools-lib - -Various toolchain bits and pieces shared between projects - -# Quickstart -Create top-level Makefile -``` -REGISTRY := -IMAGE := -REGION := - -include .ci/podman.mk -``` - -Add subtree to your project: -``` -git subtree add --prefix .ci https://git.zero-downtime.net/ZeroDownTime/ci-tools-lib.git master --squash -``` - - -## Jenkins -Shared groovy libraries - -## Make -Common Makefile include diff --git a/.gitignore b/.gitignore deleted file mode 100644 index f590abbf..00000000 --- a/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -# Vim -*.swp - -.vscode -.DS_Store -.idea -**/*.tgz - -# Breaks Helm V3 dependencies in Argo -Chart.lock -kubezero-repo.??? diff --git a/.helmdocsignore b/.helmdocsignore deleted file mode 100644 index 688e7713..00000000 --- a/.helmdocsignore +++ /dev/null @@ -1,2 +0,0 @@ -# Only our own charts, see Makefile -charts/ diff --git a/.versionrc b/.versionrc deleted file mode 100644 index 5795d32c..00000000 --- a/.versionrc +++ /dev/null @@ -1,2 +0,0 @@ -# template: "/tmp/doesntexist" -linkReferences: true diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index b0168fd1..00000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,46 +0,0 @@ -# Changelog - -## KubeZero - 2.18 ( Argoless ) - -### High level / Admin changes -- ArgoCD is now optional and NOT required nor used during initial cluster bootstrap -- the bootstrap process now uses the same config and templates as the optional ArgoCD applications later on -- the bootstrap is can now be restarted at any time and considerably faster -- the top level KubeZero config for the ArgoCD app-of-apps is now also maintained via the gitops workflow. Changes can be applied by a simple git push rather than manual scripts - -### Calico -- version bump - -### Cert-manager -- local issuers are now cluster issuer to allow them being used across namespaces -- all cert-manager resources moved into the cert-manager namespace -- version bump to 1.10 - -### Kiam -- set priorty class to cluster essential -- certificates are now issued by the cluster issuer - -### EBS / EFS -- version bump - -### Istio -- istio operator removed, deployment migrated to helm, various cleanups -- version bump to 1.8 -- all ingress resources are now in the dedicated new namespace istio-ingress ( deployed via separate kubezero chart istio-ingress) -- set priorty class of ingress components to cluster essential - -### Logging -- ES/Kibana version bump to 7.10 -- ECK operator is now installed on demand in logging ns -- Custom event fields configurable via new fluent-bit chart - e.g. clustername could be added to each event allowing easy filtering in case multiple clusters stream events into a single central ES cluster - -### ArgoCD -- version bump, new app of app architecure - -### Metrics -- version bump -- all servicemonitor resources are now in the same namespaces as the respective apps to avoid deployments across multiple namespaces - -### upstream Kubernetes 1.18 -https://sysdig.com/blog/whats-new-kubernetes-1-18/ diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 0054f966..00000000 --- a/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -ARG ALPINE_VERSION=3.18 - -FROM docker.io/alpine:${ALPINE_VERSION} - -ARG ALPINE_VERSION -ARG KUBE_VERSION=1.26 - -RUN cd /etc/apk/keys && \ - wget "https://cdn.zero-downtime.net/alpine/stefan@zero-downtime.net-61bb6bfb.rsa.pub" && \ - echo "@kubezero https://cdn.zero-downtime.net/alpine/v${ALPINE_VERSION}/kubezero" >> /etc/apk/repositories && \ - echo "@edge-testing http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \ - echo "@edge-community http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories && \ - apk upgrade -U -a --no-cache && \ - apk --no-cache add \ - jq \ - yq \ - diffutils \ - bash \ - python3 \ - py3-yaml \ - restic \ - helm \ - cri-tools@kubezero \ - kubeadm@kubezero~=${KUBE_VERSION} \ - kubectl@kubezero~=${KUBE_VERSION} \ - etcdhelper@kubezero \ - etcd-ctl@edge-testing - -RUN helm repo add kubezero https://cdn.zero-downtime.net/charts && \ - mkdir -p /var/lib/kubezero - -ADD admin/kubezero.sh admin/libhelm.sh admin/migrate_argo_values.py /usr/bin -ADD admin/libhelm.sh admin/pre-upgrade.sh /var/lib/kubezero - -ADD charts/kubeadm /charts/kubeadm -ADD charts/kubezero /charts/kubezero - -ENTRYPOINT ["kubezero.sh"] diff --git a/.ci/LICENSE b/LICENSE similarity index 100% rename from .ci/LICENSE rename to LICENSE diff --git a/LICENSE.md b/LICENSE.md deleted file mode 100644 index 4ef32f08..00000000 --- a/LICENSE.md +++ /dev/null @@ -1,651 +0,0 @@ -GNU Affero General Public License -================================= - -_Version 3, 19 November 2007_ -_Copyright © 2007 Free Software Foundation, Inc. <>_ - -Everyone is permitted to copy and distribute verbatim copies -of this license document, but changing it is not allowed. - -## Preamble - -The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - -The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - -When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - -Developers that use our General Public Licenses protect your rights -with two steps: **(1)** assert copyright on the software, and **(2)** offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - -A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - -The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - -An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - -The precise terms and conditions for copying, distribution and -modification follow. - -## TERMS AND CONDITIONS - -### 0. Definitions - -“This License” refers to version 3 of the GNU Affero General Public License. - -“Copyright” also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - -“The Program” refers to any copyrightable work licensed under this -License. Each licensee is addressed as “you”. “Licensees” and -“recipients” may be individuals or organizations. - -To “modify” a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a “modified version” of the -earlier work or a work “based on” the earlier work. - -A “covered work” means either the unmodified Program or a work based -on the Program. - -To “propagate” a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - -To “convey” a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - -An interactive user interface displays “Appropriate Legal Notices” -to the extent that it includes a convenient and prominently visible -feature that **(1)** displays an appropriate copyright notice, and **(2)** -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - -### 1. Source Code - -The “source code” for a work means the preferred form of the work -for making modifications to it. “Object code” means any non-source -form of a work. - -A “Standard Interface” means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - -The “System Libraries” of an executable work include anything, other -than the work as a whole, that **(a)** is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and **(b)** serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -“Major Component”, in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - -The “Corresponding Source” for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - -The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - -The Corresponding Source for a work in source code form is that -same work. - -### 2. Basic Permissions - -All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - -You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - -Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - -### 3. Protecting Users' Legal Rights From Anti-Circumvention Law - -No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - -When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - -### 4. Conveying Verbatim Copies - -You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - -You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - -### 5. Conveying Modified Source Versions - -You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - -* **a)** The work must carry prominent notices stating that you modified -it, and giving a relevant date. -* **b)** The work must carry prominent notices stating that it is -released under this License and any conditions added under section 7. -This requirement modifies the requirement in section 4 to -“keep intact all notices”. -* **c)** You must license the entire work, as a whole, under this -License to anyone who comes into possession of a copy. This -License will therefore apply, along with any applicable section 7 -additional terms, to the whole of the work, and all its parts, -regardless of how they are packaged. This License gives no -permission to license the work in any other way, but it does not -invalidate such permission if you have separately received it. -* **d)** If the work has interactive user interfaces, each must display -Appropriate Legal Notices; however, if the Program has interactive -interfaces that do not display Appropriate Legal Notices, your -work need not make them do so. - -A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -“aggregate” if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - -### 6. Conveying Non-Source Forms - -You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - -* **a)** Convey the object code in, or embodied in, a physical product -(including a physical distribution medium), accompanied by the -Corresponding Source fixed on a durable physical medium -customarily used for software interchange. -* **b)** Convey the object code in, or embodied in, a physical product -(including a physical distribution medium), accompanied by a -written offer, valid for at least three years and valid for as -long as you offer spare parts or customer support for that product -model, to give anyone who possesses the object code either **(1)** a -copy of the Corresponding Source for all the software in the -product that is covered by this License, on a durable physical -medium customarily used for software interchange, for a price no -more than your reasonable cost of physically performing this -conveying of source, or **(2)** access to copy the -Corresponding Source from a network server at no charge. -* **c)** Convey individual copies of the object code with a copy of the -written offer to provide the Corresponding Source. This -alternative is allowed only occasionally and noncommercially, and -only if you received the object code with such an offer, in accord -with subsection 6b. -* **d)** Convey the object code by offering access from a designated -place (gratis or for a charge), and offer equivalent access to the -Corresponding Source in the same way through the same place at no -further charge. You need not require recipients to copy the -Corresponding Source along with the object code. If the place to -copy the object code is a network server, the Corresponding Source -may be on a different server (operated by you or a third party) -that supports equivalent copying facilities, provided you maintain -clear directions next to the object code saying where to find the -Corresponding Source. Regardless of what server hosts the -Corresponding Source, you remain obligated to ensure that it is -available for as long as needed to satisfy these requirements. -* **e)** Convey the object code using peer-to-peer transmission, provided -you inform other peers where the object code and Corresponding -Source of the work are being offered to the general public at no -charge under subsection 6d. - -A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - -A “User Product” is either **(1)** a “consumer product”, which means any -tangible personal property which is normally used for personal, family, -or household purposes, or **(2)** anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, “normally used” refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - -“Installation Information” for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - -If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - -The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - -Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - -### 7. Additional Terms - -“Additional permissions” are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - -When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - -Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - -* **a)** Disclaiming warranty or limiting liability differently from the -terms of sections 15 and 16 of this License; or -* **b)** Requiring preservation of specified reasonable legal notices or -author attributions in that material or in the Appropriate Legal -Notices displayed by works containing it; or -* **c)** Prohibiting misrepresentation of the origin of that material, or -requiring that modified versions of such material be marked in -reasonable ways as different from the original version; or -* **d)** Limiting the use for publicity purposes of names of licensors or -authors of the material; or -* **e)** Declining to grant rights under trademark law for use of some -trade names, trademarks, or service marks; or -* **f)** Requiring indemnification of licensors and authors of that -material by anyone who conveys the material (or modified versions of -it) with contractual assumptions of liability to the recipient, for -any liability that these contractual assumptions directly impose on -those licensors and authors. - -All other non-permissive additional terms are considered “further -restrictions” within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - -If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - -Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - -### 8. Termination - -You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - -However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated **(a)** -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and **(b)** permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - -Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - -Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - -### 9. Acceptance Not Required for Having Copies - -You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - -### 10. Automatic Licensing of Downstream Recipients - -Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - -An “entity transaction” is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - -You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - -### 11. Patents - -A “contributor” is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's “contributor version”. - -A contributor's “essential patent claims” are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, “control” includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - -Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - -In the following three paragraphs, a “patent license” is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To “grant” such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - -If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either **(1)** cause the Corresponding Source to be so -available, or **(2)** arrange to deprive yourself of the benefit of the -patent license for this particular work, or **(3)** arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. “Knowingly relying” means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - -If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - -A patent license is “discriminatory” if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license **(a)** in connection with copies of the covered work -conveyed by you (or copies made from those copies), or **(b)** primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - -Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - -### 12. No Surrender of Others' Freedom - -If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - -### 13. Remote Network Interaction; Use with the GNU General Public License - -Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - -Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - -### 14. Revised Versions of this License - -The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License “or any later version” applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - -If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - -Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - -### 15. Disclaimer of Warranty - -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -### 16. Limitation of Liability - -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - -### 17. Interpretation of Sections 15 and 16 - -If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - -_END OF TERMS AND CONDITIONS_ - -## How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the “copyright” line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - -If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a “Source” link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - -You should also get your employer (if you work as a programmer) or school, -if any, to sign a “copyright disclaimer” for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -<>. diff --git a/Makefile b/Makefile deleted file mode 100644 index eb8ab7ef..00000000 --- a/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -REGISTRY := public.ecr.aws/zero-downtime -IMAGE := kubezero-admin -REGION := us-east-1 - -# Also tag as Kubernetes major version -MY_TAG = $(shell git describe --tags --match v*.*.* 2>/dev/null || git rev-parse --short HEAD 2>/dev/null) -EXTRA_TAGS = $(shell echo $(MY_TAG) | awk -F '.' '{ print $$1 "." $$2 }') - -include .ci/podman.mk - -update-charts: - ./scripts/update_helm.sh - -update-chart-docs: - for c in charts/*; do \ - [[ $$c =~ "kubezero-lib" ]] && continue ; \ - [[ $$c =~ "kubeadm" ]] && continue ; \ - helm-docs -c $$c ; \ - done - -publish-charts: - ./scripts/publish.sh - diff --git a/README.md b/README.md index 3757a8c8..689e5351 100644 --- a/README.md +++ b/README.md @@ -1,106 +1,25 @@ -KubeZero - Zero Down Time Kubernetes platform -======================== -KubeZero is a Kubernetes distribution providing an integrated container platform so you can focus on your applications. +# ci-tools-lib -# Design philosophy +Various toolchain bits and pieces shared between projects -- Cloud provider agnostic, bare-metal/self-hosted -- Focus on security and simplicity over feature creep -- No vendor lock in, most components are optional and could be easily exchanged -- Organic Open Source / open and permissive licenses over closed-source solutions -- No premium services / subscriptions required -- Staying up to date and contributing back to upstream projects, like alpine-cloud-images and others -- Corgi approved :dog: +# Quickstart +Create top-level Makefile +``` +REGISTRY := +IMAGE := +REGION := - -# Architecture -![aws_architecture](docs/aws_architecture.png) - - -# Version / Support Matrix -KubeZero releases track the same *minor* version of Kubernetes. -Any 1.26.X-Y release of Kubezero supports any Kubernetes cluster 1.26.X. - -KubeZero is distributed as a collection of versioned Helm charts, allowing custom upgrade schedules and module versions as needed. - -```mermaid -%%{init: {'theme':'dark'}}%% -gantt - title KubeZero Support Timeline - dateFormat YYYY-MM-DD - section 1.24 - beta :124b, 2022-11-14, 2022-12-31 - release :after 124b, 2023-06-01 - section 1.25 - beta :125b, 2023-03-01, 2023-03-31 - release :after 125b, 2023-08-01 - section 1.26 - beta :126b, 2023-06-01, 2023-06-30 - release :after 126b, 2023-10-01 +include .ci/podman.mk ``` -[Upstream release policy](https://kubernetes.io/releases/) +Add subtree to your project: +``` +git subtree add --prefix .ci https://git.zero-downtime.net/ZeroDownTime/ci-tools-lib.git master --squash +``` -# Components -## OS -- all nodes are based on Alpine V3.17 -- 2 GB encrypted root filesystem -- no 3rd party dependencies at boot ( other than container registries ) -- minimal attack surface -- extremely small memory footprint / overhead +## Jenkins +Shared groovy libraries -## Container runtime -- cri-o rather than Docker for improved security and performance - -## Control plane -- all Kubernetes components compiled against Alpine OS using `buildmode=pie` -- support for single node control plane for small clusters / test environments to reduce costs -- access to control plane from within the VPC only by default ( VPN access required for Admin tasks ) -- controller nodes are used for various platform admin controllers / operators to reduce costs and noise on worker nodes - -## GitOps -- cli / cmd line install -- optional full ArgoCD support and integration -- fuse device plugin support to build containers as part of a CI pipeline leveraging rootless podman build agents - -## AWS integrations -- IAM roles for service accounts allowing each pod to assume individual IAM roles -- access to meta-data services is blocked all workload containers on all nodes -- all IAM roles are maintained via CloudBender automation -- aws-node-termination handler integrated -- support for spot instances per worker group incl. early draining etc. -- support for [Inf1 instances](https://aws.amazon.com/ec2/instance-types/inf1/) part of [AWS Neuron](https://aws.amazon.com/machine-learning/neuron/). - -## Network -- Cilium using Geneve encapsulation, incl. increased MTU allowing flexible / more containers per worker node compared to eg. AWS VPC CNI -- Multus support for multiple network interfaces per pod, eg. additional AWS CNI -- no restrictions on IP space / sizing from the underlying VPC architecture - -## Storage -- flexible EBS support incl. zone awareness -- EFS support via automated EFS provisioning for worker groups via CloudBender automation -- local storage provider (OpenEBS LVM) for latency sensitive high performance workloads -- CSI Snapshot controller and Gemini snapshot groups and retention - -## Ingress -- AWS Network Loadbalancer and Istio Ingress controllers -- no additional costs per exposed service -- real client source IP available to workloads via HTTP header and access logs -- ACME SSL Certificate handling via cert-manager incl. renewal etc. -- support for TCP services -- optional rate limiting support -- optional full service mesh - -## Metrics -- Prometheus support for all components, incl. out of cluster EC2 instances (node_exporter) -- automated service discovery allowing instant access to common workload metrics -- pre-configured Grafana dashboards and alerts -- Alertmanager events via SNSAlertHub to Slack, Google, Matrix, etc. - -## Logging -- all container logs are enhanced with Kubernetes and AWS metadata to provide context for each message -- flexible ElasticSearch setup, leveraging the ECK operator, for easy maintenance & minimal admin knowledge required, incl. automated backups to S3 -- Kibana allowing easy search and dashboards for all logs, incl. pre configured index templates and index management -- [fluentd-concerter](https://git.zero-downtime.net/ZeroDownTime/container-park/src/branch/master/fluentd-concenter) service providing queuing during highload as well as additional parsing options -- lightweight fluent-bit agents on each node requiring minimal resources forwarding logs secure via TLS to fluentd-concenter \ No newline at end of file +## Make +Common Makefile include diff --git a/admin/README.md b/admin/README.md deleted file mode 100644 index 389f57ca..00000000 --- a/admin/README.md +++ /dev/null @@ -1,12 +0,0 @@ -# Cluster upgrade flow - -## During 1.23 upgrade -- create new kubezero-values CM if not exists yet, by merging parts of the legacy /etc/kubernetes/kubeadm-values.yaml values with potentially existing values from kubezero ArgoCD app values - - -# General flow - -- No ArgoCD -> user kubezero-values CM -- ArgoCD -> update kubezero-values CM with current values from ArgoCD app values - -- Apply any upgrades / migrations diff --git a/admin/dev_apply.sh b/admin/dev_apply.sh deleted file mode 100755 index c66bce20..00000000 --- a/admin/dev_apply.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -#set -eEx -#set -o pipefail -set -x - -#VERSION="latest" -KUBE_VERSION="v1.26.6" -WORKDIR=$(mktemp -p /tmp -d kubezero.XXX) - -SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -# shellcheck disable=SC1091 -. "$SCRIPT_DIR"/libhelm.sh -CHARTS="$(dirname $SCRIPT_DIR)/charts" - -get_kubezero_values - -# Always use embedded kubezero chart -helm template $CHARTS/kubezero -f $WORKDIR/kubezero-values.yaml --kube-version $KUBE_VERSION --version ~$KUBE_VERSION --devel --output-dir $WORKDIR - -# CRDs first -_helm crds $1 -_helm apply $1 diff --git a/admin/kubezero.sh b/admin/kubezero.sh deleted file mode 100755 index 926a9b4f..00000000 --- a/admin/kubezero.sh +++ /dev/null @@ -1,386 +0,0 @@ -#!/bin/bash -e - -if [ -n "$DEBUG" ]; then - set -x - LOG="--v=5" -fi - -# include helm lib -. /var/lib/kubezero/libhelm.sh - -# Export vars to ease use in debug_shell etc -export WORKDIR=/tmp/kubezero -export HOSTFS=/host -export CHARTS=/charts -export KUBE_VERSION=$(kubeadm version -o json | jq -r .clientVersion.gitVersion) -export KUBE_VERSION_MINOR="v1.$(kubectl version -o json | jq .clientVersion.minor -r)" - -export KUBECONFIG="${HOSTFS}/root/.kube/config" - -# etcd -export ETCDCTL_API=3 -export ETCDCTL_CACERT=${HOSTFS}/etc/kubernetes/pki/etcd/ca.crt -export ETCDCTL_CERT=${HOSTFS}/etc/kubernetes/pki/apiserver-etcd-client.crt -export ETCDCTL_KEY=${HOSTFS}/etc/kubernetes/pki/apiserver-etcd-client.key - -mkdir -p ${WORKDIR} - -# Generic retry utility -retry() { - local tries=$1 - local waitfor=$2 - local timeout=$3 - shift 3 - while true; do - type -tf $1 >/dev/null && { timeout $timeout $@ && return; } || { $@ && return; } - let tries=$tries-1 - [ $tries -eq 0 ] && return 1 - sleep $waitfor - done -} - - -_kubeadm() { - kubeadm $@ --config /etc/kubernetes/kubeadm.yaml --rootfs ${HOSTFS} $LOG -} - - -# Render cluster config -render_kubeadm() { - helm template $CHARTS/kubeadm --output-dir ${WORKDIR} -f ${HOSTFS}/etc/kubernetes/kubeadm-values.yaml - - # Assemble kubeadm config - cat /dev/null > ${HOSTFS}/etc/kubernetes/kubeadm.yaml - for f in Cluster Init Join KubeProxy Kubelet; do - # echo "---" >> /etc/kubernetes/kubeadm.yaml - cat ${WORKDIR}/kubeadm/templates/${f}Configuration.yaml >> ${HOSTFS}/etc/kubernetes/kubeadm.yaml - done - - # "uncloak" the json patches after they got processed by helm - for s in apiserver controller-manager scheduler; do - yq eval '.json' ${WORKDIR}/kubeadm/templates/patches/kube-${s}1\+json.yaml > /tmp/_tmp.yaml && \ - mv /tmp/_tmp.yaml ${WORKDIR}/kubeadm/templates/patches/kube-${s}1\+json.yaml - done -} - - -parse_kubezero() { - export CLUSTERNAME=$(yq eval '.global.clusterName // .clusterName' ${HOSTFS}/etc/kubernetes/kubeadm-values.yaml) - export HIGHAVAILABLE=$(yq eval '.global.highAvailable // .highAvailable // "false"' ${HOSTFS}/etc/kubernetes/kubeadm-values.yaml) - export ETCD_NODENAME=$(yq eval '.etcd.nodeName' ${HOSTFS}/etc/kubernetes/kubeadm-values.yaml) - export NODENAME=$(yq eval '.nodeName' ${HOSTFS}/etc/kubernetes/kubeadm-values.yaml) - export PROVIDER_ID=$(yq eval '.providerID // ""' ${HOSTFS}/etc/kubernetes/kubeadm-values.yaml) - export AWS_IAM_AUTH=$(yq eval '.api.awsIamAuth.enabled // "false"' ${HOSTFS}/etc/kubernetes/kubeadm-values.yaml) - - # From here on bail out, allows debug_shell even in error cases - set -e -} - - -# Shared steps before calling kubeadm -pre_kubeadm() { - # update all apiserver addons first - cp -r ${WORKDIR}/kubeadm/templates/apiserver ${HOSTFS}/etc/kubernetes - - # aws-iam-authenticator enabled ? - if [ "$AWS_IAM_AUTH" == "true" ]; then - - # Initialize webhook - if [ ! -f ${HOSTFS}/etc/kubernetes/pki/aws-iam-authenticator.crt ]; then - ${HOSTFS}/usr/bin/aws-iam-authenticator init -i ${CLUSTERNAME} - mv key.pem ${HOSTFS}/etc/kubernetes/pki/aws-iam-authenticator.key - mv cert.pem ${HOSTFS}/etc/kubernetes/pki/aws-iam-authenticator.crt - fi - - # Patch the aws-iam-authenticator config with the actual cert.pem - yq eval -Mi ".clusters[0].cluster.certificate-authority-data = \"$(cat ${HOSTFS}/etc/kubernetes/pki/aws-iam-authenticator.crt| base64 -w0)\"" ${HOSTFS}/etc/kubernetes/apiserver/aws-iam-authenticator.yaml - fi - - # copy patches to host to make --rootfs of kubeadm work - cp -r ${WORKDIR}/kubeadm/templates/patches /host/tmp/ -} - - -# Shared steps after calling kubeadm -post_kubeadm() { - # KubeZero resources - for f in ${WORKDIR}/kubeadm/templates/resources/*.yaml; do - kubectl apply -f $f $LOG - done - - # Patch coreDNS addon, ideally we prevent kubeadm to reset coreDNS to its defaults - kubectl patch deployment coredns -n kube-system --patch-file ${WORKDIR}/kubeadm/templates/patches/coredns0.yaml $LOG - - rm -rf /host/tmp/patches -} - - -kubeadm_upgrade() { - # pre upgrade hook - [ -f /var/lib/kubezero/pre-upgrade.sh ] && . /var/lib/kubezero/pre-upgrade.sh - - render_kubeadm - - pre_kubeadm - - # Upgrade - _kubeadm upgrade apply -y --patches /tmp/patches - - post_kubeadm - - # If we have a re-cert kubectl config install for root - if [ -f ${HOSTFS}/etc/kubernetes/admin.conf ]; then - cp ${HOSTFS}/etc/kubernetes/admin.conf ${HOSTFS}/root/.kube/config - fi - - # post upgrade hook - [ -f /var/lib/kubezero/post-upgrade.sh ] && . /var/lib/kubezero/post-upgrade.sh - - # Cleanup after kubeadm on the host - rm -rf ${HOSTFS}/etc/kubernetes/tmp - - echo "Successfully upgraded kubeadm control plane." - - # TODO - # Send Notification currently done via CloudBender -> SNS -> Slack - # Better deploy https://github.com/opsgenie/kubernetes-event-exporter and set proper routes and labels on this Job - - # Removed: - # - update oidc do we need that ? -} - - -control_plane_node() { - CMD=$1 - - render_kubeadm - - # Ensure clean slate if bootstrap, restore PKI otherwise - if [[ "$CMD" =~ ^(bootstrap)$ ]]; then - rm -rf ${HOSTFS}/var/lib/etcd/member - - else - # restore latest backup - retry 10 60 30 restic restore latest --no-lock -t / # --tag $KUBE_VERSION_MINOR - - # Make last etcd snapshot available - cp ${WORKDIR}/etcd_snapshot ${HOSTFS}/etc/kubernetes - - # Put PKI in place - cp -r ${WORKDIR}/pki ${HOSTFS}/etc/kubernetes - - # Always use kubeadm kubectl config to never run into chicken egg with custom auth hooks - cp ${WORKDIR}/admin.conf ${HOSTFS}/root/.kube/config - - # Only restore etcd data during "restore" and none exists already - if [[ "$CMD" =~ ^(restore)$ ]]; then - if [ ! -d ${HOSTFS}/var/lib/etcd/member ]; then - etcdctl snapshot restore ${HOSTFS}/etc/kubernetes/etcd_snapshot \ - --name $ETCD_NODENAME \ - --data-dir="${HOSTFS}/var/lib/etcd" \ - --initial-cluster-token etcd-${CLUSTERNAME} \ - --initial-advertise-peer-urls https://${ETCD_NODENAME}:2380 \ - --initial-cluster $ETCD_NODENAME=https://${ETCD_NODENAME}:2380 - fi - fi - fi - - # Delete old node certs in case they are around - rm -f ${HOSTFS}/etc/kubernetes/pki/etcd/peer.* ${HOSTFS}/etc/kubernetes/pki/etcd/server.* ${HOSTFS}/etc/kubernetes/pki/etcd/healthcheck-client.* \ - ${HOSTFS}/etc/kubernetes/pki/apiserver* ${HOSTFS}/etc/kubernetes/pki/front-proxy-client.* - - # Issue all certs first, needed for eg. aws-iam-authenticator setup - _kubeadm init phase certs all - - pre_kubeadm - - # Pull all images - _kubeadm config images pull - - _kubeadm init phase preflight - _kubeadm init phase kubeconfig all - - if [[ "$CMD" =~ ^(join)$ ]]; then - # Delete any former self in case forseti did not delete yet - kubectl delete node ${NODENAME} --wait=true || true - # Wait for all pods to be deleted otherwise we end up with stale pods eg. kube-proxy and all goes to .... - kubectl delete pods -n kube-system --field-selector spec.nodeName=${NODENAME} - - # get current running etcd pods for etcdctl commands - while true; do - etcd_endpoints=$(kubectl get pods -n kube-system -l component=etcd -o yaml | \ - yq eval '.items[].metadata.annotations."kubeadm.kubernetes.io/etcd.advertise-client-urls"' - | tr '\n' ',' | sed -e 's/,$//') - [[ $etcd_endpoints =~ ^https:// ]] && break - sleep 3 - done - - # see if we are a former member and remove our former self if so - MY_ID=$(etcdctl member list --endpoints=$etcd_endpoints | grep $ETCD_NODENAME | awk '{print $1}' | sed -e 's/,$//') - [ -n "$MY_ID" ] && retry 12 5 5 etcdctl member remove $MY_ID --endpoints=$etcd_endpoints - - # flush etcd data directory as joining with previous storage seems flaky, especially during etcd version upgrades - rm -rf ${HOSTFS}/var/lib/etcd/member - - # Announce new etcd member and capture ETCD_INITIAL_CLUSTER, retry needed in case another node joining causes temp quorum loss - ETCD_ENVS=$(retry 12 5 5 etcdctl member add $ETCD_NODENAME --peer-urls="https://${ETCD_NODENAME}:2380" --endpoints=$etcd_endpoints) - export $(echo "$ETCD_ENVS" | grep ETCD_INITIAL_CLUSTER= | sed -e 's/"//g') - - # Patch kubeadm-values.yaml and re-render to get etcd manifest patched - yq eval -i '.etcd.state = "existing" - | .etcd.initialCluster = strenv(ETCD_INITIAL_CLUSTER) - ' ${HOSTFS}/etc/kubernetes/kubeadm-values.yaml - render_kubeadm - fi - - # Generate our custom etcd yaml - _kubeadm init phase etcd local - _kubeadm init phase control-plane all - - _kubeadm init phase kubelet-start - - cp ${HOSTFS}/etc/kubernetes/admin.conf ${HOSTFS}/root/.kube/config - - # Wait for api to be online - echo "Waiting for Kubernetes API to be online ..." - retry 0 5 30 kubectl cluster-info --request-timeout 3 >/dev/null - - # Update providerID as underlying VM changed during restore - if [[ "$CMD" =~ ^(restore)$ ]]; then - if [ -n "$PROVIDER_ID" ]; then - etcdhelper \ - -cacert ${HOSTFS}/etc/kubernetes/pki/etcd/ca.crt \ - -cert ${HOSTFS}/etc/kubernetes/pki/etcd/server.crt \ - -key ${HOSTFS}/etc/kubernetes/pki/etcd/server.key \ - -endpoint https://${ETCD_NODENAME}:2379 \ - change-provider-id ${NODENAME} $PROVIDER_ID - fi - fi - - if [[ "$CMD" =~ ^(bootstrap|restore)$ ]]; then - _kubeadm init phase upload-config all - _kubeadm init phase upload-certs --skip-certificate-key-print - - # This sets up the ClusterRoleBindings to allow bootstrap nodes to create CSRs etc. - _kubeadm init phase bootstrap-token --skip-token-print - fi - - _kubeadm init phase mark-control-plane - _kubeadm init phase kubelet-finalize all - - if [[ "$CMD" =~ ^(bootstrap|restore)$ ]]; then - _kubeadm init phase addon all - fi - - # Ensure aws-iam-authenticator secret is in place - if [ "$AWS_IAM_AUTH" == "true" ]; then - kubectl get secrets -n kube-system aws-iam-certs || \ - kubectl create secret generic aws-iam-certs -n kube-system \ - --from-file=key.pem=${HOSTFS}/etc/kubernetes/pki/aws-iam-authenticator.key \ - --from-file=cert.pem=${HOSTFS}/etc/kubernetes/pki/aws-iam-authenticator.crt - - # Store aws-iam-auth admin on SSM - yq eval -M ".clusters[0].cluster.certificate-authority-data = \"$(cat ${HOSTFS}/etc/kubernetes/pki/ca.crt | base64 -w0)\"" ${WORKDIR}/kubeadm/templates/admin-aws-iam.yaml > ${HOSTFS}/etc/kubernetes/admin-aws-iam.yaml - fi - - post_kubeadm - - echo "${1} cluster $CLUSTERNAME successfull." -} - - -apply_module() { - MODULES=$1 - - get_kubezero_values - - # Always use embedded kubezero chart - helm template $CHARTS/kubezero -f $WORKDIR/kubezero-values.yaml --version ~$KUBE_VERSION --devel --output-dir $WORKDIR - - # CRDs first - for t in $MODULES; do - _helm crds $t - done - - for t in $MODULES; do - _helm apply $t - done - - echo "Applied KubeZero modules: $MODULES" -} - - -delete_module() { - MODULES=$1 - - get_kubezero_values - - # Always use embedded kubezero chart - helm template $CHARTS/kubezero -f $WORKDIR/kubezero-values.yaml --version ~$KUBE_VERSION --devel --output-dir $WORKDIR - - for t in $MODULES; do - _helm delete $t - done - - echo "Deleted KubeZero modules: $MODULES. Potential CRDs must be removed manually." -} - -# backup etcd + /etc/kubernetes/pki -backup() { - # Display all ENVs, careful this exposes the password ! - [ -n "$DEBUG" ] && env - - restic snapshots || restic init || exit 1 - - CV=$(kubectl version -o json | jq .serverVersion.minor -r) - let PCV=$CV-1 - - CLUSTER_VERSION="v1.$CV" - PREVIOUS_VERSION="v1.$PCV" - - etcdctl --endpoints=https://${ETCD_NODENAME}:2379 snapshot save ${WORKDIR}/etcd_snapshot - - # pki & cluster-admin access - cp -r ${HOSTFS}/etc/kubernetes/pki ${WORKDIR} - cp -r ${HOSTFS}/etc/kubernetes/admin.conf ${WORKDIR} - - # Backup via restic - restic backup ${WORKDIR} -H $CLUSTERNAME --tag $CLUSTER_VERSION - - echo "Backup complete." - - # Remove backups from pre-previous versions - restic forget --keep-tag $CLUSTER_VERSION --keep-tag $PREVIOUS_VERSION --prune - - # Regular retention - restic forget --keep-hourly 24 --keep-daily ${RESTIC_RETENTION:-7} --prune - - # Defrag etcd backend - etcdctl --endpoints=https://${ETCD_NODENAME}:2379 defrag -} - - -debug_shell() { - echo "Entering debug shell" - - printf "For manual etcdctl commands use:\n # export ETCDCTL_ENDPOINTS=$ETCD_NODENAME:2379\n" - - /bin/bash -} - -# First parse kubeadm-values.yaml -parse_kubezero - -# Execute tasks -for t in $@; do - case "$t" in - kubeadm_upgrade) kubeadm_upgrade;; - bootstrap) control_plane_node bootstrap;; - join) control_plane_node join;; - restore) control_plane_node restore;; - apply_*) apply_module "${t##apply_}";; - delete_*) delete_module "${t##delete_}";; - backup) backup;; - debug_shell) debug_shell;; - *) echo "Unknown command: '$t'";; - esac -done diff --git a/admin/libhelm.sh b/admin/libhelm.sh deleted file mode 100644 index 7b982f32..00000000 --- a/admin/libhelm.sh +++ /dev/null @@ -1,184 +0,0 @@ -#!/bin/bash - -# Simulate well-known CRDs being available -API_VERSIONS="-a monitoring.coreos.com/v1 -a snapshot.storage.k8s.io/v1 -a policy/v1/PodDisruptionBudget" - -# Waits for max 300s and retries -function wait_for() { - local TRIES=0 - while true; do - eval " $@" && break - [ $TRIES -eq 100 ] && return 1 - let TRIES=$TRIES+1 - sleep 3 - done -} - - -function chart_location() { - echo "$1 --repo https://cdn.zero-downtime.net/charts" -} - - -function argo_used() { - kubectl get application kubezero -n argocd >/dev/null && rc=$? || rc=$? - return $rc -} - - -# get kubezero-values from ArgoCD if available or use in-cluster CM without Argo -function get_kubezero_values() { - argo_used && \ - { kubectl get application kubezero -n argocd -o yaml | yq .spec.source.helm.values > ${WORKDIR}/kubezero-values.yaml; } || \ - { kubectl get configmap -n kube-system kubezero-values -o yaml | yq '.data."values.yaml"' > ${WORKDIR}/kubezero-values.yaml ;} -} - - -function disable_argo() { - cat > _argoapp_patch.yaml < $WORKDIR/helm-no-crds.yaml - helm template $(chart_location $chart) -n $namespace --name-template $module $targetRevision --include-crds --set ${module}.installCRDs=true -f $WORKDIR/values.yaml $API_VERSIONS --kube-version $KUBE_VERSION > $WORKDIR/helm-crds.yaml - diff -e $WORKDIR/helm-no-crds.yaml $WORKDIR/helm-crds.yaml | head -n-1 | tail -n+2 > $WORKDIR/crds.yaml - - # Only apply if there are actually any crds - if [ -s $WORKDIR/crds.yaml ]; then - [ -n "$DEBUG" ] && cat $WORKDIR/crds.yaml - kubectl apply -f $WORKDIR/crds.yaml --server-side --force-conflicts - fi -} - - -# helm template | kubectl apply -f - -# confine to one namespace if possible -function render() { - helm template $(chart_location $chart) -n $namespace --name-template $module $targetRevision --skip-crds -f $WORKDIR/values.yaml $API_VERSIONS --kube-version $KUBE_VERSION $@ \ - | python3 -c ' -#!/usr/bin/python3 -import yaml -import sys - -for manifest in yaml.safe_load_all(sys.stdin): - if manifest: - if "metadata" in manifest and "namespace" not in manifest["metadata"]: - manifest["metadata"]["namespace"] = sys.argv[1] - print("---") - print(yaml.dump(manifest))' $namespace > $WORKDIR/helm.yaml -} - - -function _helm() { - local action=$1 - local module=$2 - - # check if module is even enabled and return if not - [ ! -f $WORKDIR/kubezero/templates/${module}.yaml ] && { echo "Module $module disabled. No-op."; return 0; } - - local chart="$(yq eval '.spec.source.chart' $WORKDIR/kubezero/templates/${module}.yaml)" - local namespace="$(yq eval '.spec.destination.namespace' $WORKDIR/kubezero/templates/${module}.yaml)" - - targetRevision="" - _version="$(yq eval '.spec.source.targetRevision' $WORKDIR/kubezero/templates/${module}.yaml)" - - [ -n "$_version" ] && targetRevision="--version $_version" - - yq eval '.spec.source.helm.values' $WORKDIR/kubezero/templates/${module}.yaml > $WORKDIR/values.yaml - - echo "using values to $action of module $module: " - cat $WORKDIR/values.yaml - - if [ $action == "crds" ]; then - # Allow custom CRD handling - declare -F ${module}-crds && ${module}-crds || _crds - - elif [ $action == "apply" ]; then - # namespace must exist prior to apply - create_ns $namespace - - # Optional pre hook - declare -F ${module}-pre && ${module}-pre - - render - kubectl $action -f $WORKDIR/helm.yaml --server-side --force-conflicts && rc=$? || rc=$? - - # Try again without server-side, review with 1.26, required for cert-manager during 1.25 - [ $rc -ne 0 ] && kubectl $action -f $WORKDIR/helm.yaml && rc=$? || rc=$? - - # Optional post hook - declare -F ${module}-post && ${module}-post - - elif [ $action == "delete" ]; then - render - kubectl $action -f $WORKDIR/helm.yaml && rc=$? || rc=$? - - # Delete dedicated namespace if not kube-system - [ -n "$DELETE_NS" ] && delete_ns $namespace - fi - - return 0 -} diff --git a/admin/migrate_argo_values.py b/admin/migrate_argo_values.py deleted file mode 100755 index 04322bad..00000000 --- a/admin/migrate_argo_values.py +++ /dev/null @@ -1,80 +0,0 @@ -#!/usr/bin/env python3 -import sys -import argparse -import io -import yaml - - -def migrate(values): - """Actual changes here""" - - return values - - -def deleteKey(values, key): - """Delete key from dictionary if exists""" - try: - values.pop(key) - except KeyError: - pass - - return values - - -class MyDumper(yaml.Dumper): - """ - Required to add additional indent for arrays to match yq behaviour to reduce noise in diffs - """ - - def increase_indent(self, flow=False, indentless=False): - return super(MyDumper, self).increase_indent(flow, False) - - -def str_presenter(dumper, data): - if len(data.splitlines()) > 1: # check for multiline string - return dumper.represent_scalar("tag:yaml.org,2002:str", data, style="|") - return dumper.represent_scalar("tag:yaml.org,2002:str", data) - - -def rec_sort(d): - if isinstance(d, dict): - res = dict() - - # Always have "enabled" first if present - if "enabled" in d.keys(): - res["enabled"] = rec_sort(d["enabled"]) - d.pop("enabled") - - # next is "name" if present - if "name" in d.keys(): - res["name"] = rec_sort(d["name"]) - d.pop("name") - - for k in sorted(d.keys()): - res[k] = rec_sort(d[k]) - return res - if isinstance(d, list): - for idx, elem in enumerate(d): - d[idx] = rec_sort(elem) - - return d - - -yaml.add_representer(str, str_presenter) - -# to use with safe_dump: -yaml.representer.SafeRepresenter.add_representer(str, str_presenter) - -# Read values -values = yaml.safe_load(sys.stdin) - -# Output new values -buffer = io.StringIO() -yaml.dump( - rec_sort(migrate(values)), - sys.stdout, - default_flow_style=False, - indent=2, - sort_keys=False, - Dumper=MyDumper, -) diff --git a/admin/pre-upgrade.sh b/admin/pre-upgrade.sh deleted file mode 100644 index 86e35193..00000000 --- a/admin/pre-upgrade.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -# get current values, argo app over cm -get_kubezero_values - -# tumble new config through migrate.py -migrate_argo_values.py < "$WORKDIR"/kubezero-values.yaml > "$WORKDIR"/new-kubezero-values.yaml - -# Update kubezero-values CM -kubectl get cm -n kube-system kubezero-values -o=yaml | \ - yq e '.data."values.yaml" |= load_str("/tmp/kubezero/new-kubezero-values.yaml")' | \ - kubectl replace -f - - -# update argo app -kubectl get application kubezero -n argocd -o yaml | \ - kubezero_chart_version=$(yq .version /charts/kubezero/Chart.yaml) \ - yq '.spec.source.helm.values |= load_str("/tmp/kubezero/new-kubezero-values.yaml") | .spec.source.targetRevision = strenv(kubezero_chart_version)' | \ - kubectl apply -f - - -# finally remove annotation to allow argo to sync again -kubectl patch app kubezero -n argocd --type json -p='[{"op": "remove", "path": "/metadata/annotations"}]' diff --git a/admin/upgrade_cluster.sh b/admin/upgrade_cluster.sh deleted file mode 100755 index 92234d7e..00000000 --- a/admin/upgrade_cluster.sh +++ /dev/null @@ -1,178 +0,0 @@ -#!/bin/bash -set -eE -set -o pipefail - -#VERSION="latest" -VERSION="v1.26" -ARGO_APP=${1:-/tmp/new-kubezero-argoapp.yaml} - -SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -# shellcheck disable=SC1091 -. "$SCRIPT_DIR"/libhelm.sh - -[ -n "$DEBUG" ] && set -x - -all_nodes_upgrade() { - CMD="$1" - - echo "Deploy all node upgrade daemonSet(busybox)" - cat </dev/null - while true; do - kubectl logs kubezero-upgrade -n kube-system -f 2>/dev/null && break - sleep 3 - done - kubectl delete pod kubezero-upgrade -n kube-system -} - - -echo "Checking that all pods in kube-system are running ..." -waitSystemPodsRunning - -argo_used && disable_argo - -#all_nodes_upgrade "" - - -control_plane_upgrade kubeadm_upgrade - -echo "Adjust kubezero values as needed:" -# shellcheck disable=SC2015 -argo_used && kubectl edit app kubezero -n argocd || kubectl edit cm kubezero-values -n kube-system - -control_plane_upgrade "apply_network, apply_addons, apply_storage" - -echo "Checking that all pods in kube-system are running ..." -waitSystemPodsRunning - -echo "Applying remaining KubeZero modules..." - -control_plane_upgrade "apply_cert-manager, apply_istio, apply_istio-ingress, apply_istio-private-ingress, apply_logging, apply_metrics, apply_argocd" - -# Trigger backup of upgraded cluster state -kubectl create job --from=cronjob/kubezero-backup kubezero-backup-$VERSION -n kube-system -while true; do - kubectl wait --for=condition=complete job/kubezero-backup-$VERSION -n kube-system 2>/dev/null && kubectl delete job kubezero-backup-$VERSION -n kube-system && break - sleep 1 -done - -# Final step is to commit the new argocd kubezero app -kubectl get app kubezero -n argocd -o yaml | yq 'del(.status) | del(.metadata) | del(.operation) | .metadata.name="kubezero" | .metadata.namespace="argocd"' | yq 'sort_keys(..) | .spec.source.helm.values |= (from_yaml | to_yaml)' > $ARGO_APP - -echo "Please commit $ARGO_APP as the updated kubezero/application.yaml for your cluster." -echo "Then head over to ArgoCD for this cluster and sync all KubeZero modules to apply remaining upgrades." - -echo " to continue and re-enable ArgoCD:" -read -r - -argo_used && enable_argo diff --git a/charts/clamav/.helmignore b/charts/clamav/.helmignore deleted file mode 100644 index 095cd7c5..00000000 --- a/charts/clamav/.helmignore +++ /dev/null @@ -1,24 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ -clamav.yaml diff --git a/charts/clamav/Chart.yaml b/charts/clamav/Chart.yaml deleted file mode 100644 index 8b64b154..00000000 --- a/charts/clamav/Chart.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: v2 -name: clamav -description: Chart for deploying a ClamavD on kubernetes as statfulSet -type: application -version: "0.2.0" -appVersion: "1.1.0" -home: https://kubezero.com -icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png -keywords: - - kubezero - - clamav -maintainers: - - name: Quarky9 -dependencies: - - name: kubezero-lib - version: ">= 0.1.6" - repository: https://cdn.zero-downtime.net/charts/ -kubeVersion: ">= 1.25.0" diff --git a/charts/clamav/README.md b/charts/clamav/README.md deleted file mode 100644 index f7de6a30..00000000 --- a/charts/clamav/README.md +++ /dev/null @@ -1,42 +0,0 @@ -# clamav - -![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.104.0](https://img.shields.io/badge/AppVersion-0.104.0-informational?style=flat-square) - -Chart for deploying a ClamavD on kubernetes as statfulSet - -**Homepage:** - -## Maintainers - -| Name | Email | Url | -| ---- | ------ | --- | -| Quarky9 | | | - -## Requirements - -Kubernetes: `>= 1.18.0` - -| Repository | Name | Version | -|------------|------|---------| -| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.4 | - -## Values - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| clamav.freshclam.mirrors | string | `"database.clamav.net"` | A list of clamav mirrors to be used by the clamav service | -| clamav.image | string | `"clamav/clamav"` | The clamav docker image | -| clamav.limits.connectionQueueLength | int | `100` | Maximum length the queue of pending connections may grow to | -| clamav.limits.fileSize | int | `20` | The largest file size scanable by clamav, in MB | -| clamav.limits.maxThreads | int | `4` | Maximum number of threads running at the same time. | -| clamav.limits.scanSize | int | `100` | The largest scan size permitted in clamav, in MB | -| clamav.limits.sendBufTimeout | int | `500` | | -| clamav.replicaCount | int | `1` | | -| clamav.resources | object | `{"requests":{"cpu":"300m","memory":"1300M"}}` | The resource requests and limits for the clamav service | -| clamav.version | string | `"unstable"` | The clamav docker image version - defaults to .Chart.appVersion | -| fullnameOverride | string | `""` | override the full name of the clamav chart | -| nameOverride | string | `""` | override the name of the clamav chart | -| service.port | int | `3310` | The port to be used by the clamav service | - ----------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) diff --git a/charts/clamav/deploy.sh b/charts/clamav/deploy.sh deleted file mode 100755 index dc8c8a59..00000000 --- a/charts/clamav/deploy.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -release=clamav -namespace=clamav - -helm template . --namespace $namespace --name-template $release > clamav.yaml -kubectl apply --namespace $namespace -f clamav.yaml diff --git a/charts/clamav/templates/configmap.yaml b/charts/clamav/templates/configmap.yaml deleted file mode 100644 index 9ebdc6e7..00000000 --- a/charts/clamav/templates/configmap.yaml +++ /dev/null @@ -1,52 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "kubezero-lib.fullname" . }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "kubezero-lib.labels" . | nindent 4 }} -data: - clamd.conf: | - LogTime yes - LogClean yes - LogSyslog no - LogVerbose no - LogFileMaxSize 0 - LogFile /dev/stdout - DatabaseDirectory /var/lib/clamav - TCPSocket 3310 - LocalSocket /run/clamav/clamd.sock - User clamav - ExitOnOOM yes - Foreground yes - MaxScanSize {{.Values.clamav.limits.scanSize}}M - MaxFileSize {{.Values.clamav.limits.fileSize}}M - - # Close the connection when the data size limit is exceeded. - # The value should match your MTA's limit for a maximum attachment size. - # Default: 25M - StreamMaxLength {{.Values.clamav.limits.scanSize}}M - - # Maximum length the queue of pending connections may grow to. - # Default: 200 - MaxConnectionQueueLength {{.Values.clamav.limits.connectionQueueLength}} - - # Maximum number of threads running at the same time. - # Default: 10 - MaxThreads {{.Values.clamav.limits.maxThreads}} - - # This option specifies how long to wait (in milliseconds) if the send buffer - # is full. - # Keep this value low to prevent clamd hanging. - # - # Default: 500 - SendBufTimeout {{.Values.clamav.limits.sendBufTimeout}} - - freshclam.conf: | - LogTime yes - LogVerbose yes - NotifyClamd /etc/clamav/clamd.conf - Checks 24 - LogSyslog no - DatabaseOwner root - DatabaseMirror {{ .Values.clamav.freshclam.mirrors }} diff --git a/charts/clamav/templates/service.yaml b/charts/clamav/templates/service.yaml deleted file mode 100644 index d572fddc..00000000 --- a/charts/clamav/templates/service.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "kubezero-lib.fullname" . }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "kubezero-lib.labels" . | nindent 4 }} -spec: - ports: - - port: {{ .Values.service.port }} - targetPort: 3310 - protocol: TCP - name: clamav - selector: - {{- include "kubezero-lib.selectorLabels" . | nindent 4 }} diff --git a/charts/clamav/templates/statefulset.yaml b/charts/clamav/templates/statefulset.yaml deleted file mode 100644 index c6efe89d..00000000 --- a/charts/clamav/templates/statefulset.yaml +++ /dev/null @@ -1,78 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ include "kubezero-lib.fullname" . }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "kubezero-lib.labels" . | nindent 4 }} -spec: - replicas: {{ .Values.clamav.replicaCount }} - selector: - matchLabels: - {{- include "kubezero-lib.selectorLabels" . | nindent 6 }} - serviceName: {{ include "kubezero-lib.fullname" . }} - template: - metadata: - labels: - {{- include "kubezero-lib.selectorLabels" . | nindent 8 }} - annotations: - checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} - spec: - containers: - - name: clamav - image: "{{ .Values.clamav.image }}:{{ default .Chart.AppVersion .Values.clamav.version }}_base" - ports: - - containerPort: 3310 - name: clamav - protocol: TCP - # Give clamav up to 300s to get CVDs in place etc. - startupProbe: - exec: - command: - - /usr/local/bin/clamdcheck.sh - failureThreshold: 30 - periodSeconds: 10 - livenessProbe: - exec: - command: - - /usr/local/bin/clamdcheck.sh - failureThreshold: 2 - periodSeconds: 30 - successThreshold: 1 - timeoutSeconds: 3 - resources: - {{- toYaml .Values.clamav.resources | nindent 10 }} - volumeMounts: - - mountPath: /var/lib/clamav - name: signatures - - mountPath: /etc/clamav - name: config-volume - #securityContext: - # runAsNonRoot: true - volumes: - - name: config-volume - configMap: - name: {{ include "kubezero-lib.fullname" . }} - {{- with .Values.clamav.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.clamav.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.clamav.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} - volumeClaimTemplates: - - metadata: - name: signatures - spec: - accessModes: [ "ReadWriteOnce" ] - {{- with .Values.clamav.storageClassName }} - storageClassName: {{ . }} - {{- end }} - resources: - requests: - storage: 2Gi diff --git a/charts/clamav/values.yaml b/charts/clamav/values.yaml deleted file mode 100644 index 0d1140a8..00000000 --- a/charts/clamav/values.yaml +++ /dev/null @@ -1,46 +0,0 @@ -# Default values for clamav. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -# nameOverride -- override the name of the clamav chart -nameOverride: "" - -# fullnameOverride -- override the full name of the clamav chart -fullnameOverride: "" - -service: - # service.port -- The port to be used by the clamav service - port: 3310 - -clamav: - # clamav.image -- The clamav docker image - image: clamav/clamav - # clamav.version -- The clamav docker image version - defaults to .Chart.appVersion - # version: "unstable" - - replicaCount: 1 - - freshclam: - # clamav.freshclam.mirrors -- A list of clamav mirrors to be used by the clamav service - mirrors: database.clamav.net - limits: - # clamav.limits.fileSize -- The largest file size scanable by clamav, in MB - fileSize: 20 - # clamav.limits.scanSize -- The largest scan size permitted in clamav, in MB - scanSize: 100 - # clamav.limits.connectionQueueLength -- Maximum length the queue of pending connections may grow to - connectionQueueLength: 100 - # clamav.limits.maxThreads --Maximum number of threads running at the same time. - maxThreads: 4 - # clamav.sendBufTimeout -- This option specifies how long to wait (in milliseconds) if the send buffer is full, keep low to avoid clamd hanging - sendBufTimeout: 500 - - - resources: - # clamav.resources -- The resource requests and limits for the clamav service - requests: - cpu: 300m - memory: 2000M - #limits: - # cpu: 2 - # memory: 4000M diff --git a/charts/kubeadm/.helmignore b/charts/kubeadm/.helmignore deleted file mode 100644 index cc1438c2..00000000 --- a/charts/kubeadm/.helmignore +++ /dev/null @@ -1,2 +0,0 @@ -*.md -*.md.gotmpl diff --git a/charts/kubeadm/Chart.yaml b/charts/kubeadm/Chart.yaml deleted file mode 100644 index c2b924d3..00000000 --- a/charts/kubeadm/Chart.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v2 -name: kubeadm -description: KubeZero Kubeadm cluster config -type: application -version: 1.26.7 -home: https://kubezero.com -icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png -keywords: - - kubezero - - kubeadm -maintainers: - - name: Stefan Reimer - email: stefan@zero-downtime.net -kubeVersion: ">= 1.26.0" diff --git a/charts/kubeadm/README.md b/charts/kubeadm/README.md deleted file mode 100644 index c7c68b88..00000000 --- a/charts/kubeadm/README.md +++ /dev/null @@ -1,57 +0,0 @@ -# kubeadm - -![Version: 1.25.8](https://img.shields.io/badge/Version-1.25.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) - -KubeZero Kubeadm cluster config - -**Homepage:** - -## Maintainers - -| Name | Email | Url | -| ---- | ------ | --- | -| Stefan Reimer | | | - -## Requirements - -Kubernetes: `>= 1.25.0` - -## Values - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| api.apiAudiences | string | `"istio-ca"` | | -| api.awsIamAuth.enabled | bool | `false` | | -| api.awsIamAuth.kubeAdminRole | string | `"arn:aws:iam::000000000000:role/KubernetesNode"` | | -| api.awsIamAuth.workerNodeRole | string | `"arn:aws:iam::000000000000:role/KubernetesNode"` | | -| api.endpoint | string | `"kube-api.changeme.org:6443"` | | -| api.etcdServers | string | `"https://etcd:2379"` | | -| api.extraArgs | object | `{}` | | -| api.listenPort | int | `6443` | | -| api.oidcEndpoint | string | `""` | s3://${CFN[ConfigBucket]}/k8s/$CLUSTERNAME | -| api.serviceAccountIssuer | string | `""` | https://s3.${REGION}.amazonaws.com/${CFN[ConfigBucket]}/k8s/$CLUSTERNAME | -| domain | string | `"changeme.org"` | | -| etcd.extraArgs | object | `{}` | | -| etcd.nodeName | string | `"etcd"` | | -| etcd.state | string | `"new"` | | -| global.clusterName | string | `"pleasechangeme"` | | -| global.highAvailable | bool | `false` | | -| listenAddress | string | `"0.0.0.0"` | Needs to be set to primary node IP | -| nodeName | string | `"kubezero-node"` | set to $HOSTNAME | -| protectKernelDefaults | bool | `false` | | -| systemd | bool | `false` | Set to false for openrc, eg. on Gentoo or Alpine | - -## Resources - -- https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/troubleshooting-kubeadm/ -- https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3 -- https://pkg.go.dev/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3 -- https://github.com/kubernetes/kubernetes/blob/master/staging/src/k8s.io/kubelet/config/v1beta1/types.go -- https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/control-plane-flags/ -- https://godoc.org/k8s.io/kube-proxy/config/v1alpha1#KubeProxyConfiguration - -- https://github.com/awslabs/amazon-eks-ami - -### Etcd -- https://itnext.io/breaking-down-and-fixing-etcd-cluster-d81e35b9260d - diff --git a/charts/kubeadm/README.md.gotmpl b/charts/kubeadm/README.md.gotmpl deleted file mode 100644 index 43d20a82..00000000 --- a/charts/kubeadm/README.md.gotmpl +++ /dev/null @@ -1,31 +0,0 @@ -{{ template "chart.header" . }} -{{ template "chart.deprecationWarning" . }} - -{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }} - -{{ template "chart.description" . }} - -{{ template "chart.homepageLine" . }} - -{{ template "chart.maintainersSection" . }} - -{{ template "chart.sourcesSection" . }} - -{{ template "chart.requirementsSection" . }} - -{{ template "chart.valuesSection" . }} - -## Resources - -- https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/troubleshooting-kubeadm/ -- https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3 -- https://pkg.go.dev/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3 -- https://github.com/kubernetes/kubernetes/blob/master/staging/src/k8s.io/kubelet/config/v1beta1/types.go -- https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/control-plane-flags/ -- https://godoc.org/k8s.io/kube-proxy/config/v1alpha1#KubeProxyConfiguration - -- https://github.com/awslabs/amazon-eks-ami - -### Etcd -- https://itnext.io/breaking-down-and-fixing-etcd-cluster-d81e35b9260d - diff --git a/charts/kubeadm/create_audit_policy.sh b/charts/kubeadm/create_audit_policy.sh deleted file mode 100755 index a4d24701..00000000 --- a/charts/kubeadm/create_audit_policy.sh +++ /dev/null @@ -1,159 +0,0 @@ -#!/bin/sh - -function createMasterAuditPolicy() { - path="templates/apiserver/audit-policy.yaml" - - known_apis=' - - group: "" # core - - group: "admissionregistration.k8s.io" - - group: "apiextensions.k8s.io" - - group: "apiregistration.k8s.io" - - group: "apps" - - group: "authentication.k8s.io" - - group: "authorization.k8s.io" - - group: "autoscaling" - - group: "batch" - - group: "certificates.k8s.io" - - group: "extensions" - - group: "metrics.k8s.io" - - group: "networking.k8s.io" - - group: "node.k8s.io" - - group: "policy" - - group: "rbac.authorization.k8s.io" - - group: "scheduling.k8s.io" - - group: "storage.k8s.io"' - - cat <"${path}" -apiVersion: audit.k8s.io/v1 -kind: Policy -rules: - # The following requests were manually identified as high-volume and low-risk, - # so drop them. - - level: None - users: ["system:kube-proxy"] - verbs: ["watch"] - resources: - - group: "" # core - resources: ["endpoints", "services", "services/status"] - - level: None - # Ingress controller reads 'configmaps/ingress-uid' through the unsecured port. - # TODO(#46983): Change this to the ingress controller service account. - users: ["system:unsecured"] - namespaces: ["kube-system"] - verbs: ["get"] - resources: - - group: "" # core - resources: ["configmaps"] - - level: None - users: ["kubelet"] # legacy kubelet identity - verbs: ["get"] - resources: - - group: "" # core - resources: ["nodes", "nodes/status"] - - level: None - userGroups: ["system:nodes"] - verbs: ["get"] - resources: - - group: "" # core - resources: ["nodes", "nodes/status"] - - level: None - users: - - system:kube-controller-manager - - system:cloud-controller-manager - - system:kube-scheduler - - system:serviceaccount:kube-system:endpoint-controller - verbs: ["get", "update"] - namespaces: ["kube-system"] - resources: - - group: "" # core - resources: ["endpoints"] - - level: None - users: ["system:apiserver"] - verbs: ["get"] - resources: - - group: "" # core - resources: ["namespaces", "namespaces/status", "namespaces/finalize"] - - level: None - users: ["cluster-autoscaler"] - verbs: ["get", "update"] - namespaces: ["kube-system"] - resources: - - group: "" # core - resources: ["configmaps", "endpoints"] - # Don't log HPA fetching metrics. - - level: None - users: - - system:kube-controller-manager - - system:cloud-controller-manager - verbs: ["get", "list"] - resources: - - group: "metrics.k8s.io" - - # Don't log these read-only URLs. - - level: None - nonResourceURLs: - - /healthz* - - /version - - /swagger* - - /readyz - - # Don't log events requests because of performance impact. - - level: None - resources: - - group: "" # core - resources: ["events"] - - # node and pod status calls from nodes are high-volume and can be large, don't log responses for expected updates from nodes - - level: Request - users: ["kubelet", "system:node-problem-detector", "system:serviceaccount:kube-system:node-problem-detector"] - verbs: ["update","patch"] - resources: - - group: "" # core - resources: ["nodes/status", "pods/status"] - omitStages: - - "RequestReceived" - - level: Request - userGroups: ["system:nodes"] - verbs: ["update","patch"] - resources: - - group: "" # core - resources: ["nodes/status", "pods/status"] - omitStages: - - "RequestReceived" - - # deletecollection calls can be large, don't log responses for expected namespace deletions - - level: Request - users: ["system:serviceaccount:kube-system:namespace-controller"] - verbs: ["deletecollection"] - omitStages: - - "RequestReceived" - - # Secrets, ConfigMaps, TokenRequest and TokenReviews can contain sensitive & binary data, - # so only log at the Metadata level. - - level: Metadata - resources: - - group: "" # core - resources: ["secrets", "configmaps", "serviceaccounts/token"] - - group: authentication.k8s.io - resources: ["tokenreviews"] - omitStages: - - "RequestReceived" - # Get responses can be large; skip them. - - level: Request - verbs: ["get", "list", "watch"] - resources: ${known_apis} - omitStages: - - "RequestReceived" - # Default level for known APIs - - level: RequestResponse - resources: ${known_apis} - omitStages: - - "RequestReceived" - # Default level for all other requests. - - level: Metadata - omitStages: - - "RequestReceived" -EOF -} - -createMasterAuditPolicy diff --git a/charts/kubeadm/templates/ClusterConfiguration.yaml b/charts/kubeadm/templates/ClusterConfiguration.yaml deleted file mode 100644 index 48541c62..00000000 --- a/charts/kubeadm/templates/ClusterConfiguration.yaml +++ /dev/null @@ -1,95 +0,0 @@ -apiVersion: kubeadm.k8s.io/v1beta3 -kind: ClusterConfiguration -kubernetesVersion: {{ .Chart.Version }} -clusterName: {{ .Values.global.clusterName }} -#featureGates: -# NonGracefulFailover: true -controlPlaneEndpoint: {{ .Values.api.endpoint }} -networking: - podSubnet: 10.244.0.0/16 -etcd: - local: - # imageTag: 3.5.5-0 - extraArgs: - ### DNS discovery - #discovery-srv: {{ .Values.domain }} - #discovery-srv-name: {{ .Values.global.clusterName }} - advertise-client-urls: https://{{ .Values.etcd.nodeName }}:2379 - initial-advertise-peer-urls: https://{{ .Values.etcd.nodeName }}:2380 - initial-cluster: {{ include "kubeadm.etcd.initialCluster" .Values.etcd | quote }} - initial-cluster-state: {{ .Values.etcd.state }} - initial-cluster-token: etcd-{{ .Values.global.clusterName }} - name: {{ .Values.etcd.nodeName }} - listen-peer-urls: https://{{ .Values.listenAddress }}:2380 - listen-client-urls: https://{{ .Values.listenAddress }}:2379 - listen-metrics-urls: http://0.0.0.0:2381 - logger: zap - # log-level: "warn" - {{- with .Values.etcd.extraArgs }} - {{- toYaml . | nindent 6 }} - {{- end }} - serverCertSANs: - - "{{ .Values.etcd.nodeName }}" - - "{{ .Values.etcd.nodeName }}.{{ .Values.domain }}" - - "{{ .Values.domain }}" - peerCertSANs: - - "{{ .Values.etcd.nodeName }}" - - "{{ .Values.etcd.nodeName }}.{{ .Values.domain }}" - - "{{ .Values.domain }}" -controllerManager: - extraArgs: - profiling: "false" - terminated-pod-gc-threshold: "300" - leader-elect: {{ .Values.global.highAvailable | quote }} - logging-format: json - feature-gates: {{ include "kubeadm.featuregates" ( dict "return" "csv" ) | trimSuffix "," | quote }} -scheduler: - extraArgs: - profiling: "false" - leader-elect: {{ .Values.global.highAvailable | quote }} - logging-format: json - feature-gates: {{ include "kubeadm.featuregates" ( dict "return" "csv" ) | trimSuffix "," | quote }} -apiServer: - certSANs: - - {{ regexSplit ":" .Values.api.endpoint -1 | first }} - extraArgs: - etcd-servers: {{ .Values.api.etcdServers }} - profiling: "false" - audit-log-path: "/var/log/kubernetes/audit.log" - audit-policy-file: /etc/kubernetes/apiserver/audit-policy.yaml - audit-log-maxage: "7" - audit-log-maxsize: "100" - audit-log-maxbackup: "1" - audit-log-compress: "true" - {{- if .Values.api.falco.enabled }} - audit-webhook-config-file: /etc/kubernetes/apiserver/audit-webhook.yaml - {{- end }} - tls-cipher-suites: "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" - admission-control-config-file: /etc/kubernetes/apiserver/admission-configuration.yaml - api-audiences: {{ .Values.api.apiAudiences }} - {{- if .Values.api.serviceAccountIssuer }} - service-account-issuer: "{{ .Values.api.serviceAccountIssuer }}" - service-account-jwks-uri: "{{ .Values.api.serviceAccountIssuer }}/openid/v1/jwks" - {{- end }} - {{- if .Values.api.awsIamAuth.enabled }} - authentication-token-webhook-config-file: /etc/kubernetes/apiserver/aws-iam-authenticator.yaml - {{- end }} - feature-gates: {{ include "kubeadm.featuregates" ( dict "return" "csv" ) | trimSuffix "," | quote }} - enable-admission-plugins: DenyServiceExternalIPs,NodeRestriction,EventRateLimit,ExtendedResourceToleration - # {{- if .Values.global.highAvailable }} - # goaway-chance: ".001" - # {{- end }} - logging-format: json - {{- with .Values.api.extraArgs }} - {{- toYaml . | nindent 4 }} - {{- end }} - extraVolumes: - - name: kubezero-apiserver - hostPath: /etc/kubernetes/apiserver - mountPath: /etc/kubernetes/apiserver - readOnly: true - pathType: DirectoryOrCreate - - name: audit-log - hostPath: /var/log/kubernetes - mountPath: /var/log/kubernetes - pathType: DirectoryOrCreate diff --git a/charts/kubeadm/templates/InitConfiguration.yaml b/charts/kubeadm/templates/InitConfiguration.yaml deleted file mode 100644 index f334d04b..00000000 --- a/charts/kubeadm/templates/InitConfiguration.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: kubeadm.k8s.io/v1beta3 -kind: InitConfiguration -localAPIEndpoint: - advertiseAddress: {{ .Values.listenAddress }} - bindPort: {{ .Values.api.listenPort }} -patches: - directory: /tmp/patches -nodeRegistration: - criSocket: "unix:///var/run/crio/crio.sock" - ignorePreflightErrors: - - DirAvailable--var-lib-etcd - - DirAvailable--etc-kubernetes-manifests - - FileAvailable--etc-kubernetes-pki-ca.crt - - FileAvailable--etc-kubernetes-manifests-etcd.yaml - - Swap - - KubeletVersion - kubeletExtraArgs: - node-labels: {{ .Values.nodeLabels | quote }} - {{- with .Values.providerID }} - provider-id: {{ . }} - {{- end }} - {{- if ne .Values.listenAddress "0.0.0.0" }} - node-ip: {{ .Values.listenAddress }} - {{- end }} diff --git a/charts/kubeadm/templates/JoinConfiguration.yaml b/charts/kubeadm/templates/JoinConfiguration.yaml deleted file mode 100644 index 41d30297..00000000 --- a/charts/kubeadm/templates/JoinConfiguration.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kubeadm.k8s.io/v1beta3 -kind: JoinConfiguration -nodeRegistration: - criSocket: "unix:///var/run/crio/crio.sock" -patches: - directory: /tmp/patches diff --git a/charts/kubeadm/templates/KubeProxyConfiguration.yaml b/charts/kubeadm/templates/KubeProxyConfiguration.yaml deleted file mode 100644 index 26da3522..00000000 --- a/charts/kubeadm/templates/KubeProxyConfiguration.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kubeproxy.config.k8s.io/v1alpha1 -kind: KubeProxyConfiguration -# kube-proxy doesnt really support setting dynamic bind-address via config, replaced by cilium long-term anyways -metricsBindAddress: "0.0.0.0:10249" -# calico < 3.22.1 breaks starting with 1.23, see https://github.com/projectcalico/calico/issues/5011 -# we go Cilium anyways -mode: "iptables" diff --git a/charts/kubeadm/templates/KubeletConfiguration.yaml b/charts/kubeadm/templates/KubeletConfiguration.yaml deleted file mode 100644 index f107c4fb..00000000 --- a/charts/kubeadm/templates/KubeletConfiguration.yaml +++ /dev/null @@ -1,35 +0,0 @@ -# https://kubernetes.io/docs/reference/config-api/kubelet-config.v1beta1/ -apiVersion: kubelet.config.k8s.io/v1beta1 -kind: KubeletConfiguration -failSwapOn: false -cgroupDriver: cgroupfs -logging: - format: json -hairpinMode: hairpin-veth -{{- if .Values.systemd }} -resolvConf: /run/systemd/resolve/resolv.conf -{{- end }} -protectKernelDefaults: {{ .Values.protectKernelDefaults }} -#eventRecordQPS: 0 -# Breaks kubelet at boot time -# tlsCertFile: /var/lib/kubelet/pki/kubelet.crt -# tlsPrivateKeyFile: /var/lib/kubelet/pki/kubelet.key -tlsCipherSuites: [TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_GCM_SHA256] -featureGates: - {{- include "kubeadm.featuregates" ( dict "return" "map" ) | nindent 2 }} -# Minimal unit is 40m per pod -podsPerCore: 25 -# cpuCFSQuotaPeriod: 10ms -# Basic OS incl. crio -systemReserved: - memory: 96Mi - #ephemeral-storage: "1Gi" -# kubelet memory should be static as runc,conmon are added to each pod's cgroup -kubeReserved: - cpu: 70m - memory: 96Mi -# Lets use below to reserve memory for system processes as kubeReserved/sytemReserved doesnt go well with systemd it seems -#evictionHard: -# memory.available: "484Mi" -imageGCLowThresholdPercent: 70 -# kernelMemcgNotification: true diff --git a/charts/kubeadm/templates/README.md b/charts/kubeadm/templates/README.md deleted file mode 100644 index afb2413e..00000000 --- a/charts/kubeadm/templates/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# aws-iam-authenticator -- https://github.com/kubernetes-sigs/aws-iam-authenticator diff --git a/charts/kubeadm/templates/_helpers.tpl b/charts/kubeadm/templates/_helpers.tpl deleted file mode 100644 index 9b5ab6f9..00000000 --- a/charts/kubeadm/templates/_helpers.tpl +++ /dev/null @@ -1,23 +0,0 @@ -{{- /* Feature gates for all control plane components */ -}} -{{- define "kubeadm.featuregates" }} -{{- $gates := list "CustomCPUCFSQuotaPeriod" }} -{{- if eq .return "csv" }} -{{- range $key := $gates }} -{{- $key }}=true, -{{- end }} -{{- else }} -{{- range $key := $gates }} -{{ $key }}: true -{{- end }} -{{- end }} -{{- end }} - - -{{- /* Etcd default initial cluster */ -}} -{{- define "kubeadm.etcd.initialCluster" -}} -{{- if .initialCluster -}} -{{ .initialCluster }} -{{- else -}} -{{ .nodeName }}=https://{{ .nodeName }}:2380 -{{- end -}} -{{- end -}} diff --git a/charts/kubeadm/templates/admin-aws-iam.yaml b/charts/kubeadm/templates/admin-aws-iam.yaml deleted file mode 100644 index fe316866..00000000 --- a/charts/kubeadm/templates/admin-aws-iam.yaml +++ /dev/null @@ -1,27 +0,0 @@ -{{- if .Values.api.awsIamAuth.enabled }} -apiVersion: v1 -kind: Config -clusters: -- cluster: - server: https://{{ .Values.api.endpoint }} - name: {{ .Values.global.clusterName }} -contexts: -- context: - cluster: {{ .Values.global.clusterName }} - user: kubernetes-admin - name: kubernetes-admin@{{ .Values.global.clusterName }} -current-context: kubernetes-admin@{{ .Values.global.clusterName }} -preferences: {} -users: -- name: kubernetes-admin - user: - exec: - apiVersion: client.authentication.k8s.io/v1beta1 - command: aws-iam-authenticator - args: - - "token" - - "-i" - - "{{ .Values.global.clusterName }}" - - "-r" - - "{{ .Values.api.awsIamAuth.kubeAdminRole }}" -{{- end }} diff --git a/charts/kubeadm/templates/apiserver/admission-configuration.yaml b/charts/kubeadm/templates/apiserver/admission-configuration.yaml deleted file mode 100644 index 76d79d07..00000000 --- a/charts/kubeadm/templates/apiserver/admission-configuration.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: apiserver.config.k8s.io/v1 -kind: AdmissionConfiguration -metadata: - name: kubezero-admissionconfiguration -plugins: -- name: EventRateLimit - path: /etc/kubernetes/apiserver/event-config.yaml diff --git a/charts/kubeadm/templates/apiserver/audit-policy-off.yaml b/charts/kubeadm/templates/apiserver/audit-policy-off.yaml deleted file mode 100644 index 40da4ea4..00000000 --- a/charts/kubeadm/templates/apiserver/audit-policy-off.yaml +++ /dev/null @@ -1,7 +0,0 @@ -# Don't Log anything, but audit policy enabled -apiVersion: audit.k8s.io/v1 -kind: Policy -metadata: - name: kubezero-auditpolicy -rules: -- level: None diff --git a/charts/kubeadm/templates/apiserver/audit-policy.yaml b/charts/kubeadm/templates/apiserver/audit-policy.yaml deleted file mode 100644 index 9285f6e5..00000000 --- a/charts/kubeadm/templates/apiserver/audit-policy.yaml +++ /dev/null @@ -1,164 +0,0 @@ -apiVersion: audit.k8s.io/v1 -kind: Policy -rules: - # The following requests were manually identified as high-volume and low-risk, - # so drop them. - - level: None - users: ["system:kube-proxy"] - verbs: ["watch"] - resources: - - group: "" # core - resources: ["endpoints", "services", "services/status"] - - level: None - # Ingress controller reads 'configmaps/ingress-uid' through the unsecured port. - # TODO(#46983): Change this to the ingress controller service account. - users: ["system:unsecured"] - namespaces: ["kube-system"] - verbs: ["get"] - resources: - - group: "" # core - resources: ["configmaps"] - - level: None - users: ["kubelet"] # legacy kubelet identity - verbs: ["get"] - resources: - - group: "" # core - resources: ["nodes", "nodes/status"] - - level: None - userGroups: ["system:nodes"] - verbs: ["get"] - resources: - - group: "" # core - resources: ["nodes", "nodes/status"] - - level: None - users: - - system:kube-controller-manager - - system:cloud-controller-manager - - system:kube-scheduler - - system:serviceaccount:kube-system:endpoint-controller - verbs: ["get", "update"] - namespaces: ["kube-system"] - resources: - - group: "" # core - resources: ["endpoints"] - - level: None - users: ["system:apiserver"] - verbs: ["get"] - resources: - - group: "" # core - resources: ["namespaces", "namespaces/status", "namespaces/finalize"] - - level: None - users: ["cluster-autoscaler"] - verbs: ["get", "update"] - namespaces: ["kube-system"] - resources: - - group: "" # core - resources: ["configmaps", "endpoints"] - # Don't log HPA fetching metrics. - - level: None - users: - - system:kube-controller-manager - - system:cloud-controller-manager - verbs: ["get", "list"] - resources: - - group: "metrics.k8s.io" - - # Don't log these read-only URLs. - - level: None - nonResourceURLs: - - /healthz* - - /version - - /swagger* - - # Don't log events requests because of performance impact. - - level: None - resources: - - group: "" # core - resources: ["events"] - - # node and pod status calls from nodes are high-volume and can be large, don't log responses for expected updates from nodes - - level: Request - users: ["kubelet", "system:node-problem-detector", "system:serviceaccount:kube-system:node-problem-detector"] - verbs: ["update","patch"] - resources: - - group: "" # core - resources: ["nodes/status", "pods/status"] - omitStages: - - "RequestReceived" - - level: Request - userGroups: ["system:nodes"] - verbs: ["update","patch"] - resources: - - group: "" # core - resources: ["nodes/status", "pods/status"] - omitStages: - - "RequestReceived" - - # deletecollection calls can be large, don't log responses for expected namespace deletions - - level: Request - users: ["system:serviceaccount:kube-system:namespace-controller"] - verbs: ["deletecollection"] - omitStages: - - "RequestReceived" - - # Secrets, ConfigMaps, TokenRequest and TokenReviews can contain sensitive & binary data, - # so only log at the Metadata level. - - level: Metadata - resources: - - group: "" # core - resources: ["secrets", "configmaps", "serviceaccounts/token"] - - group: authentication.k8s.io - resources: ["tokenreviews"] - omitStages: - - "RequestReceived" - # Get responses can be large; skip them. - - level: Request - verbs: ["get", "list", "watch"] - resources: - - group: "" # core - - group: "admissionregistration.k8s.io" - - group: "apiextensions.k8s.io" - - group: "apiregistration.k8s.io" - - group: "apps" - - group: "authentication.k8s.io" - - group: "authorization.k8s.io" - - group: "autoscaling" - - group: "batch" - - group: "certificates.k8s.io" - - group: "extensions" - - group: "metrics.k8s.io" - - group: "networking.k8s.io" - - group: "node.k8s.io" - - group: "policy" - - group: "rbac.authorization.k8s.io" - - group: "scheduling.k8s.io" - - group: "storage.k8s.io" - omitStages: - - "RequestReceived" - # Default level for known APIs - - level: RequestResponse - resources: - - group: "" # core - - group: "admissionregistration.k8s.io" - - group: "apiextensions.k8s.io" - - group: "apiregistration.k8s.io" - - group: "apps" - - group: "authentication.k8s.io" - - group: "authorization.k8s.io" - - group: "autoscaling" - - group: "batch" - - group: "certificates.k8s.io" - - group: "extensions" - - group: "metrics.k8s.io" - - group: "networking.k8s.io" - - group: "node.k8s.io" - - group: "policy" - - group: "rbac.authorization.k8s.io" - - group: "scheduling.k8s.io" - - group: "storage.k8s.io" - omitStages: - - "RequestReceived" - # Default level for all other requests. - - level: Metadata - omitStages: - - "RequestReceived" diff --git a/charts/kubeadm/templates/apiserver/audit-webhook.yaml b/charts/kubeadm/templates/apiserver/audit-webhook.yaml deleted file mode 100644 index c6024128..00000000 --- a/charts/kubeadm/templates/apiserver/audit-webhook.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: Config -clusters: - - name: falco - cluster: - server: http://falco-control-plane-k8saudit-webhook:9765/k8s-audit -contexts: - - context: - cluster: falco - user: "" - name: default-context -current-context: default-context -preferences: {} -users: [] diff --git a/charts/kubeadm/templates/apiserver/aws-iam-authenticator.yaml b/charts/kubeadm/templates/apiserver/aws-iam-authenticator.yaml deleted file mode 100644 index 1a6818a2..00000000 --- a/charts/kubeadm/templates/apiserver/aws-iam-authenticator.yaml +++ /dev/null @@ -1,19 +0,0 @@ -{{- if .Values.api.awsIamAuth.enabled }} -# clusters refers to the remote service. -clusters: - - name: aws-iam-authenticator - cluster: - certificate-authority-data: "replaced at runtime" - server: https://localhost:21362/authenticate -# users refers to the API Server's webhook configuration -# (we don't need to authenticate the API server). -users: - - name: apiserver -# kubeconfig files require a context. Provide one for the API Server. -current-context: webhook -contexts: -- name: webhook - context: - cluster: aws-iam-authenticator - user: apiserver -{{- end }} diff --git a/charts/kubeadm/templates/apiserver/event-config.yaml b/charts/kubeadm/templates/apiserver/event-config.yaml deleted file mode 100644 index 4e1166aa..00000000 --- a/charts/kubeadm/templates/apiserver/event-config.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: eventratelimit.admission.k8s.io/v1alpha1 -kind: Configuration -metadata: - name: kubezero-eventratelimits -limits: -- type: Namespace - qps: 50 - burst: 100 - cacheSize: 20 -- type: User - qps: 10 - burst: 50 - cacheSize: 20 diff --git a/charts/kubeadm/templates/credential-provider.yaml b/charts/kubeadm/templates/credential-provider.yaml deleted file mode 100644 index 9bf23d04..00000000 --- a/charts/kubeadm/templates/credential-provider.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: kubelet.config.k8s.io/v1beta1 -kind: CredentialProviderConfig -providers: - - name: amazon-ecr-credential-helper - matchImages: - - "*.dkr.ecr.*.amazonaws.com" - - "*.dkr.ecr.*.amazonaws.cn" - - "*.dkr.ecr-fips.*.amazonaws.com" - - "*.dkr.ecr.us-iso-east-1.c2s.ic.gov" - - "*.dkr.ecr.us-isob-east-1.sc2s.sgov.gov" - defaultCacheDuration: "12h" - apiVersion: credentialprovider.kubelet.k8s.io/v1alpha1 - args: - - get - #env: - # - name: AWS_PROFILE - # value: example_profile diff --git a/charts/kubeadm/templates/patches/coredns0.yaml b/charts/kubeadm/templates/patches/coredns0.yaml deleted file mode 100644 index 21608adb..00000000 --- a/charts/kubeadm/templates/patches/coredns0.yaml +++ /dev/null @@ -1,14 +0,0 @@ -spec: - replicas: {{ ternary 3 1 .Values.global.highAvailable }} - template: - spec: - containers: - - name: coredns - resources: - requests: - cpu: 100m - memory: 32Mi - limits: - memory: 128Mi - nodeSelector: - node-role.kubernetes.io/control-plane: "" diff --git a/charts/kubeadm/templates/patches/etcd0.yaml b/charts/kubeadm/templates/patches/etcd0.yaml deleted file mode 100644 index 8bebff49..00000000 --- a/charts/kubeadm/templates/patches/etcd0.yaml +++ /dev/null @@ -1,8 +0,0 @@ -spec: - containers: - - name: etcd - resources: - requests: - cpu: 200m - memory: 192Mi - #ephemeral-storage: 1Gi diff --git a/charts/kubeadm/templates/patches/kube-apiserver0.yaml b/charts/kubeadm/templates/patches/kube-apiserver0.yaml deleted file mode 100644 index 37a592f0..00000000 --- a/charts/kubeadm/templates/patches/kube-apiserver0.yaml +++ /dev/null @@ -1,8 +0,0 @@ -spec: - dnsPolicy: ClusterFirstWithHostNet - containers: - - name: kube-apiserver - resources: - requests: - cpu: 200m - memory: 1Gi diff --git a/charts/kubeadm/templates/patches/kube-apiserver1+json.yaml b/charts/kubeadm/templates/patches/kube-apiserver1+json.yaml deleted file mode 100644 index 41b6183c..00000000 --- a/charts/kubeadm/templates/patches/kube-apiserver1+json.yaml +++ /dev/null @@ -1,10 +0,0 @@ -json: - - op: add - path: /spec/containers/0/command/- - value: --bind-address={{ .Values.listenAddress }} - - op: replace - path: /spec/containers/0/livenessProbe/httpGet/host - value: {{ .Values.listenAddress }} - - op: replace - path: /spec/containers/0/startupProbe/httpGet/host - value: {{ .Values.listenAddress }} diff --git a/charts/kubeadm/templates/patches/kube-controller-manager0.yaml b/charts/kubeadm/templates/patches/kube-controller-manager0.yaml deleted file mode 100644 index 5771a750..00000000 --- a/charts/kubeadm/templates/patches/kube-controller-manager0.yaml +++ /dev/null @@ -1,7 +0,0 @@ -spec: - containers: - - name: kube-controller-manager - resources: - requests: - cpu: 100m - memory: 128Mi diff --git a/charts/kubeadm/templates/patches/kube-controller-manager1+json.yaml b/charts/kubeadm/templates/patches/kube-controller-manager1+json.yaml deleted file mode 100644 index 41b6183c..00000000 --- a/charts/kubeadm/templates/patches/kube-controller-manager1+json.yaml +++ /dev/null @@ -1,10 +0,0 @@ -json: - - op: add - path: /spec/containers/0/command/- - value: --bind-address={{ .Values.listenAddress }} - - op: replace - path: /spec/containers/0/livenessProbe/httpGet/host - value: {{ .Values.listenAddress }} - - op: replace - path: /spec/containers/0/startupProbe/httpGet/host - value: {{ .Values.listenAddress }} diff --git a/charts/kubeadm/templates/patches/kube-scheduler0.yaml b/charts/kubeadm/templates/patches/kube-scheduler0.yaml deleted file mode 100644 index 837fd637..00000000 --- a/charts/kubeadm/templates/patches/kube-scheduler0.yaml +++ /dev/null @@ -1,7 +0,0 @@ -spec: - containers: - - name: kube-scheduler - resources: - requests: - cpu: 100m - memory: 64Mi diff --git a/charts/kubeadm/templates/patches/kube-scheduler1+json.yaml b/charts/kubeadm/templates/patches/kube-scheduler1+json.yaml deleted file mode 100644 index 41b6183c..00000000 --- a/charts/kubeadm/templates/patches/kube-scheduler1+json.yaml +++ /dev/null @@ -1,10 +0,0 @@ -json: - - op: add - path: /spec/containers/0/command/- - value: --bind-address={{ .Values.listenAddress }} - - op: replace - path: /spec/containers/0/livenessProbe/httpGet/host - value: {{ .Values.listenAddress }} - - op: replace - path: /spec/containers/0/startupProbe/httpGet/host - value: {{ .Values.listenAddress }} diff --git a/charts/kubeadm/templates/resources/10-runtimeClass.yaml b/charts/kubeadm/templates/resources/10-runtimeClass.yaml deleted file mode 100644 index 8ed077bf..00000000 --- a/charts/kubeadm/templates/resources/10-runtimeClass.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: node.k8s.io/v1 -kind: RuntimeClass -metadata: - name: crio -handler: crun -overhead: - podFixed: - memory: 4Mi diff --git a/charts/kubeadm/templates/resources/20-oicd-public-rbac.yaml b/charts/kubeadm/templates/resources/20-oicd-public-rbac.yaml deleted file mode 100644 index abaf9a6f..00000000 --- a/charts/kubeadm/templates/resources/20-oicd-public-rbac.yaml +++ /dev/null @@ -1,13 +0,0 @@ -{{- if .Values.api.serviceAccountIssuer }} -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: oidc-public -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: system:service-account-issuer-discovery -subjects: - - kind: Group - name: system:unauthenticated -{{- end }} diff --git a/charts/kubeadm/templates/resources/50-aws-iam-authenticator-crds.yaml b/charts/kubeadm/templates/resources/50-aws-iam-authenticator-crds.yaml deleted file mode 100644 index be771953..00000000 --- a/charts/kubeadm/templates/resources/50-aws-iam-authenticator-crds.yaml +++ /dev/null @@ -1,46 +0,0 @@ -{{- if .Values.api.awsIamAuth.enabled }} -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - name: iamidentitymappings.iamauthenticator.k8s.aws -spec: - group: iamauthenticator.k8s.aws - scope: Cluster - names: - plural: iamidentitymappings - singular: iamidentitymapping - kind: IAMIdentityMapping - categories: - - all - versions: - - name: v1alpha1 - served: true - storage: true - schema: - openAPIV3Schema: - type: object - properties: - spec: - type: object - required: - - arn - - username - properties: - arn: - type: string - username: - type: string - groups: - type: array - items: - type: string - status: - type: object - properties: - canonicalARN: - type: string - userID: - type: string - subresources: - status: {} -{{- end }} diff --git a/charts/kubeadm/templates/resources/51-aws-iam-authenticator-deployment.yaml b/charts/kubeadm/templates/resources/51-aws-iam-authenticator-deployment.yaml deleted file mode 100644 index 4e865204..00000000 --- a/charts/kubeadm/templates/resources/51-aws-iam-authenticator-deployment.yaml +++ /dev/null @@ -1,153 +0,0 @@ -{{- if .Values.api.awsIamAuth.enabled }} -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: aws-iam-authenticator -rules: -- apiGroups: - - iamauthenticator.k8s.aws - resources: - - iamidentitymappings - verbs: - - get - - list - - watch -- apiGroups: - - iamauthenticator.k8s.aws - resources: - - iamidentitymappings/status - verbs: - - patch - - update -- apiGroups: - - "" - resources: - - events - verbs: - - create - - update - - patch -- apiGroups: - - "" - resources: - - configmaps - verbs: - - list - - watch -- apiGroups: - - "" - resources: - - configmaps - resourceNames: - - aws-auth - verbs: - - get - ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: aws-iam-authenticator - namespace: kube-system - ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: aws-iam-authenticator - namespace: kube-system -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: aws-iam-authenticator -subjects: -- kind: ServiceAccount - name: aws-iam-authenticator - namespace: kube-system - ---- -apiVersion: v1 -kind: ConfigMap -metadata: - namespace: kube-system - name: aws-iam-authenticator - labels: - k8s-app: aws-iam-authenticator -data: - config.yaml: | - clusterID: {{ .Values.global.clusterName }} - ---- -apiVersion: apps/v1 -kind: DaemonSet -metadata: - namespace: kube-system - name: aws-iam-authenticator - labels: - k8s-app: aws-iam-authenticator - annotations: - seccomp.security.alpha.kubernetes.io/pod: runtime/default -spec: - selector: - matchLabels: - k8s-app: aws-iam-authenticator - updateStrategy: - type: RollingUpdate - template: - metadata: - labels: - k8s-app: aws-iam-authenticator - spec: - priorityClassName: system-cluster-critical - - # use service account with access to - serviceAccountName: aws-iam-authenticator - - # run on the host network (don't depend on CNI) - hostNetwork: true - - # run on each controller - nodeSelector: - node-role.kubernetes.io/control-plane: "" - tolerations: - - effect: NoSchedule - key: node-role.kubernetes.io/control-plane - - containers: - - name: aws-iam-authenticator - image: public.ecr.aws/zero-downtime/aws-iam-authenticator:v0.6.10 - args: - - server - - --backend-mode=CRD,MountedFile - - --config=/etc/aws-iam-authenticator/config.yaml - - --state-dir=/var/aws-iam-authenticator - - --kubeconfig-pregenerated=true - - securityContext: - allowPrivilegeEscalation: false - capabilities: - drop: - - ALL - - resources: - requests: - memory: 32Mi - cpu: 10m - limits: - memory: 64Mi - #cpu: 100m - - volumeMounts: - - name: config - mountPath: /etc/aws-iam-authenticator/ - - name: state - mountPath: /var/aws-iam-authenticator/ - - volumes: - - name: config - configMap: - name: aws-iam-authenticator - - name: state - secret: - secretName: aws-iam-certs -{{- end }} diff --git a/charts/kubeadm/templates/resources/52-aws-iam-authenticator-mappings.yaml b/charts/kubeadm/templates/resources/52-aws-iam-authenticator-mappings.yaml deleted file mode 100644 index 31ef6e35..00000000 --- a/charts/kubeadm/templates/resources/52-aws-iam-authenticator-mappings.yaml +++ /dev/null @@ -1,23 +0,0 @@ -{{- if .Values.api.awsIamAuth.enabled }} -apiVersion: iamauthenticator.k8s.aws/v1alpha1 -kind: IAMIdentityMapping -metadata: - name: kubezero-worker-nodes -spec: - arn: {{ .Values.api.awsIamAuth.workerNodeRole }} - username: system:node:{{ "{{" }}EC2PrivateDNSName{{ "}}" }} - groups: - - system:bootstrappers:kubeadm:default-node-token ---- - -# Admin Role for remote access -apiVersion: iamauthenticator.k8s.aws/v1alpha1 -kind: IAMIdentityMapping -metadata: - name: kubernetes-admin -spec: - arn: {{ .Values.api.awsIamAuth.kubeAdminRole }} - username: kubernetes-admin - groups: - - system:masters -{{- end }} diff --git a/charts/kubeadm/templates/resources/80-apiserver-dns-service.yaml b/charts/kubeadm/templates/resources/80-apiserver-dns-service.yaml deleted file mode 100644 index 7947e0ce..00000000 --- a/charts/kubeadm/templates/resources/80-apiserver-dns-service.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - annotations: - external-dns.alpha.kubernetes.io/hostname: {{ regexSplit ":" .Values.api.endpoint -1 | first }} - external-dns.alpha.kubernetes.io/ttl: "60" - name: kubezero-api - namespace: kube-system -spec: - type: ClusterIP - clusterIP: None - selector: - component: kube-apiserver - tier: control-plane diff --git a/charts/kubeadm/values.yaml b/charts/kubeadm/values.yaml deleted file mode 100644 index 86955934..00000000 --- a/charts/kubeadm/values.yaml +++ /dev/null @@ -1,38 +0,0 @@ -global: - clusterName: pleasechangeme - highAvailable: false - -# -- set to $HOSTNAME -nodeName: kubezero-node -domain: changeme.org - -# -- Needs to be set to primary node IP -listenAddress: 0.0.0.0 - -api: - endpoint: kube-api.changeme.org:6443 - listenPort: 6443 - etcdServers: "https://etcd:2379" - extraArgs: {} - # -- https://s3.${REGION}.amazonaws.com/${CFN[ConfigBucket]}/k8s/$CLUSTERNAME - serviceAccountIssuer: "" - # -- s3://${CFN[ConfigBucket]}/k8s/$CLUSTERNAME - oidcEndpoint: "" - apiAudiences: "istio-ca" - - awsIamAuth: - enabled: false - workerNodeRole: "arn:aws:iam::000000000000:role/KubernetesNode" - kubeAdminRole: "arn:aws:iam::000000000000:role/KubernetesNode" - - falco: - enabled: false - -etcd: - nodeName: etcd - state: new - extraArgs: {} - -# -- Set to false for openrc, eg. on Gentoo or Alpine -systemd: false -protectKernelDefaults: false diff --git a/charts/kubezero-addons/Chart.yaml b/charts/kubezero-addons/Chart.yaml deleted file mode 100644 index 488bffb3..00000000 --- a/charts/kubezero-addons/Chart.yaml +++ /dev/null @@ -1,53 +0,0 @@ -apiVersion: v2 -name: kubezero-addons -description: KubeZero umbrella chart for various optional cluster addons -type: application -version: 0.8.0 -appVersion: v1.26 -home: https://kubezero.com -icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png -keywords: - - kubezero - - fuse-device-plugin - - neuron-device-plugin - - nvidia-device-plugin - - cluster-autoscaler - - sealed-secrets - - external-dns - - aws-node-termination-handler - - falco -maintainers: - - name: Stefan Reimer - email: stefan@zero-downtime.net -dependencies: - - name: external-dns - version: 1.12.2 - repository: https://kubernetes-sigs.github.io/external-dns/ - condition: external-dns.enabled - - name: cluster-autoscaler - version: 9.28.0 - repository: https://kubernetes.github.io/autoscaler - condition: cluster-autoscaler.enabled - - name: nvidia-device-plugin - version: 0.14.0 - # https://github.com/NVIDIA/k8s-device-plugin - repository: https://nvidia.github.io/k8s-device-plugin - condition: nvidia-device-plugin.enabled - - name: sealed-secrets - version: 2.8.1 - repository: https://bitnami-labs.github.io/sealed-secrets - condition: sealed-secrets.enabled - - name: aws-node-termination-handler - version: 0.21.0 - # repository: https://aws.github.io/eks-charts - condition: aws-node-termination-handler.enabled - - name: aws-eks-asg-rolling-update-handler - version: 1.3.0 - # repository: https://twin.github.io/helm-charts - condition: aws-eks-asg-rolling-update-handler.enabled - - name: falco - version: 3.3.0 - repository: https://falcosecurity.github.io/charts - condition: falco-control-plane.enabled - alias: falco-control-plane -kubeVersion: ">= 1.26.0" diff --git a/charts/kubezero-addons/README.md b/charts/kubezero-addons/README.md deleted file mode 100644 index dfb573de..00000000 --- a/charts/kubezero-addons/README.md +++ /dev/null @@ -1,166 +0,0 @@ -# kubezero-addons - -![Version: 0.7.5](https://img.shields.io/badge/Version-0.7.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.25](https://img.shields.io/badge/AppVersion-v1.25-informational?style=flat-square) - -KubeZero umbrella chart for various optional cluster addons - -**Homepage:** - -## Maintainers - -| Name | Email | Url | -| ---- | ------ | --- | -| Stefan Reimer | | | - -## Requirements - -Kubernetes: `>= 1.25.0` - -| Repository | Name | Version | -|------------|------|---------| -| | aws-eks-asg-rolling-update-handler | 1.3.0 | -| | aws-node-termination-handler | 0.21.0 | -| https://bitnami-labs.github.io/sealed-secrets | sealed-secrets | 2.8.1 | -| https://kubernetes-sigs.github.io/external-dns/ | external-dns | 1.12.2 | -| https://kubernetes.github.io/autoscaler | cluster-autoscaler | 9.28.0 | -| https://nvidia.github.io/k8s-device-plugin | nvidia-device-plugin | 0.14.0 | - -# MetalLB - -# device-plugins - -## AWS Neuron -Device plugin for [AWS Neuron](https://aws.amazon.com/machine-learning/neuron/) - [Inf1 instances](https://aws.amazon.com/ec2/instance-types/inf1/) - -## Nvidia - -## Cluster AutoScaler -- https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/cloudprovider/aws/README.md - -## Values - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| aws-eks-asg-rolling-update-handler.enabled | bool | `false` | | -| aws-eks-asg-rolling-update-handler.environmentVars[0].name | string | `"CLUSTER_NAME"` | | -| aws-eks-asg-rolling-update-handler.environmentVars[0].value | string | `""` | | -| aws-eks-asg-rolling-update-handler.environmentVars[1].name | string | `"AWS_REGION"` | | -| aws-eks-asg-rolling-update-handler.environmentVars[1].value | string | `"us-west-2"` | | -| aws-eks-asg-rolling-update-handler.environmentVars[2].name | string | `"EXECUTION_INTERVAL"` | | -| aws-eks-asg-rolling-update-handler.environmentVars[2].value | string | `"60"` | | -| aws-eks-asg-rolling-update-handler.environmentVars[3].name | string | `"METRICS"` | | -| aws-eks-asg-rolling-update-handler.environmentVars[3].value | string | `"true"` | | -| aws-eks-asg-rolling-update-handler.environmentVars[4].name | string | `"EAGER_CORDONING"` | | -| aws-eks-asg-rolling-update-handler.environmentVars[4].value | string | `"true"` | | -| aws-eks-asg-rolling-update-handler.environmentVars[5].name | string | `"SLOW_MODE"` | | -| aws-eks-asg-rolling-update-handler.environmentVars[5].value | string | `"true"` | | -| aws-eks-asg-rolling-update-handler.environmentVars[6].name | string | `"AWS_ROLE_ARN"` | | -| aws-eks-asg-rolling-update-handler.environmentVars[6].value | string | `""` | | -| aws-eks-asg-rolling-update-handler.environmentVars[7].name | string | `"AWS_WEB_IDENTITY_TOKEN_FILE"` | | -| aws-eks-asg-rolling-update-handler.environmentVars[7].value | string | `"/var/run/secrets/sts.amazonaws.com/serviceaccount/token"` | | -| aws-eks-asg-rolling-update-handler.environmentVars[8].name | string | `"AWS_STS_REGIONAL_ENDPOINTS"` | | -| aws-eks-asg-rolling-update-handler.environmentVars[8].value | string | `"regional"` | | -| aws-eks-asg-rolling-update-handler.image.tag | string | `"v1.7.0"` | | -| aws-eks-asg-rolling-update-handler.nodeSelector."node-role.kubernetes.io/control-plane" | string | `""` | | -| aws-eks-asg-rolling-update-handler.resources.limits.memory | string | `"128Mi"` | | -| aws-eks-asg-rolling-update-handler.resources.requests.cpu | string | `"10m"` | | -| aws-eks-asg-rolling-update-handler.resources.requests.memory | string | `"32Mi"` | | -| aws-eks-asg-rolling-update-handler.tolerations[0].effect | string | `"NoSchedule"` | | -| aws-eks-asg-rolling-update-handler.tolerations[0].key | string | `"node-role.kubernetes.io/control-plane"` | | -| aws-node-termination-handler.deleteLocalData | bool | `true` | | -| aws-node-termination-handler.emitKubernetesEvents | bool | `true` | | -| aws-node-termination-handler.enableProbesServer | bool | `true` | | -| aws-node-termination-handler.enablePrometheusServer | bool | `false` | | -| aws-node-termination-handler.enableSpotInterruptionDraining | bool | `false` | | -| aws-node-termination-handler.enableSqsTerminationDraining | bool | `true` | | -| aws-node-termination-handler.enabled | bool | `false` | | -| aws-node-termination-handler.extraEnv[0] | object | `{"name":"AWS_ROLE_ARN","value":""}` | "arn:aws:iam::${AWS::AccountId}:role/${AWS::Region}.${ClusterName}.awsNth" | -| aws-node-termination-handler.extraEnv[1].name | string | `"AWS_WEB_IDENTITY_TOKEN_FILE"` | | -| aws-node-termination-handler.extraEnv[1].value | string | `"/var/run/secrets/sts.amazonaws.com/serviceaccount/token"` | | -| aws-node-termination-handler.extraEnv[2].name | string | `"AWS_STS_REGIONAL_ENDPOINTS"` | | -| aws-node-termination-handler.extraEnv[2].value | string | `"regional"` | | -| aws-node-termination-handler.fullnameOverride | string | `"aws-node-termination-handler"` | | -| aws-node-termination-handler.ignoreDaemonSets | bool | `true` | | -| aws-node-termination-handler.jsonLogging | bool | `true` | | -| aws-node-termination-handler.logFormatVersion | int | `2` | | -| aws-node-termination-handler.managedTag | string | `"aws-node-termination-handler/managed"` | "aws-node-termination-handler/${ClusterName}" | -| aws-node-termination-handler.metadataTries | int | `0` | | -| aws-node-termination-handler.nodeSelector."node-role.kubernetes.io/control-plane" | string | `""` | | -| aws-node-termination-handler.podMonitor.create | bool | `false` | | -| aws-node-termination-handler.queueURL | string | `""` | https://sqs.${AWS::Region}.amazonaws.com/${AWS::AccountId}/${ClusterName}_Nth | -| aws-node-termination-handler.rbac.pspEnabled | bool | `false` | | -| aws-node-termination-handler.taintNode | bool | `true` | | -| aws-node-termination-handler.tolerations[0].effect | string | `"NoSchedule"` | | -| aws-node-termination-handler.tolerations[0].key | string | `"node-role.kubernetes.io/control-plane"` | | -| aws-node-termination-handler.useProviderId | bool | `true` | | -| awsNeuron.enabled | bool | `false` | | -| awsNeuron.image.name | string | `"public.ecr.aws/neuron/neuron-device-plugin"` | | -| awsNeuron.image.tag | string | `"1.9.3.0"` | | -| cluster-autoscaler.autoDiscovery.clusterName | string | `""` | | -| cluster-autoscaler.awsRegion | string | `"us-west-2"` | | -| cluster-autoscaler.enabled | bool | `false` | | -| cluster-autoscaler.extraArgs.balance-similar-node-groups | bool | `true` | | -| cluster-autoscaler.extraArgs.ignore-taint | string | `"node.cilium.io/agent-not-ready"` | | -| cluster-autoscaler.extraArgs.scan-interval | string | `"30s"` | | -| cluster-autoscaler.extraArgs.skip-nodes-with-local-storage | bool | `false` | | -| cluster-autoscaler.image.tag | string | `"v1.25.1"` | | -| cluster-autoscaler.nodeSelector."node-role.kubernetes.io/control-plane" | string | `""` | | -| cluster-autoscaler.podDisruptionBudget | bool | `false` | | -| cluster-autoscaler.prometheusRule.enabled | bool | `false` | | -| cluster-autoscaler.prometheusRule.interval | string | `"30"` | | -| cluster-autoscaler.serviceMonitor.enabled | bool | `false` | | -| cluster-autoscaler.serviceMonitor.interval | string | `"30s"` | | -| cluster-autoscaler.tolerations[0].effect | string | `"NoSchedule"` | | -| cluster-autoscaler.tolerations[0].key | string | `"node-role.kubernetes.io/control-plane"` | | -| clusterBackup.enabled | bool | `false` | | -| clusterBackup.extraEnv | list | `[]` | | -| clusterBackup.image.name | string | `"public.ecr.aws/zero-downtime/kubezero-admin"` | | -| clusterBackup.password | string | `""` | /etc/cloudbender/clusterBackup.passphrase | -| clusterBackup.repository | string | `""` | s3:https://s3.amazonaws.com/${CFN[ConfigBucket]}/k8s/${CLUSTERNAME}/clusterBackup | -| external-dns.enabled | bool | `false` | | -| external-dns.interval | string | `"3m"` | | -| external-dns.nodeSelector."node-role.kubernetes.io/control-plane" | string | `""` | | -| external-dns.provider | string | `"inmemory"` | | -| external-dns.sources[0] | string | `"service"` | | -| external-dns.tolerations[0].effect | string | `"NoSchedule"` | | -| external-dns.tolerations[0].key | string | `"node-role.kubernetes.io/control-plane"` | | -| external-dns.triggerLoopOnEvent | bool | `true` | | -| forseti.aws.iamRoleArn | string | `""` | "arn:aws:iam::${AWS::AccountId}:role/${AWS::Region}.${ClusterName}.kubezeroForseti" | -| forseti.aws.region | string | `""` | | -| forseti.enabled | bool | `false` | | -| forseti.image.name | string | `"public.ecr.aws/zero-downtime/forseti"` | | -| forseti.image.tag | string | `"v0.1.2"` | | -| fuseDevicePlugin.enabled | bool | `false` | | -| nvidia-device-plugin.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].key | string | `"node.kubernetes.io/instance-type"` | | -| nvidia-device-plugin.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].operator | string | `"In"` | | -| nvidia-device-plugin.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].values[0] | string | `"g5.xlarge"` | | -| nvidia-device-plugin.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].values[10] | string | `"g4dn.4xlarge"` | | -| nvidia-device-plugin.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].values[11] | string | `"g4dn.8xlarge"` | | -| nvidia-device-plugin.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].values[12] | string | `"g4dn.12xlarge"` | | -| nvidia-device-plugin.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].values[13] | string | `"g4dn.16xlarge"` | | -| nvidia-device-plugin.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].values[1] | string | `"g5.2xlarge"` | | -| nvidia-device-plugin.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].values[2] | string | `"g5.4xlarge"` | | -| nvidia-device-plugin.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].values[3] | string | `"g5.8xlarge"` | | -| nvidia-device-plugin.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].values[4] | string | `"g5.12xlarge"` | | -| nvidia-device-plugin.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].values[5] | string | `"g5.16xlarge"` | | -| nvidia-device-plugin.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].values[6] | string | `"g5.24xlarge"` | | -| nvidia-device-plugin.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].values[7] | string | `"g5.48xlarge"` | | -| nvidia-device-plugin.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].values[8] | string | `"g4dn.xlarge"` | | -| nvidia-device-plugin.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].values[9] | string | `"g4dn.2xlarge"` | | -| nvidia-device-plugin.enabled | bool | `false` | | -| nvidia-device-plugin.tolerations[0].effect | string | `"NoSchedule"` | | -| nvidia-device-plugin.tolerations[0].key | string | `"nvidia.com/gpu"` | | -| nvidia-device-plugin.tolerations[0].operator | string | `"Exists"` | | -| nvidia-device-plugin.tolerations[1].effect | string | `"NoSchedule"` | | -| nvidia-device-plugin.tolerations[1].key | string | `"kubezero-workergroup"` | | -| nvidia-device-plugin.tolerations[1].operator | string | `"Exists"` | | -| sealed-secrets.enabled | bool | `false` | | -| sealed-secrets.fullnameOverride | string | `"sealed-secrets-controller"` | | -| sealed-secrets.keyrenewperiod | string | `"0"` | | -| sealed-secrets.metrics.serviceMonitor.enabled | bool | `false` | | -| sealed-secrets.nodeSelector."node-role.kubernetes.io/control-plane" | string | `""` | | -| sealed-secrets.resources.limits.memory | string | `"128Mi"` | | -| sealed-secrets.resources.requests.cpu | string | `"10m"` | | -| sealed-secrets.resources.requests.memory | string | `"24Mi"` | | -| sealed-secrets.tolerations[0].effect | string | `"NoSchedule"` | | -| sealed-secrets.tolerations[0].key | string | `"node-role.kubernetes.io/control-plane"` | | diff --git a/charts/kubezero-addons/README.md.gotmpl b/charts/kubezero-addons/README.md.gotmpl deleted file mode 100644 index 2eed5f44..00000000 --- a/charts/kubezero-addons/README.md.gotmpl +++ /dev/null @@ -1,28 +0,0 @@ -{{ template "chart.header" . }} -{{ template "chart.deprecationWarning" . }} - -{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }} - -{{ template "chart.description" . }} - -{{ template "chart.homepageLine" . }} - -{{ template "chart.maintainersSection" . }} - -{{ template "chart.sourcesSection" . }} - -{{ template "chart.requirementsSection" . }} - -# MetalLB - -# device-plugins - -## AWS Neuron -Device plugin for [AWS Neuron](https://aws.amazon.com/machine-learning/neuron/) - [Inf1 instances](https://aws.amazon.com/ec2/instance-types/inf1/) - -## Nvidia - -## Cluster AutoScaler -- https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/cloudprovider/aws/README.md - -{{ template "chart.valuesSection" . }} diff --git a/charts/kubezero-addons/charts/aws-eks-asg-rolling-update-handler/Chart.yaml b/charts/kubezero-addons/charts/aws-eks-asg-rolling-update-handler/Chart.yaml deleted file mode 100644 index e377626e..00000000 --- a/charts/kubezero-addons/charts/aws-eks-asg-rolling-update-handler/Chart.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v2 -description: Handles rolling upgrades for AWS ASGs for EKS by replacing outdated nodes - by new nodes. -home: https://github.com/TwiN/aws-eks-asg-rolling-update-handler -maintainers: -- name: TwiN -name: aws-eks-asg-rolling-update-handler -version: 1.3.0 diff --git a/charts/kubezero-addons/charts/aws-eks-asg-rolling-update-handler/README.md b/charts/kubezero-addons/charts/aws-eks-asg-rolling-update-handler/README.md deleted file mode 100644 index 23bb5e37..00000000 --- a/charts/kubezero-addons/charts/aws-eks-asg-rolling-update-handler/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# aws-eks-asg-rolling-update-handler - -## Configuration -The following table lists the configurable parameters of the aws-eks-asg-rolling-update-handler chart and their default values. -| Parameters | Description | Required | Default | -|:-----------|:------------|:---------|:------------| -| environmentVars | environment variables for aws-eks-asg-rolling-update-handler container, available variables are listed [here](https://github.com/TwiN/aws-eks-asg-rolling-update-handler/blob/master/README.md#usage) | yes |`[{"name":"CLUSTER_NAME","value":"cluster-name"}]`| -| replicaCount | Number of aws-eks-asg-rolling-update-handler replicas | yes |`1` | -| image.repository | Image repository | yes | `twinproduction/aws-eks-asg-rolling-update-handler` | -| image.tag | image tag | yes | `v1.4.3` | -| image.pullPolicy | Image pull policy | yes | `IfNotPresent` | -| resources | CPU/memory resource requests/limits | no | `{}` | -| podAnnotations | Annotations to add to the aws-eks-asg-rolling-update-handler pod configuration | no | `{}` | diff --git a/charts/kubezero-addons/charts/aws-eks-asg-rolling-update-handler/templates/_helpers.tpl b/charts/kubezero-addons/charts/aws-eks-asg-rolling-update-handler/templates/_helpers.tpl deleted file mode 100644 index 404193de..00000000 --- a/charts/kubezero-addons/charts/aws-eks-asg-rolling-update-handler/templates/_helpers.tpl +++ /dev/null @@ -1,31 +0,0 @@ -{{/* -Create a default app name. -*/}} -{{- define "aws-eks-asg-rolling-update-handler.name" -}} -{{- .Chart.Name -}} -{{- end -}} - -{{/* -Create a default namespace. -*/}} -{{- define "aws-eks-asg-rolling-update-handler.namespace" -}} -{{- .Release.Namespace -}} -{{- end -}} - -{{/* -Common labels -*/}} -{{- define "aws-eks-asg-rolling-update-handler.labels" -}} -app.kubernetes.io/name: {{ include "aws-eks-asg-rolling-update-handler.name" . }} -{{- end -}} - -{{/* -Create the name of the service account to use. -*/}} -{{- define "aws-eks-asg-rolling-update-handler.serviceAccountName" -}} -{{- if .Values.serviceAccount.create -}} - {{ default (include "aws-eks-asg-rolling-update-handler.name" .) .Values.serviceAccount.name }} -{{- else -}} - {{ default "default" .Values.serviceAccount.name }} -{{- end -}} -{{- end -}} \ No newline at end of file diff --git a/charts/kubezero-addons/charts/aws-eks-asg-rolling-update-handler/templates/cluster-role-binding.yaml b/charts/kubezero-addons/charts/aws-eks-asg-rolling-update-handler/templates/cluster-role-binding.yaml deleted file mode 100644 index e6c8bbdd..00000000 --- a/charts/kubezero-addons/charts/aws-eks-asg-rolling-update-handler/templates/cluster-role-binding.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: {{ template "aws-eks-asg-rolling-update-handler.name" . }} - labels: -{{ include "aws-eks-asg-rolling-update-handler.labels" . | indent 4 }} -roleRef: - kind: ClusterRole - name: {{ template "aws-eks-asg-rolling-update-handler.name" . }} - apiGroup: rbac.authorization.k8s.io -subjects: - - kind: ServiceAccount - name: {{ template "aws-eks-asg-rolling-update-handler.serviceAccountName" . }} - namespace: {{ template "aws-eks-asg-rolling-update-handler.namespace" . }} \ No newline at end of file diff --git a/charts/kubezero-addons/charts/aws-eks-asg-rolling-update-handler/templates/cluster-role.yaml b/charts/kubezero-addons/charts/aws-eks-asg-rolling-update-handler/templates/cluster-role.yaml deleted file mode 100644 index 33b82157..00000000 --- a/charts/kubezero-addons/charts/aws-eks-asg-rolling-update-handler/templates/cluster-role.yaml +++ /dev/null @@ -1,41 +0,0 @@ ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: {{ template "aws-eks-asg-rolling-update-handler.name" . }} - labels: -{{ include "aws-eks-asg-rolling-update-handler.labels" . | indent 4 }} -rules: - - apiGroups: - - "*" - resources: - - "*" - verbs: - - get - - list - - watch - - apiGroups: - - "*" - resources: - - nodes - verbs: - - get - - list - - watch - - update - - patch - - apiGroups: - - "*" - resources: - - pods/eviction - verbs: - - get - - list - - create - - apiGroups: - - "*" - resources: - - pods - verbs: - - get - - list \ No newline at end of file diff --git a/charts/kubezero-addons/charts/aws-eks-asg-rolling-update-handler/templates/deployment.yaml b/charts/kubezero-addons/charts/aws-eks-asg-rolling-update-handler/templates/deployment.yaml deleted file mode 100644 index 30343ec0..00000000 --- a/charts/kubezero-addons/charts/aws-eks-asg-rolling-update-handler/templates/deployment.yaml +++ /dev/null @@ -1,60 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "aws-eks-asg-rolling-update-handler.name" . }} - namespace: {{ template "aws-eks-asg-rolling-update-handler.namespace" . }} - labels: -{{ include "aws-eks-asg-rolling-update-handler.labels" . | indent 4 }} -spec: - replicas: {{ .Values.replicaCount }} - selector: - matchLabels: -{{ include "aws-eks-asg-rolling-update-handler.labels" . | indent 6 }} - template: - metadata: - labels: -{{ include "aws-eks-asg-rolling-update-handler.labels" . | indent 8 }} - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - automountServiceAccountToken: true - serviceAccountName: {{ template "aws-eks-asg-rolling-update-handler.serviceAccountName" . }} - restartPolicy: Always - dnsPolicy: Default - containers: - - name: {{ template "aws-eks-asg-rolling-update-handler.name" . }} - image: {{ .Values.image.repository }}:{{ .Values.image.tag }} - imagePullPolicy: {{ .Values.image.pullPolicy }} - env: -{{- toYaml .Values.environmentVars | nindent 12 }} -{{- with .Values.resources }} - resources: -{{- toYaml . | nindent 12 }} -{{- end }} - volumeMounts: - - name: aws-token - mountPath: "/var/run/secrets/sts.amazonaws.com/serviceaccount/" - readOnly: true - volumes: - - name: aws-token - projected: - sources: - - serviceAccountToken: - path: token - expirationSeconds: 86400 - audience: "sts.amazonaws.com" - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} diff --git a/charts/kubezero-addons/charts/aws-eks-asg-rolling-update-handler/templates/service-account.yaml b/charts/kubezero-addons/charts/aws-eks-asg-rolling-update-handler/templates/service-account.yaml deleted file mode 100644 index 958b1db0..00000000 --- a/charts/kubezero-addons/charts/aws-eks-asg-rolling-update-handler/templates/service-account.yaml +++ /dev/null @@ -1,13 +0,0 @@ -{{ if .Values.serviceAccount.create }} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ template "aws-eks-asg-rolling-update-handler.serviceAccountName" . }} - namespace: {{ template "aws-eks-asg-rolling-update-handler.namespace" . }} - labels: -{{ include "aws-eks-asg-rolling-update-handler.labels" . | indent 4 }} - {{- with .Values.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{ end }} \ No newline at end of file diff --git a/charts/kubezero-addons/charts/aws-eks-asg-rolling-update-handler/values.yaml b/charts/kubezero-addons/charts/aws-eks-asg-rolling-update-handler/values.yaml deleted file mode 100644 index 1c93f45f..00000000 --- a/charts/kubezero-addons/charts/aws-eks-asg-rolling-update-handler/values.yaml +++ /dev/null @@ -1,39 +0,0 @@ -replicaCount: 1 - -image: - repository: twinproduction/aws-eks-asg-rolling-update-handler - tag: v1.7.0 - pullPolicy: IfNotPresent - -#imagePullSecrets: -#- imagePullSecret - -environmentVars: -- name: CLUSTER_NAME - value: "cluster-name" # REPLACE THIS WITH THE NAME OF YOUR EKS CLUSTER -#- name: AUTO_SCALING_GROUP_NAMES -# value: "asg-1,asg-2,asg-3" # REPLACE THESE VALUES FOR THE NAMES OF THE ASGs, if CLUSTER_NAME is provided, this is ignored -#- name: IGNORE_DAEMON_SETS -# value: "true" -#- name: DELETE_LOCAL_DATA -# value: "true" -#- name: AWS_REGION -# value: us-west-2 -#- name: ENVIRONMENT -# value: "" - -resources: {} - # limits: - # cpu: 0.3 - # memory: 100Mi - # requests: - # cpu: 0.1 - # memory: 50Mi -podAnnotations: {} - # prometheus.io/port: "8080" - # prometheus.io/scrape: "true" - -serviceAccount: - create: true - #name: aws-eks-asg-rolling-update-handler - annotations: {} diff --git a/charts/kubezero-addons/charts/aws-node-termination-handler/.helmignore b/charts/kubezero-addons/charts/aws-node-termination-handler/.helmignore deleted file mode 100644 index 69a52314..00000000 --- a/charts/kubezero-addons/charts/aws-node-termination-handler/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ -example-values*.yaml diff --git a/charts/kubezero-addons/charts/aws-node-termination-handler/Chart.yaml b/charts/kubezero-addons/charts/aws-node-termination-handler/Chart.yaml deleted file mode 100644 index 32d2ee98..00000000 --- a/charts/kubezero-addons/charts/aws-node-termination-handler/Chart.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: v2 -appVersion: 1.19.0 -description: A Helm chart for the AWS Node Termination Handler. -home: https://github.com/aws/eks-charts -icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png -keywords: -- aws -- eks -- ec2 -- node-termination -- spot -kubeVersion: '>= 1.16-0' -maintainers: -- email: bwagner5@users.noreply.github.com - name: Brandon Wagner - url: https://github.com/bwagner5 -- email: jillmon@users.noreply.github.com - name: Jillian Kuentz - url: https://github.com/jillmon -name: aws-node-termination-handler -sources: -- https://github.com/aws/aws-node-termination-handler/ -- https://github.com/aws/eks-charts/ -type: application -version: 0.21.0 diff --git a/charts/kubezero-addons/charts/aws-node-termination-handler/README.md b/charts/kubezero-addons/charts/aws-node-termination-handler/README.md deleted file mode 100644 index 2fe7d391..00000000 --- a/charts/kubezero-addons/charts/aws-node-termination-handler/README.md +++ /dev/null @@ -1,176 +0,0 @@ -# AWS Node Termination Handler - -AWS Node Termination Handler Helm chart for Kubernetes. For more information on this project see the project repo at [github.com/aws/aws-node-termination-handler](https://github.com/aws/aws-node-termination-handler). - -## Prerequisites - -- _Kubernetes_ >= v1.16 - -## Installing the Chart - -Before you can install the chart you will need to add the `aws` repo to [Helm](https://helm.sh/). - -```shell -helm repo add eks https://aws.github.io/eks-charts/ -``` - -After you've installed the repo you can install the chart, the following command will install the chart with the release name `aws-node-termination-handler` and the default configuration to the `kube-system` namespace. - -```shell -helm upgrade --install --namespace kube-system aws-node-termination-handler eks/aws-node-termination-handler -``` - -To install the chart on an EKS cluster where the AWS Node Termination Handler is already installed, you can run the following command. - -```shell -helm upgrade --install --namespace kube-system aws-node-termination-handler eks/aws-node-termination-handler --recreate-pods --force -``` - -If you receive an error similar to the one below simply rerun the above command. - -> Error: release aws-node-termination-handler failed: "aws-node-termination-handler" already exists - -To uninstall the `aws-node-termination-handler` chart installation from the `kube-system` namespace run the following command. - -```shell -helm delete --namespace kube-system aws-node-termination-handler -``` - -## Configuration - -The following tables lists the configurable parameters of the chart and their default values. These values are split up into the [common configuration](#common-configuration) shared by all AWS Node Termination Handler modes, [queue configuration](#queue-processor-mode-configuration) used when AWS Node Termination Handler is in in queue-processor mode, and [IMDS configuration](#imds-mode-configuration) used when AWS Node Termination Handler is in IMDS mode; for more information about the different modes see the project [README](https://github.com/aws/aws-node-termination-handler/blob/main/README.md). - -### Common Configuration - -The configuration in this table applies to all AWS Node Termination Handler modes. - -| Parameter | Description | Default | -| ---------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------- | -| `image.repository` | Image repository. | `public.ecr.aws/aws-ec2/aws-node-termination-handler` | -| `image.tag` | Image tag. | `v{{ .Chart.AppVersion}}` | -| `image.pullPolicy` | Image pull policy. | `IfNotPresent` | -| `image.pullSecrets` | Image pull secrets. | `[]` | -| `nameOverride` | Override the `name` of the chart. | `""` | -| `fullnameOverride` | Override the `fullname` of the chart. | `""` | -| `serviceAccount.create` | If `true`, create a new service account. | `true` | -| `serviceAccount.name` | Service account to be used. If not set and `serviceAccount.create` is `true`, a name is generated using the full name template. | `nil` | -| `serviceAccount.annotations` | Annotations to add to the service account. | `{}` | -| `rbac.create` | If `true`, create the RBAC resources. | `true` | -| `rbac.pspEnabled` | If `true`, create a pod security policy resource. Note: `PodSecurityPolicy`s will not be created when Kubernetes version is 1.25 or later. | `true` | -| `customLabels` | Labels to add to all resource metadata. | `{}` | -| `podLabels` | Labels to add to the pod. | `{}` | -| `podAnnotations` | Annotations to add to the pod. | `{}` | -| `podSecurityContext` | Security context for the pod. | _See values.yaml_ | -| `securityContext` | Security context for the _aws-node-termination-handler_ container. | _See values.yaml_ | -| `terminationGracePeriodSeconds` | The termination grace period for the pod. | `nil` | -| `resources` | Resource requests and limits for the _aws-node-termination-handler_ container. | `{}` | -| `nodeSelector` | Expressions to select a node by it's labels for pod assignment. In IMDS mode this has a higher priority than `daemonsetNodeSelector` (for backwards compatibility) but shouldn't be used. | `{}` | -| `affinity` | Affinity settings for pod assignment. In IMDS mode this has a higher priority than `daemonsetAffinity` (for backwards compatibility) but shouldn't be used. | `{}` | -| `tolerations` | Tolerations for pod assignment. In IMDS mode this has a higher priority than `daemonsetTolerations` (for backwards compatibility) but shouldn't be used. | `[]` | -| `extraEnv` | Additional environment variables for the _aws-node-termination-handler_ container. | `[]` | -| `probes` | The Kubernetes liveness probe configuration. | _See values.yaml_ | -| `logLevel` | Sets the log level (`info`,`debug`, or `error`) | `info` | -| `logFormatVersion` | Sets the log format version. Available versions: 1, 2. Version 1 refers to the format that has been used through v1.17.3. Version 2 offers more detail for the "event kind" and "reason", especially when operating in Queue Processor mode. | `1` | -| `jsonLogging` | If `true`, use JSON-formatted logs instead of human readable logs. | `false` | -| `enablePrometheusServer` | If `true`, start an http server exposing `/metrics` endpoint for _Prometheus_. | `false` | -| `prometheusServerPort` | Replaces the default HTTP port for exposing _Prometheus_ metrics. | `9092` | -| `dryRun` | If `true`, only log if a node would be drained. | `false` | -| `cordonOnly` | If `true`, nodes will be cordoned but not drained when an interruption event occurs. | `false` | -| `taintNode` | If `true`, nodes will be tainted when an interruption event occurs. Currently used taint keys are `aws-node-termination-handler/scheduled-maintenance`, `aws-node-termination-handler/spot-itn`, `aws-node-termination-handler/asg-lifecycle-termination` and `aws-node-termination-handler/rebalance-recommendation`. | `false` | -| `excludeFromLoadBalancers` | If `true`, nodes will be marked for exclusion from load balancers before they are cordoned. This applies the `node.kubernetes.io/exclude-from-external-load-balancers` label to enable the ServiceNodeExclusion feature gate. The label will not be modified or removed for nodes that already have it. | `false` | -| `deleteLocalData` | If `true`, continue even if there are pods using local data that will be deleted when the node is drained. | `true` | -| `ignoreDaemonSets` | If `true`, skip terminating daemon set managed pods. | `true` | -| `podTerminationGracePeriod` | The time in seconds given to each pod to terminate gracefully. If negative, the default value specified in the pod will be used, which defaults to 30 seconds if not specified for the pod. | `-1` | -| `nodeTerminationGracePeriod` | Period of time in seconds given to each node to terminate gracefully. Node draining will be scheduled based on this value to optimize the amount of compute time, but still safely drain the node before an event. | `120` | -| `emitKubernetesEvents` | If `true`, Kubernetes events will be emitted when interruption events are received and when actions are taken on Kubernetes nodes. In IMDS Processor mode a default set of annotations with all the node metadata gathered from IMDS will be attached to each event. More information [here](https://github.com/aws/aws-node-termination-handler/blob/main/docs/kubernetes_events.md). | `false` | -| `completeLifecycleActionDelaySeconds` | Pause after draining the node before completing the EC2 Autoscaling lifecycle action. This may be helpful if Pods on the node have Persistent Volume Claims. | -1 | -| `kubernetesEventsExtraAnnotations` | A comma-separated list of `key=value` extra annotations to attach to all emitted Kubernetes events (e.g. `first=annotation,sample.annotation/number=two"`). | `""` | -| `webhookURL` | Posts event data to URL upon instance interruption action. | `""` | -| `webhookURLSecretName` | Pass the webhook URL as a Secret using the key `webhookurl`. | `""` | -| `webhookHeaders` | Replace the default webhook headers (e.g. `{"Content-type":"application/json"}`). | `""` | -| `webhookProxy` | Uses the specified HTTP(S) proxy for sending webhook data. | `""` | -| `webhookTemplate` | Replaces the default webhook message template (e.g. `{"text":"[NTH][Instance Interruption] EventID: {{ .EventID }} - Kind: {{ .Kind }} - Instance: {{ .InstanceID }} - Node: {{ .NodeName }} - Description: {{ .Description }} - Start Time: {{ .StartTime }}"}`). | `""` | -| `webhookTemplateConfigMapName` | Pass the webhook template file as a configmap. | "``" | -| `webhookTemplateConfigMapKey` | Name of the Configmap key storing the template file. | `""` | -| `enableSqsTerminationDraining` | If `true`, this turns on queue-processor mode which drains nodes when an SQS termination event is received. | `false` | - -### Queue-Processor Mode Configuration - -The configuration in this table applies to AWS Node Termination Handler in queue-processor mode. - -| Parameter | Description | Default | -| ---------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------- | -| `replicas` | The number of replicas in the deployment when using queue-processor mode (NOTE: increasing replicas may cause duplicate webhooks since pods are stateless). | `1` | -| `strategy` | Specify the update strategy for the deployment. | `{}` | -| `podDisruptionBudget` | Limit the disruption for controller pods, requires at least 2 controller replicas. | `{}` | -| `serviceMonitor.create` | If `true`, create a ServiceMonitor. This requires `enablePrometheusServer: true`. | `false` | -| `serviceMonitor.namespace` | Override ServiceMonitor _Helm_ release namespace. | `nil` | -| `serviceMonitor.labels` | Additional ServiceMonitor metadata labels. | `{}` | -| `serviceMonitor.interval` | _Prometheus_ scrape interval. | `30s` | -| `serviceMonitor.sampleLimit` | Number of scraped samples accepted. | `5000` | -| `priorityClassName` | Name of the PriorityClass to use for the Deployment. | `system-cluster-critical` | -| `awsRegion` | If specified, use the AWS region for AWS API calls, else NTH will try to find the region through the `AWS_REGION` environment variable, IMDS, or the specified queue URL. | `""` | -| `queueURL` | Listens for messages on the specified SQS queue URL. | `""` | -| `workers` | The maximum amount of parallel event processors to handle concurrent events. | `10` | -| `checkTagBeforeDraining` | If `true`, check that the instance is tagged with the `managedTag` before draining the node. | `true` | -| `managedTag` | The node tag to check if `checkTagBeforeDraining` is `true`. | `aws-node-termination-handler/managed` | -| `checkASGTagBeforeDraining` | [DEPRECATED](Use `checkTagBeforeDraining` instead) If `true`, check that the instance is tagged with the `managedAsgTag` before draining the node. If `false`, disables calls ASG API. | `true` | -| `managedAsgTag` | [DEPRECATED](Use `managedTag` instead) The node tag to check if `checkASGTagBeforeDraining` is `true`. -| `useProviderId` | If `true`, fetch node name through Kubernetes node spec ProviderID instead of AWS event PrivateDnsHostname. | `false` | - -### IMDS Mode Configuration - -The configuration in this table applies to AWS Node Termination Handler in IMDS mode. - -| Parameter | Description | Default | -| -------------------------------- |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------| -| `targetNodeOs` | Space separated list of node OS's to target (e.g. `"linux"`, `"windows"`, `"linux windows"`). Windows support is **EXPERIMENTAL**. | `"linux"` | -| `linuxPodLabels` | Labels to add to each Linux pod. | `{}` | -| `windowsPodLabels` | Labels to add to each Windows pod. | `{}` | -| `linuxPodAnnotations` | Annotations to add to each Linux pod. | `{}` | -| `windowsPodAnnotations` | Annotations to add to each Windows pod. | `{}` | -| `updateStrategy` | Update strategy for the all DaemonSets. | _See values.yaml_ | -| `daemonsetPriorityClassName` | Name of the PriorityClass to use for all DaemonSets. | `system-node-critical` | -| `podMonitor.create` | If `true`, create a PodMonitor. This requires `enablePrometheusServer: true`. | `false` | -| `podMonitor.namespace` | Override PodMonitor _Helm_ release namespace. | `nil` | -| `podMonitor.labels` | Additional PodMonitor metadata labels | `{}` | -| `podMonitor.interval` | _Prometheus_ scrape interval. | `30s` | -| `podMonitor.sampleLimit` | Number of scraped samples accepted. | `5000` | -| `useHostNetwork` | If `true`, enables `hostNetwork` for the Linux DaemonSet. NOTE: setting this to `false` may cause issues accessing IMDSv2 if your account is not configured with an IP hop count of 2 see [Metrics Endpoint Considerations](#metrics-endpoint-considerations) | `true` | -| `dnsPolicy` | If specified, this overrides `linuxDnsPolicy` and `windowsDnsPolicy` with a single policy. | `""` | -| `dnsConfig` | If specified, this sets the dnsConfig: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-dns-config | `{}` | -| `linuxDnsPolicy` | DNS policy for the Linux DaemonSet. | `""` | -| `windowsDnsPolicy` | DNS policy for the Windows DaemonSet. | `""` | -| `daemonsetNodeSelector` | Expressions to select a node by it's labels for DaemonSet pod assignment. For backwards compatibility the `nodeSelector` value has priority over this but shouldn't be used. | `{}` | -| `linuxNodeSelector` | Override `daemonsetNodeSelector` for the Linux DaemonSet. | `{}` | -| `windowsNodeSelector` | Override `daemonsetNodeSelector` for the Windows DaemonSet. | `{}` | -| `daemonsetAffinity` | Affinity settings for DaemonSet pod assignment. For backwards compatibility the `affinity` has priority over this but shouldn't be used. | `{}` | -| `linuxAffinity` | Override `daemonsetAffinity` for the Linux DaemonSet. | `{}` | -| `windowsAffinity` | Override `daemonsetAffinity` for the Windows DaemonSet. | `{}` | -| `daemonsetTolerations` | Tolerations for DaemonSet pod assignment. For backwards compatibility the `tolerations` has priority over this but shouldn't be used. | `[]` | -| `linuxTolerations` | Override `daemonsetTolerations` for the Linux DaemonSet. | `[]` | -| `windowsTolerations` | Override `daemonsetTolerations` for the Linux DaemonSet. | `[]` | -| `enableProbesServer` | If `true`, start an http server exposing `/healthz` endpoint for probes. | `false` | -| `metadataTries` | The number of times to try requesting metadata. | `3` | -| `enableSpotInterruptionDraining` | If `true`, drain nodes when the spot interruption termination notice is received. Only used in IMDS mode. | `true` | -| `enableScheduledEventDraining` | If `true`, drain nodes before the maintenance window starts for an EC2 instance scheduled event. Only used in IMDS mode. | `true` | -| `enableRebalanceMonitoring` | If `true`, cordon nodes when the rebalance recommendation notice is received. If you'd like to drain the node in addition to cordoning, then also set `enableRebalanceDraining`. Only used in IMDS mode. | `false` | -| `enableRebalanceDraining` | If `true`, drain nodes when the rebalance recommendation notice is received. Only used in IMDS mode. | `false` | - -### Testing Configuration - -The configuration in this table applies to AWS Node Termination Handler testing and is **NOT RECOMMENDED** FOR PRODUCTION DEPLOYMENTS. - -| Parameter | Description | Default | -| --------------------- | --------------------------------------------------------------------------------- | -------------- | -| `awsEndpoint` | (Used for testing) If specified, use the provided AWS endpoint to make API calls. | `""` | -| `awsSecretAccessKey` | (Used for testing) Pass-thru environment variable. | `nil` | -| `awsAccessKeyID` | (Used for testing) Pass-thru environment variable. | `nil` | -| `instanceMetadataURL` | (Used for testing) If specified, use the provided metadata URL. | `""` | -| `procUptimeFile` | (Used for Testing) Specify the uptime file. | `/proc/uptime` | - -## Metrics Endpoint Considerations - -AWS Node Termination HAndler in IMDS mode runs as a DaemonSet with `useHostNetwork: true` by default. If the Prometheus server is enabled with `enablePrometheusServer: true` nothing else will be able to bind to the configured port (by default `prometheusServerPort: 9092`) in the root network namespace. Therefore, it will need to have a firewall/security group configured on the nodes to block access to the `/metrics` endpoint. - -You can switch NTH in IMDS mode to run w/ `useHostNetwork: false`, but you will need to make sure that IMDSv1 is enabled or IMDSv2 IP hop count will need to be incremented to 2 (see the [IMDSv2 documentation](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html). diff --git a/charts/kubezero-addons/charts/aws-node-termination-handler/templates/NOTES.txt b/charts/kubezero-addons/charts/aws-node-termination-handler/templates/NOTES.txt deleted file mode 100644 index d0aaf70c..00000000 --- a/charts/kubezero-addons/charts/aws-node-termination-handler/templates/NOTES.txt +++ /dev/null @@ -1,8 +0,0 @@ -*********************************************************************** -* AWS Node Termination Handler * -*********************************************************************** - Chart version: {{ .Chart.Version }} - App version: {{ .Chart.AppVersion }} - Image tag: {{ include "aws-node-termination-handler.image" . }} - Mode : {{ if .Values.enableSqsTerminationDraining }}Queue Processor{{ else }}IMDS{{ end }} -*********************************************************************** diff --git a/charts/kubezero-addons/charts/aws-node-termination-handler/templates/_helpers.tpl b/charts/kubezero-addons/charts/aws-node-termination-handler/templates/_helpers.tpl deleted file mode 100644 index 3513d2a9..00000000 --- a/charts/kubezero-addons/charts/aws-node-termination-handler/templates/_helpers.tpl +++ /dev/null @@ -1,124 +0,0 @@ -{{/* vim: set filetype=mustache: */}} - -{{/* -Expand the name of the chart. -*/}} -{{- define "aws-node-termination-handler.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "aws-node-termination-handler.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} -{{- end -}} - -{{/* -Equivalent to "aws-node-termination-handler.fullname" except that "-win" indicator is appended to the end. -Name will not exceed 63 characters. -*/}} -{{- define "aws-node-termination-handler.fullnameWindows" -}} -{{- include "aws-node-termination-handler.fullname" . | trunc 59 | trimSuffix "-" | printf "%s-win" -}} -{{- end -}} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "aws-node-termination-handler.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Common labels -*/}} -{{- define "aws-node-termination-handler.labels" -}} -{{ include "aws-node-termination-handler.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/part-of: {{ .Release.Name }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -helm.sh/chart: {{ include "aws-node-termination-handler.chart" . }} -{{- with .Values.customLabels }} -{{ toYaml . }} -{{- end }} -{{- end -}} - -{{/* -Deployment labels -*/}} -{{- define "aws-node-termination-handler.labelsDeployment" -}} -{{ include "aws-node-termination-handler.labels" . }} -app.kubernetes.io/component: deployment -{{- end -}} - -{{/* -Daemonset labels -*/}} -{{- define "aws-node-termination-handler.labelsDaemonset" -}} -{{ include "aws-node-termination-handler.labels" . }} -app.kubernetes.io/component: daemonset -{{- end -}} - -{{/* -Selector labels -*/}} -{{- define "aws-node-termination-handler.selectorLabels" -}} -app.kubernetes.io/name: {{ include "aws-node-termination-handler.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end -}} - -{{/* -Selector labels for the deployment -*/}} -{{- define "aws-node-termination-handler.selectorLabelsDeployment" -}} -{{ include "aws-node-termination-handler.selectorLabels" . }} -app.kubernetes.io/component: deployment -{{- end -}} - -{{/* -Selector labels for the daemonset -*/}} -{{- define "aws-node-termination-handler.selectorLabelsDaemonset" -}} -{{ include "aws-node-termination-handler.selectorLabels" . }} -app.kubernetes.io/component: daemonset -{{- end -}} - -{{/* -Create the name of the service account to use -*/}} -{{- define "aws-node-termination-handler.serviceAccountName" -}} -{{- if .Values.serviceAccount.create -}} - {{ default (include "aws-node-termination-handler.fullname" .) .Values.serviceAccount.name }} -{{- else -}} - {{ default "default" .Values.serviceAccount.name }} -{{- end -}} -{{- end -}} - -{{/* -The image to use -*/}} -{{- define "aws-node-termination-handler.image" -}} -{{- printf "%s:%s" .Values.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.image.tag) }} -{{- end }} - -{{/* Get PodDisruptionBudget API Version */}} -{{- define "aws-node-termination-handler.pdb.apiVersion" -}} - {{- if and (.Capabilities.APIVersions.Has "policy/v1") (semverCompare ">= 1.21-0" .Capabilities.KubeVersion.Version) -}} - {{- print "policy/v1" -}} - {{- else -}} - {{- print "policy/v1beta1" -}} - {{- end -}} -{{- end -}} diff --git a/charts/kubezero-addons/charts/aws-node-termination-handler/templates/clusterrole.yaml b/charts/kubezero-addons/charts/aws-node-termination-handler/templates/clusterrole.yaml deleted file mode 100644 index 43c2b030..00000000 --- a/charts/kubezero-addons/charts/aws-node-termination-handler/templates/clusterrole.yaml +++ /dev/null @@ -1,52 +0,0 @@ -{{- if .Values.rbac.create -}} -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: {{ include "aws-node-termination-handler.fullname" . }} - labels: - {{- include "aws-node-termination-handler.labels" . | nindent 4 }} -rules: -- apiGroups: - - "" - resources: - - nodes - verbs: - - get - - list - - patch - - update -- apiGroups: - - "" - resources: - - pods - verbs: - - list - - get -- apiGroups: - - "" - resources: - - pods/eviction - verbs: - - create -- apiGroups: - - extensions - resources: - - daemonsets - verbs: - - get -- apiGroups: - - apps - resources: - - daemonsets - verbs: - - get -{{- if .Values.emitKubernetesEvents }} -- apiGroups: - - "" - resources: - - events - verbs: - - create - - patch -{{- end }} -{{- end -}} diff --git a/charts/kubezero-addons/charts/aws-node-termination-handler/templates/clusterrolebinding.yaml b/charts/kubezero-addons/charts/aws-node-termination-handler/templates/clusterrolebinding.yaml deleted file mode 100644 index 1058df1b..00000000 --- a/charts/kubezero-addons/charts/aws-node-termination-handler/templates/clusterrolebinding.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{- if .Values.rbac.create -}} -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: {{ include "aws-node-termination-handler.fullname" . }} - labels: - {{- include "aws-node-termination-handler.labels" . | nindent 4 }} -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: {{ include "aws-node-termination-handler.fullname" . }} -subjects: - - kind: ServiceAccount - name: {{ template "aws-node-termination-handler.serviceAccountName" . }} - namespace: {{ .Release.Namespace }} -{{- end -}} diff --git a/charts/kubezero-addons/charts/aws-node-termination-handler/templates/daemonset.linux.yaml b/charts/kubezero-addons/charts/aws-node-termination-handler/templates/daemonset.linux.yaml deleted file mode 100644 index 95e4b50f..00000000 --- a/charts/kubezero-addons/charts/aws-node-termination-handler/templates/daemonset.linux.yaml +++ /dev/null @@ -1,210 +0,0 @@ -{{- if and (not .Values.enableSqsTerminationDraining) (lower .Values.targetNodeOs | contains "linux") -}} -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: {{ include "aws-node-termination-handler.fullname" . }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "aws-node-termination-handler.labelsDaemonset" . | nindent 4 }} -spec: - {{- with .Values.updateStrategy }} - updateStrategy: - {{- toYaml . | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- include "aws-node-termination-handler.selectorLabelsDaemonset" . | nindent 6 }} - kubernetes.io/os: linux - template: - metadata: - labels: - {{- include "aws-node-termination-handler.selectorLabelsDaemonset" . | nindent 8 }} - kubernetes.io/os: linux - k8s-app: aws-node-termination-handler - {{- with (mergeOverwrite (dict) .Values.podLabels .Values.linuxPodLabels) }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- if or .Values.podAnnotations .Values.linuxPodAnnotations }} - annotations: - {{- toYaml (mergeOverwrite (dict) .Values.podAnnotations .Values.linuxPodAnnotations) | nindent 8 }} - {{- end }} - spec: - {{- with .Values.image.pullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "aws-node-termination-handler.serviceAccountName" . }} - {{- with .Values.podSecurityContext }} - securityContext: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.daemonsetPriorityClassName }} - priorityClassName: {{ . }} - {{- end }} - {{- with .Values.terminationGracePeriodSeconds }} - terminationGracePeriodSeconds: {{ . }} - {{- end }} - hostNetwork: {{ .Values.useHostNetwork }} - dnsPolicy: {{ default .Values.linuxDnsPolicy .Values.dnsPolicy }} - {{- with .Values.dnsConfig }} - dnsConfig: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: aws-node-termination-handler - {{- with .Values.securityContext }} - securityContext: - {{- toYaml . | nindent 12 }} - {{- end }} - image: {{ include "aws-node-termination-handler.image" . }} - imagePullPolicy: {{ .Values.image.pullPolicy }} - env: - - name: NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: ENABLE_PROBES_SERVER - value: {{ .Values.enableProbesServer | quote }} - - name: PROBES_SERVER_PORT - value: {{ .Values.probes.httpGet.port | quote }} - - name: PROBES_SERVER_ENDPOINT - value: {{ .Values.probes.httpGet.path | quote }} - - name: LOG_LEVEL - value: {{ .Values.logLevel | quote }} - - name: JSON_LOGGING - value: {{ .Values.jsonLogging | quote }} - - name: LOG_FORMAT_VERSION - value: {{ .Values.logFormatVersion | quote }} - - name: ENABLE_PROMETHEUS_SERVER - value: {{ .Values.enablePrometheusServer | quote }} - - name: PROMETHEUS_SERVER_PORT - value: {{ .Values.prometheusServerPort | quote }} - {{- with .Values.instanceMetadataURL }} - - name: INSTANCE_METADATA_URL - value: {{ . | quote }} - {{- end }} - - name: METADATA_TRIES - value: {{ .Values.metadataTries | quote }} - - name: DRY_RUN - value: {{ .Values.dryRun | quote }} - - name: CORDON_ONLY - value: {{ .Values.cordonOnly | quote }} - - name: TAINT_NODE - value: {{ .Values.taintNode | quote }} - - name: EXCLUDE_FROM_LOAD_BALANCERS - value: {{ .Values.excludeFromLoadBalancers | quote }} - - name: DELETE_LOCAL_DATA - value: {{ .Values.deleteLocalData | quote }} - - name: IGNORE_DAEMON_SETS - value: {{ .Values.ignoreDaemonSets | quote }} - - name: POD_TERMINATION_GRACE_PERIOD - value: {{ .Values.podTerminationGracePeriod | quote }} - - name: NODE_TERMINATION_GRACE_PERIOD - value: {{ .Values.nodeTerminationGracePeriod | quote }} - - name: EMIT_KUBERNETES_EVENTS - value: {{ .Values.emitKubernetesEvents | quote }} - {{- with .Values.kubernetesEventsExtraAnnotations }} - - name: KUBERNETES_EVENTS_EXTRA_ANNOTATIONS - value: {{ . | quote }} - {{- end }} - {{- if or .Values.webhookURL .Values.webhookURLSecretName }} - - name: WEBHOOK_URL - {{- if .Values.webhookURLSecretName }} - valueFrom: - secretKeyRef: - name: {{ .Values.webhookURLSecretName }} - key: webhookurl - {{- else }} - value: {{ .Values.webhookURL | quote }} - {{- end }} - {{- end }} - {{- with .Values.webhookHeaders }} - - name: WEBHOOK_HEADERS - value: {{ . | quote }} - {{- end }} - {{- with .Values.webhookProxy }} - - name: WEBHOOK_PROXY - value: {{ . | quote }} - {{- end }} - {{- if and .Values.webhookTemplateConfigMapName .Values.webhookTemplateConfigMapKey }} - - name: WEBHOOK_TEMPLATE_FILE - value: {{ print "/config/" .Values.webhookTemplateConfigMapKey | quote }} - {{- else if .Values.webhookTemplate }} - - name: WEBHOOK_TEMPLATE - value: {{ .Values.webhookTemplate | quote }} - {{- end }} - - name: ENABLE_SPOT_INTERRUPTION_DRAINING - value: {{ .Values.enableSpotInterruptionDraining | quote }} - - name: ENABLE_SCHEDULED_EVENT_DRAINING - value: {{ .Values.enableScheduledEventDraining | quote }} - - name: ENABLE_REBALANCE_MONITORING - value: {{ .Values.enableRebalanceMonitoring | quote }} - - name: ENABLE_REBALANCE_DRAINING - value: {{ .Values.enableRebalanceDraining | quote }} - - name: ENABLE_SQS_TERMINATION_DRAINING - value: "false" - - name: UPTIME_FROM_FILE - value: {{ .Values.procUptimeFile | quote }} - {{- with .Values.extraEnv }} - {{- toYaml . | nindent 12 }} - {{- end }} - {{- if or .Values.enablePrometheusServer .Values.enableProbesServer }} - ports: - {{- if .Values.enableProbesServer }} - - name: liveness-probe - protocol: TCP - containerPort: {{ .Values.probes.httpGet.port }} - {{- end }} - {{- if .Values.enablePrometheusServer }} - - name: http-metrics - protocol: TCP - containerPort: {{ .Values.prometheusServerPort }} - {{- end }} - {{- end }} - {{- if .Values.enableProbesServer }} - livenessProbe: - {{- toYaml .Values.probes | nindent 12 }} - {{- end }} - {{- with .Values.resources }} - resources: - {{- toYaml . | nindent 12 }} - {{- end }} - volumeMounts: - - name: uptime - mountPath: {{ .Values.procUptimeFile }} - readOnly: true - {{- if and .Values.webhookTemplateConfigMapName .Values.webhookTemplateConfigMapKey }} - - name: webhook-template - mountPath: /config/ - {{- end }} - volumes: - - name: uptime - hostPath: - path: {{ .Values.procUptimeFile | default "/proc/uptime" }} - {{- if and .Values.webhookTemplateConfigMapName .Values.webhookTemplateConfigMapKey }} - - name: webhook-template - configMap: - name: {{ .Values.webhookTemplateConfigMapName }} - {{- end }} - nodeSelector: - kubernetes.io/os: linux - {{- with default .Values.daemonsetNodeSelector (default .Values.nodeSelector .Values.linuxNodeSelector) }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- if or .Values.daemonsetAffinity (or .Values.affinity .Values.linuxAffinity) }} - affinity: - {{- toYaml (default .Values.daemonsetAffinity (default .Values.affinity .Values.linuxAffinity)) | nindent 8 }} - {{- end }} - {{- if or .Values.daemonsetTolerations (or .Values.tolerations .Values.linuxTolerations) }} - tolerations: - {{- toYaml (default .Values.daemonsetTolerations (default .Values.tolerations .Values.linuxTolerations )) | nindent 8 }} - {{- end }} -{{- end -}} diff --git a/charts/kubezero-addons/charts/aws-node-termination-handler/templates/daemonset.windows.yaml b/charts/kubezero-addons/charts/aws-node-termination-handler/templates/daemonset.windows.yaml deleted file mode 100644 index 8a9db7bf..00000000 --- a/charts/kubezero-addons/charts/aws-node-termination-handler/templates/daemonset.windows.yaml +++ /dev/null @@ -1,204 +0,0 @@ -{{- if and (not .Values.enableSqsTerminationDraining) (lower .Values.targetNodeOs | contains "windows") -}} -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: {{ include "aws-node-termination-handler.fullnameWindows" . }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "aws-node-termination-handler.labelsDaemonset" . | nindent 4 }} -spec: - {{- with .Values.updateStrategy }} - updateStrategy: - {{- toYaml . | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- include "aws-node-termination-handler.selectorLabelsDaemonset" . | nindent 6 }} - kubernetes.io/os: windows - template: - metadata: - labels: - {{- include "aws-node-termination-handler.selectorLabelsDaemonset" . | nindent 8 }} - kubernetes.io/os: windows - k8s-app: aws-node-termination-handler - {{- with (mergeOverwrite (dict) .Values.podLabels .Values.windowsPodLabels) }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- if or .Values.podAnnotations .Values.windowsPodAnnotations }} - annotations: - {{- toYaml (mergeOverwrite (dict) .Values.podAnnotations .Values.windowsPodAnnotations) | nindent 8 }} - {{- end }} - spec: - {{- with .Values.image.pullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "aws-node-termination-handler.serviceAccountName" . }} - {{- with .Values.podSecurityContext }} - securityContext: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.daemonsetPriorityClassName }} - priorityClassName: {{ . }} - {{- end }} - {{- with .Values.terminationGracePeriodSeconds }} - terminationGracePeriodSeconds: {{ . }} - {{- end }} - hostNetwork: false - dnsPolicy: {{ default .Values.windowsDnsPolicy .Values.dnsPolicy }} - {{- with .Values.dnsConfig }} - dnsConfig: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: aws-node-termination-handler - {{- with unset .Values.securityContext "runAsUser" }} - securityContext: - {{- toYaml . | nindent 12 }} - {{- end }} - image: {{ include "aws-node-termination-handler.image" . }} - imagePullPolicy: {{ .Values.image.pullPolicy }} - env: - - name: NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: ENABLE_PROBES_SERVER - value: {{ .Values.enableProbesServer | quote }} - - name: PROBES_SERVER_PORT - value: {{ .Values.probes.httpGet.port | quote }} - - name: PROBES_SERVER_ENDPOINT - value: {{ .Values.probes.httpGet.path | quote }} - - name: LOG_LEVEL - value: {{ .Values.logLevel | quote }} - - name: JSON_LOGGING - value: {{ .Values.jsonLogging | quote }} - - name: LOG_FORMAT_VERSION - value: {{ .Values.logFormatVersion | quote }} - - name: ENABLE_PROMETHEUS_SERVER - value: {{ .Values.enablePrometheusServer | quote }} - - name: PROMETHEUS_SERVER_PORT - value: {{ .Values.prometheusServerPort | quote }} - {{- with .Values.instanceMetadataURL }} - - name: INSTANCE_METADATA_URL - value: {{ . | quote }} - {{- end }} - - name: METADATA_TRIES - value: {{ .Values.metadataTries | quote }} - - name: DRY_RUN - value: {{ .Values.dryRun | quote }} - - name: CORDON_ONLY - value: {{ .Values.cordonOnly | quote }} - - name: TAINT_NODE - value: {{ .Values.taintNode | quote }} - - name: EXCLUDE_FROM_LOAD_BALANCERS - value: {{ .Values.excludeFromLoadBalancers | quote }} - - name: DELETE_LOCAL_DATA - value: {{ .Values.deleteLocalData | quote }} - - name: IGNORE_DAEMON_SETS - value: {{ .Values.ignoreDaemonSets | quote }} - - name: POD_TERMINATION_GRACE_PERIOD - value: {{ .Values.podTerminationGracePeriod | quote }} - - name: NODE_TERMINATION_GRACE_PERIOD - value: {{ .Values.nodeTerminationGracePeriod | quote }} - - name: EMIT_KUBERNETES_EVENTS - value: {{ .Values.emitKubernetesEvents | quote }} - {{- with .Values.kubernetesEventsExtraAnnotations }} - - name: KUBERNETES_EVENTS_EXTRA_ANNOTATIONS - value: {{ . | quote }} - {{- end }} - {{- if or .Values.webhookURL .Values.webhookURLSecretName }} - - name: WEBHOOK_URL - {{- if .Values.webhookURLSecretName }} - valueFrom: - secretKeyRef: - name: {{ .Values.webhookURLSecretName }} - key: webhookurl - {{- else }} - value: {{ .Values.webhookURL | quote }} - {{- end }} - {{- end }} - {{- with .Values.webhookHeaders }} - - name: WEBHOOK_HEADERS - value: {{ . | quote }} - {{- end }} - {{- with .Values.webhookProxy }} - - name: WEBHOOK_PROXY - value: {{ . | quote }} - {{- end }} - {{- if and .Values.webhookTemplateConfigMapName .Values.webhookTemplateConfigMapKey }} - - name: WEBHOOK_TEMPLATE_FILE - value: {{ print "/config/" .Values.webhookTemplateConfigMapKey | quote }} - {{- else if .Values.webhookTemplate }} - - name: WEBHOOK_TEMPLATE - value: {{ .Values.webhookTemplate | quote }} - {{- end }} - - name: ENABLE_SPOT_INTERRUPTION_DRAINING - value: {{ .Values.enableSpotInterruptionDraining | quote }} - - name: ENABLE_SCHEDULED_EVENT_DRAINING - value: {{ .Values.enableScheduledEventDraining | quote }} - - name: ENABLE_REBALANCE_MONITORING - value: {{ .Values.enableRebalanceMonitoring | quote }} - - name: ENABLE_REBALANCE_DRAINING - value: {{ .Values.enableRebalanceDraining | quote }} - - name: ENABLE_SQS_TERMINATION_DRAINING - value: "false" - {{- with .Values.extraEnv }} - {{- toYaml . | nindent 12 }} - {{- end }} - {{- if or .Values.enablePrometheusServer .Values.enableProbesServer }} - ports: - {{- if .Values.enableProbesServer }} - - name: liveness-probe - protocol: TCP - containerPort: {{ .Values.probes.httpGet.port }} - hostPort: {{ .Values.probes.httpGet.port }} - {{- end }} - {{- if .Values.enablePrometheusServer }} - - name: http-metrics - protocol: TCP - containerPort: {{ .Values.prometheusServerPort }} - hostPort: {{ .Values.prometheusServerPort }} - {{- end }} - {{- end }} - {{- if .Values.enableProbesServer }} - livenessProbe: - {{- toYaml .Values.probes | nindent 12 }} - {{- end }} - {{- with .Values.resources }} - resources: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- if and .Values.webhookTemplateConfigMapName .Values.webhookTemplateConfigMapKey }} - volumeMounts: - - name: webhook-template - mountPath: /config/ - {{- end }} - {{- if and .Values.webhookTemplateConfigMapName .Values.webhookTemplateConfigMapKey }} - volumes: - - name: webhook-template - configMap: - name: {{ .Values.webhookTemplateConfigMapName }} - {{- end }} - nodeSelector: - kubernetes.io/os: windows - {{- with default .Values.daemonsetNodeSelector (default .Values.nodeSelector .Values.windowsNodeSelector) }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- if or .Values.daemonsetAffinity (or .Values.affinity .Values.windowsAffinity) }} - affinity: - {{- toYaml (default .Values.daemonsetAffinity (default .Values.affinity .Values.windowsAffinity )) | nindent 8 }} - {{- end }} - {{- if or .Values.daemonsetTolerations (or .Values.tolerations .Values.windowsTolerations) }} - tolerations: - {{- toYaml (default .Values.daemonsetTolerations (default .Values.tolerations .Values.windowsTolerations )) | nindent 8 }} - {{- end }} -{{- end -}} diff --git a/charts/kubezero-addons/charts/aws-node-termination-handler/templates/deployment.yaml b/charts/kubezero-addons/charts/aws-node-termination-handler/templates/deployment.yaml deleted file mode 100644 index 1c79b403..00000000 --- a/charts/kubezero-addons/charts/aws-node-termination-handler/templates/deployment.yaml +++ /dev/null @@ -1,221 +0,0 @@ -{{- if .Values.enableSqsTerminationDraining }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "aws-node-termination-handler.fullname" . }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "aws-node-termination-handler.labelsDeployment" . | nindent 4 }} -spec: - replicas: {{ .Values.replicas }} - {{- with .Values.strategy }} - strategy: - {{- toYaml . | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- include "aws-node-termination-handler.selectorLabelsDeployment" . | nindent 6 }} - template: - metadata: - labels: - {{- include "aws-node-termination-handler.selectorLabelsDeployment" . | nindent 8 }} - k8s-app: aws-node-termination-handler - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - {{- with .Values.image.pullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "aws-node-termination-handler.serviceAccountName" . }} - {{- with .Values.podSecurityContext }} - securityContext: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.priorityClassName }} - priorityClassName: {{ . }} - {{- end }} - {{- with .Values.terminationGracePeriodSeconds }} - terminationGracePeriodSeconds: {{ . }} - {{- end }} - {{- with .Values.dnsConfig }} - dnsConfig: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: aws-node-termination-handler - {{- with .Values.securityContext }} - securityContext: - {{- toYaml . | nindent 12 }} - {{- end }} - image: {{ include "aws-node-termination-handler.image" . }} - imagePullPolicy: {{ .Values.image.pullPolicy }} - env: - - name: NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: ENABLE_PROBES_SERVER - value: "true" - - name: PROBES_SERVER_PORT - value: {{ .Values.probes.httpGet.port | quote }} - - name: PROBES_SERVER_ENDPOINT - value: {{ .Values.probes.httpGet.path | quote }} - - name: LOG_LEVEL - value: {{ .Values.logLevel | quote }} - - name: JSON_LOGGING - value: {{ .Values.jsonLogging | quote }} - - name: LOG_FORMAT_VERSION - value: {{ .Values.logFormatVersion | quote }} - - name: ENABLE_PROMETHEUS_SERVER - value: {{ .Values.enablePrometheusServer | quote }} - - name: PROMETHEUS_SERVER_PORT - value: {{ .Values.prometheusServerPort | quote }} - # [DEPRECATED] Use CHECK_TAG_BEFORE_DRAINING instead - - name: CHECK_ASG_TAG_BEFORE_DRAINING - value: {{ .Values.checkASGTagBeforeDraining | quote }} - - name: CHECK_TAG_BEFORE_DRAINING - value: {{ .Values.checkTagBeforeDraining | quote }} - # [DEPRECATED] Use MANAGED_TAG instead - - name: MANAGED_ASG_TAG - value: {{ .Values.managedAsgTag | quote }} - - name: MANAGED_TAG - value: {{ .Values.managedTag | quote }} - - name: USE_PROVIDER_ID - value: {{ .Values.useProviderId | quote }} - - name: DRY_RUN - value: {{ .Values.dryRun | quote }} - - name: CORDON_ONLY - value: {{ .Values.cordonOnly | quote }} - - name: TAINT_NODE - value: {{ .Values.taintNode | quote }} - - name: EXCLUDE_FROM_LOAD_BALANCERS - value: {{ .Values.excludeFromLoadBalancers | quote }} - - name: DELETE_LOCAL_DATA - value: {{ .Values.deleteLocalData | quote }} - - name: IGNORE_DAEMON_SETS - value: {{ .Values.ignoreDaemonSets | quote }} - - name: POD_TERMINATION_GRACE_PERIOD - value: {{ .Values.podTerminationGracePeriod | quote }} - - name: NODE_TERMINATION_GRACE_PERIOD - value: {{ .Values.nodeTerminationGracePeriod | quote }} - - name: EMIT_KUBERNETES_EVENTS - value: {{ .Values.emitKubernetesEvents | quote }} - - name: COMPLETE_LIFECYCLE_ACTION_DELAY_SECONDS - value: {{ .Values.completeLifecycleActionDelaySeconds | quote }} - {{- with .Values.kubernetesEventsExtraAnnotations }} - - name: KUBERNETES_EVENTS_EXTRA_ANNOTATIONS - value: {{ . | quote }} - {{- end }} - {{- if or .Values.webhookURL .Values.webhookURLSecretName }} - - name: WEBHOOK_URL - {{- if .Values.webhookURLSecretName }} - valueFrom: - secretKeyRef: - name: {{ .Values.webhookURLSecretName }} - key: webhookurl - {{- else }} - value: {{ .Values.webhookURL | quote }} - {{- end }} - {{- end }} - {{- with .Values.webhookHeaders }} - - name: WEBHOOK_HEADERS - value: {{ . | quote }} - {{- end }} - {{- with .Values.webhookProxy }} - - name: WEBHOOK_PROXY - value: {{ . | quote }} - {{- end }} - {{- if and .Values.webhookTemplateConfigMapName .Values.webhookTemplateConfigMapKey }} - - name: WEBHOOK_TEMPLATE_FILE - value: {{ print "/config/" .Values.webhookTemplateConfigMapKey | quote }} - {{- else if .Values.webhookTemplate }} - - name: WEBHOOK_TEMPLATE - value: {{ .Values.webhookTemplate | quote }} - {{- end }} - - name: ENABLE_SQS_TERMINATION_DRAINING - value: "true" - {{- with .Values.awsRegion }} - - name: AWS_REGION - value: {{ . | quote }} - {{- end }} - {{- with .Values.awsEndpoint }} - - name: AWS_ENDPOINT - value: {{ . | quote }} - {{- end }} - {{- if and .Values.awsAccessKeyID .Values.awsSecretAccessKey }} - - name: AWS_ACCESS_KEY_ID - value: {{ .Values.awsAccessKeyID | quote }} - - name: AWS_SECRET_ACCESS_KEY - value: {{ .Values.awsSecretAccessKey | quote }} - {{- end }} - - name: QUEUE_URL - value: {{ .Values.queueURL | quote }} - - name: WORKERS - value: {{ .Values.workers | quote }} - {{- with .Values.extraEnv }} - {{- toYaml . | nindent 12 }} - {{- end }} - ports: - - name: liveness-probe - protocol: TCP - containerPort: {{ .Values.probes.httpGet.port }} - {{- if .Values.enablePrometheusServer }} - - name: http-metrics - protocol: TCP - containerPort: {{ .Values.prometheusServerPort }} - {{- end }} - livenessProbe: - {{- toYaml .Values.probes | nindent 12 }} - {{- with .Values.resources }} - resources: - {{- toYaml . | nindent 12 }} - {{- end }} - volumeMounts: - - name: aws-token - mountPath: "/var/run/secrets/sts.amazonaws.com/serviceaccount/" - readOnly: true - {{- if and .Values.webhookTemplateConfigMapName .Values.webhookTemplateConfigMapKey }} - - name: webhook-template - mountPath: /config/ - {{- end }} - volumes: - - name: aws-token - projected: - sources: - - serviceAccountToken: - path: token - expirationSeconds: 86400 - audience: "sts.amazonaws.com" - {{- if and .Values.webhookTemplateConfigMapName .Values.webhookTemplateConfigMapKey }} - - name: webhook-template - configMap: - name: {{ .Values.webhookTemplateConfigMapName }} - {{- end }} - nodeSelector: - kubernetes.io/os: linux - {{- with .Values.nodeSelector }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} diff --git a/charts/kubezero-addons/charts/aws-node-termination-handler/templates/pdb.yaml b/charts/kubezero-addons/charts/aws-node-termination-handler/templates/pdb.yaml deleted file mode 100644 index 7f43ab29..00000000 --- a/charts/kubezero-addons/charts/aws-node-termination-handler/templates/pdb.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{- if and .Values.enableSqsTerminationDraining (and .Values.podDisruptionBudget (gt (int .Values.replicas) 1)) }} -apiVersion: {{ include "aws-node-termination-handler.pdb.apiVersion" . }} -kind: PodDisruptionBudget -metadata: - name: {{ include "aws-node-termination-handler.fullname" . }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "aws-node-termination-handler.labels" . | nindent 4 }} -spec: - selector: - matchLabels: - {{- include "aws-node-termination-handler.selectorLabelsDeployment" . | nindent 6 }} - {{- toYaml .Values.podDisruptionBudget | nindent 2 }} -{{- end }} diff --git a/charts/kubezero-addons/charts/aws-node-termination-handler/templates/podmonitor.yaml b/charts/kubezero-addons/charts/aws-node-termination-handler/templates/podmonitor.yaml deleted file mode 100644 index e214d12c..00000000 --- a/charts/kubezero-addons/charts/aws-node-termination-handler/templates/podmonitor.yaml +++ /dev/null @@ -1,29 +0,0 @@ -{{- if and (not .Values.enableSqsTerminationDraining) (and .Values.enablePrometheusServer .Values.podMonitor.create) -}} -apiVersion: monitoring.coreos.com/v1 -kind: PodMonitor -metadata: - name: {{ template "aws-node-termination-handler.fullname" . }} - namespace: {{ default .Release.Namespace .Values.podMonitor.namespace }} - labels: - {{- include "aws-node-termination-handler.labels" . | nindent 4 }} - {{- with .Values.podMonitor.labels }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - jobLabel: app.kubernetes.io/name - namespaceSelector: - matchNames: - - {{ .Release.Namespace }} - podMetricsEndpoints: - - port: http-metrics - path: /metrics - {{- with .Values.podMonitor.interval }} - interval: {{ . }} - {{- end }} - {{- with .Values.podMonitor.sampleLimit }} - sampleLimit: {{ . }} - {{- end }} - selector: - matchLabels: - {{- include "aws-node-termination-handler.selectorLabelsDaemonset" . | nindent 6 }} -{{- end -}} diff --git a/charts/kubezero-addons/charts/aws-node-termination-handler/templates/psp.yaml b/charts/kubezero-addons/charts/aws-node-termination-handler/templates/psp.yaml deleted file mode 100644 index c84d69f3..00000000 --- a/charts/kubezero-addons/charts/aws-node-termination-handler/templates/psp.yaml +++ /dev/null @@ -1,70 +0,0 @@ -{{- if and (.Values.rbac.pspEnabled) (semverCompare "<1.25-0" .Capabilities.KubeVersion.GitVersion) }} -apiVersion: policy/v1beta1 -kind: PodSecurityPolicy -metadata: - name: {{ template "aws-node-termination-handler.fullname" . }} - labels: - {{- include "aws-node-termination-handler.labels" . | nindent 4 }} - annotations: - seccomp.security.alpha.kubernetes.io/allowedProfileNames: '*' -spec: - privileged: false - hostIPC: false - hostNetwork: {{ .Values.useHostNetwork }} - hostPID: false -{{- if and (and (not .Values.enableSqsTerminationDraining) .Values.useHostNetwork ) (or .Values.enablePrometheusServer .Values.enableProbesServer) }} - hostPorts: -{{- if .Values.enablePrometheusServer }} - - min: {{ .Values.prometheusServerPort }} - max: {{ .Values.prometheusServerPort }} -{{- end }} -{{- if .Values.enableProbesServer }} - - min: {{ .Values.probes.httpGet.port }} - max: {{ .Values.probes.httpGet.port }} -{{- end }} -{{- end }} - readOnlyRootFilesystem: false - allowPrivilegeEscalation: false - allowedCapabilities: - - '*' - fsGroup: - rule: RunAsAny - runAsUser: - rule: RunAsAny - seLinux: - rule: RunAsAny - supplementalGroups: - rule: RunAsAny - volumes: - - '*' ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: {{ template "aws-node-termination-handler.fullname" . }}-psp - namespace: {{ .Release.Namespace }} - labels: - {{- include "aws-node-termination-handler.labels" . | nindent 4 }} -rules: - - apiGroups: ['policy'] - resources: ['podsecuritypolicies'] - verbs: ['use'] - resourceNames: - - {{ template "aws-node-termination-handler.fullname" . }} ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: {{ template "aws-node-termination-handler.fullname" . }}-psp - namespace: {{ .Release.Namespace }} - labels: - {{- include "aws-node-termination-handler.labels" . | nindent 4 }} -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: {{ template "aws-node-termination-handler.fullname" . }}-psp -subjects: - - kind: ServiceAccount - name: {{ template "aws-node-termination-handler.serviceAccountName" . }} - namespace: {{ .Release.Namespace }} -{{- end }} diff --git a/charts/kubezero-addons/charts/aws-node-termination-handler/templates/service.yaml b/charts/kubezero-addons/charts/aws-node-termination-handler/templates/service.yaml deleted file mode 100644 index 19f7b067..00000000 --- a/charts/kubezero-addons/charts/aws-node-termination-handler/templates/service.yaml +++ /dev/null @@ -1,18 +0,0 @@ -{{- if and .Values.enableSqsTerminationDraining .Values.enablePrometheusServer -}} -apiVersion: v1 -kind: Service -metadata: - name: {{ include "aws-node-termination-handler.fullname" . }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "aws-node-termination-handler.labelsDeployment" . | nindent 4 }} -spec: - type: ClusterIP - selector: - {{- include "aws-node-termination-handler.selectorLabelsDeployment" . | nindent 4 }} - ports: - - name: http-metrics - port: {{ .Values.prometheusServerPort }} - targetPort: http-metrics - protocol: TCP -{{- end -}} diff --git a/charts/kubezero-addons/charts/aws-node-termination-handler/templates/serviceaccount.yaml b/charts/kubezero-addons/charts/aws-node-termination-handler/templates/serviceaccount.yaml deleted file mode 100644 index 08f3dc5f..00000000 --- a/charts/kubezero-addons/charts/aws-node-termination-handler/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ -{{- if .Values.serviceAccount.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ template "aws-node-termination-handler.serviceAccountName" . }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "aws-node-termination-handler.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end -}} diff --git a/charts/kubezero-addons/charts/aws-node-termination-handler/templates/servicemonitor.yaml b/charts/kubezero-addons/charts/aws-node-termination-handler/templates/servicemonitor.yaml deleted file mode 100644 index d5fe1479..00000000 --- a/charts/kubezero-addons/charts/aws-node-termination-handler/templates/servicemonitor.yaml +++ /dev/null @@ -1,29 +0,0 @@ -{{- if and .Values.enableSqsTerminationDraining (and .Values.enablePrometheusServer .Values.serviceMonitor.create) -}} -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: {{ include "aws-node-termination-handler.fullname" . }} - namespace: {{ default .Release.Namespace .Values.serviceMonitor.namespace }} - labels: - {{- include "aws-node-termination-handler.labels" . | nindent 4 }} - {{- with .Values.serviceMonitor.labels }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - jobLabel: app.kubernetes.io/name - namespaceSelector: - matchNames: - - {{ .Release.Namespace }} - endpoints: - - port: http-metrics - path: /metrics - {{- with .Values.serviceMonitor.interval }} - interval: {{ . }} - {{- end }} - {{- with .Values.serviceMonitor.sampleLimit }} - sampleLimit: {{ . }} - {{- end }} - selector: - matchLabels: - {{- include "aws-node-termination-handler.selectorLabelsDeployment" . | nindent 6 }} -{{- end -}} diff --git a/charts/kubezero-addons/charts/aws-node-termination-handler/values.yaml b/charts/kubezero-addons/charts/aws-node-termination-handler/values.yaml deleted file mode 100644 index ea7b7f77..00000000 --- a/charts/kubezero-addons/charts/aws-node-termination-handler/values.yaml +++ /dev/null @@ -1,295 +0,0 @@ -# Default values for aws-node-termination-handler. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -image: - repository: public.ecr.aws/aws-ec2/aws-node-termination-handler - # Overrides the image tag whose default is {{ printf "v%s" .Chart.AppVersion }} - tag: "" - pullPolicy: IfNotPresent - pullSecrets: [] - -nameOverride: "" -fullnameOverride: "" - -serviceAccount: - # Specifies whether a service account should be created - create: true - # The name of the service account to use. If namenot set and create is true, a name is generated using fullname template - name: - annotations: {} - # eks.amazonaws.com/role-arn: arn:aws:iam::AWS_ACCOUNT_ID:role/IAM_ROLE_NAME - -rbac: - # Specifies whether RBAC resources should be created - create: true - # Specifies if PodSecurityPolicy resources should be created. PodSecurityPolicy will not be created when Kubernetes version is 1.25 or later. - pspEnabled: true - -customLabels: {} - -podLabels: {} - -podAnnotations: {} - -podSecurityContext: - fsGroup: 1000 - -securityContext: - readOnlyRootFilesystem: true - runAsNonRoot: true - allowPrivilegeEscalation: false - runAsUser: 1000 - runAsGroup: 1000 - -terminationGracePeriodSeconds: - -resources: {} - -nodeSelector: {} - -affinity: {} - -tolerations: [] - -# Extra environment variables -extraEnv: [] - -# Liveness probe settings -probes: - httpGet: - path: /healthz - port: 8080 - initialDelaySeconds: 5 - periodSeconds: 5 - -# Set the log level -logLevel: info - -# Set the log format version -logFormatVersion: 1 - -# Log messages in JSON format -jsonLogging: false - -enablePrometheusServer: false -prometheusServerPort: 9092 - -# dryRun tells node-termination-handler to only log calls to kubernetes control plane -dryRun: false - -# Cordon but do not drain nodes upon spot interruption termination notice. -cordonOnly: false - -# Taint node upon spot interruption termination notice. -taintNode: false - -# Exclude node from load balancer before cordoning via the ServiceNodeExclusion feature gate. -excludeFromLoadBalancers: false - -# deleteLocalData tells kubectl to continue even if there are pods using -# emptyDir (local data that will be deleted when the node is drained). -deleteLocalData: true - -# ignoreDaemonSets causes kubectl to skip Daemon Set managed pods. -ignoreDaemonSets: true - -# podTerminationGracePeriod is time in seconds given to each pod to terminate gracefully. If negative, the default value specified in the pod will be used. -podTerminationGracePeriod: -1 - -# nodeTerminationGracePeriod specifies the period of time in seconds given to each NODE to terminate gracefully. Node draining will be scheduled based on this value to optimize the amount of compute time, but still safely drain the node before an event. -nodeTerminationGracePeriod: 120 - -# emitKubernetesEvents If true, Kubernetes events will be emitted when interruption events are received and when actions are taken on Kubernetes nodes. In IMDS Processor mode a default set of annotations with all the node metadata gathered from IMDS will be attached to each event -emitKubernetesEvents: false - -# completeLifecycleActionDelaySeconds will pause for the configured duration after draining the node before completing the EC2 Autoscaling lifecycle action. This may be helpful if Pods on the node have Persistent Volume Claims. -completeLifecycleActionDelaySeconds: -1 - -# kubernetesEventsExtraAnnotations A comma-separated list of key=value extra annotations to attach to all emitted Kubernetes events -# Example: "first=annotation,sample.annotation/number=two" -kubernetesEventsExtraAnnotations: "" - -# webhookURL if specified, posts event data to URL upon instance interruption action. -webhookURL: "" - -# Webhook URL will be fetched from the secret store using the given name. -webhookURLSecretName: "" - -# webhookHeaders if specified, replaces the default webhook headers. -webhookHeaders: "" - -# webhookProxy if specified, uses this HTTP(S) proxy configuration. -webhookProxy: "" - -# webhookTemplate if specified, replaces the default webhook message template. -webhookTemplate: "" - -# webhook template file will be fetched from given config map name -# if specified, replaces the default webhook message with the content of the template file -webhookTemplateConfigMapName: "" - -# template file name stored in configmap -webhookTemplateConfigMapKey: "" - -# enableSqsTerminationDraining If true, this turns on queue-processor mode which drains nodes when an SQS termination event is received -enableSqsTerminationDraining: false - -# --------------------------------------------------------------------------------------------------------------------- -# Queue Processor Mode -# --------------------------------------------------------------------------------------------------------------------- - -# The number of replicas in the NTH deployment when using queue-processor mode (NOTE: increasing this may cause duplicate webhooks since NTH pods are stateless) -replicas: 1 - -# Specify the update strategy for the deployment -strategy: {} - -# podDisruptionBudget specifies the disruption budget for the controller pods. -# Disruption budget will be configured only when the replicaCount is greater than 1 -podDisruptionBudget: {} -# maxUnavailable: 1 - -serviceMonitor: - # Specifies whether ServiceMonitor should be created - # this needs enableSqsTerminationDraining: true - # and enablePrometheusServer: true - create: false - # Specifies whether the ServiceMonitor should be created in a different namespace than - # the Helm release - namespace: - # Additional labels to add to the metadata - labels: {} - # The Prometheus scrape interval - interval: 30s - # The number of scraped samples that will be accepted - sampleLimit: 5000 - -priorityClassName: system-cluster-critical - -# If specified, use the AWS region for AWS API calls -awsRegion: "" - -# Listens for messages on the specified SQS queue URL -queueURL: "" - -# The maximum amount of parallel event processors to handle concurrent events -workers: 10 - -# [DEPRECATED] Use checkTagBeforeDraining instead -checkASGTagBeforeDraining: true - -# If true, check that the instance is tagged with "aws-node-termination-handler/managed" as the key before draining the node -checkTagBeforeDraining: true - -# [DEPRECATED] Use managedTag instead -managedAsgTag: "aws-node-termination-handler/managed" - -# The tag to ensure is on a node if checkTagBeforeDraining is true -managedTag: "aws-node-termination-handler/managed" - -# If true, fetch node name through Kubernetes node spec ProviderID instead of AWS event PrivateDnsHostname. -useProviderId: false - -# --------------------------------------------------------------------------------------------------------------------- -# IMDS Mode -# --------------------------------------------------------------------------------------------------------------------- - -# Create node OS specific daemonset(s). (e.g. "linux", "windows", "linux windows") -targetNodeOs: linux - -linuxPodLabels: {} -windowsPodLabels: {} - -linuxPodAnnotations: {} -windowsPodAnnotations: {} - -# K8s DaemonSet update strategy. -updateStrategy: - type: RollingUpdate - rollingUpdate: - maxUnavailable: 25% - -daemonsetPriorityClassName: system-node-critical - -podMonitor: - # Specifies whether PodMonitor should be created - # this needs enableSqsTerminationDraining: false - # and enablePrometheusServer: true - create: false - # Specifies whether the PodMonitor should be created in a different namespace than - # the Helm release - namespace: - # Additional labels to add to the metadata - labels: {} - # The Prometheus scrape interval - interval: 30s - # The number of scraped samples that will be accepted - sampleLimit: 5000 - -# Determines if NTH uses host networking for Linux when running the DaemonSet (only IMDS mode; queue-processor never runs with host networking) -# If you have disabled IMDSv1 and are relying on IMDSv2, you'll need to increase the IP hop count to 2 before switching this to false -# https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html -useHostNetwork: true - -# Daemonset DNS policy -dnsPolicy: "" -dnsConfig: {} -linuxDnsPolicy: ClusterFirstWithHostNet -windowsDnsPolicy: ClusterFirst - -daemonsetNodeSelector: {} -linuxNodeSelector: {} -windowsNodeSelector: {} - -daemonsetAffinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: "eks.amazonaws.com/compute-type" - operator: NotIn - values: - - fargate -linuxAffinity: {} -windowsAffinity: {} - -daemonsetTolerations: - - operator: Exists -linuxTolerations: [] -windowsTolerations: [] - -# If the probes server is running. -enableProbesServer: false - -# Total number of times to try making the metadata request before failing. -metadataTries: 3 - -# enableSpotInterruptionDraining If false, do not drain nodes when the spot interruption termination notice is received. Only used in IMDS mode. -enableSpotInterruptionDraining: true - -# enableScheduledEventDraining If false, do not drain nodes before the maintenance window starts for an EC2 instance scheduled event. Only used in IMDS mode. -enableScheduledEventDraining: true - -# enableRebalanceMonitoring If true, cordon nodes when the rebalance recommendation notice is received. Only used in IMDS mode. -enableRebalanceMonitoring: false - -# enableRebalanceDraining If true, drain nodes when the rebalance recommendation notice is received. Only used in IMDS mode. -enableRebalanceDraining: false - -# --------------------------------------------------------------------------------------------------------------------- -# Testing -# --------------------------------------------------------------------------------------------------------------------- - -# (TESTING USE): If specified, use the provided AWS endpoint to make API calls. -awsEndpoint: "" - -# (TESTING USE): These should only be used for testing w/ localstack! -awsAccessKeyID: -awsSecretAccessKey: - -# (TESTING USE): Override the default metadata URL (default: http://169.254.169.254:80) -instanceMetadataURL: "" - -# (TESTING USE): Mount path for uptime file -procUptimeFile: /proc/uptime diff --git a/charts/kubezero-addons/nth.patch b/charts/kubezero-addons/nth.patch deleted file mode 100644 index bf883b2f..00000000 --- a/charts/kubezero-addons/nth.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -tuNr charts/aws-node-termination-handler.orig/templates/deployment.yaml charts/aws-node-termination-handler/templates/deployment.yaml ---- charts/aws-node-termination-handler.orig/templates/deployment.yaml 2022-01-26 18:01:36.123482217 +0100 -+++ charts/aws-node-termination-handler/templates/deployment.yaml 2022-01-26 18:08:21.464304621 +0100 -@@ -175,13 +175,23 @@ - resources: - {{- toYaml . | nindent 12 }} - {{- end }} -- {{- if and .Values.webhookTemplateConfigMapName .Values.webhookTemplateConfigMapKey }} - volumeMounts: -+ - name: aws-token -+ mountPath: "/var/run/secrets/sts.amazonaws.com/serviceaccount/" -+ readOnly: true -+ {{- if and .Values.webhookTemplateConfigMapName .Values.webhookTemplateConfigMapKey }} - - name: webhook-template - mountPath: /config/ - {{- end }} -- {{- if and .Values.webhookTemplateConfigMapName .Values.webhookTemplateConfigMapKey }} - volumes: -+ - name: aws-token -+ projected: -+ sources: -+ - serviceAccountToken: -+ path: token -+ expirationSeconds: 86400 -+ audience: "sts.amazonaws.com" -+ {{- if and .Values.webhookTemplateConfigMapName .Values.webhookTemplateConfigMapKey }} - - name: webhook-template - configMap: - name: {{ .Values.webhookTemplateConfigMapName }} diff --git a/charts/kubezero-addons/ruh.patch b/charts/kubezero-addons/ruh.patch deleted file mode 100644 index 21d24cb0..00000000 --- a/charts/kubezero-addons/ruh.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -tuNr charts/aws-eks-asg-rolling-update-handler.orig/templates/deployment.yaml charts/aws-eks-asg-rolling-update-handler/templates/deployment.yaml ---- charts/aws-eks-asg-rolling-update-handler.orig/templates/deployment.yaml 2023-04-12 15:49:08.744242462 +0000 -+++ charts/aws-eks-asg-rolling-update-handler/templates/deployment.yaml 2023-04-12 15:55:44.399489809 +0000 -@@ -34,6 +34,26 @@ - resources: - {{- toYaml . | nindent 12 }} - {{- end }} -+ volumeMounts: -+ - name: aws-token -+ mountPath: "/var/run/secrets/sts.amazonaws.com/serviceaccount/" -+ readOnly: true -+ volumes: -+ - name: aws-token -+ projected: -+ sources: -+ - serviceAccountToken: -+ path: token -+ expirationSeconds: 86400 -+ audience: "sts.amazonaws.com" -+ {{- with .Values.nodeSelector }} -+ nodeSelector: -+ {{- toYaml . | nindent 8 }} -+ {{- end }} -+ {{- with .Values.tolerations }} -+ tolerations: -+ {{- toYaml . | nindent 8 }} -+ {{- end }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} diff --git a/charts/kubezero-addons/templates/cluster-backup/cronjob.yaml b/charts/kubezero-addons/templates/cluster-backup/cronjob.yaml deleted file mode 100644 index d9df5127..00000000 --- a/charts/kubezero-addons/templates/cluster-backup/cronjob.yaml +++ /dev/null @@ -1,61 +0,0 @@ -{{- if .Values.clusterBackup.enabled }} -apiVersion: batch/v1 -kind: CronJob -metadata: - name: kubezero-backup - namespace: kube-system -spec: - schedule: "0 * * * *" - concurrencyPolicy: "Replace" - jobTemplate: - spec: - backoffLimit: 1 - activeDeadlineSeconds: 300 - ttlSecondsAfterFinished: 3600 - template: - spec: - containers: - - name: kubezero-admin - image: "{{ .Values.clusterBackup.image.name }}:{{ default .Chart.AppVersion .Values.clusterBackup.image.tag }}" - imagePullPolicy: Always - command: ["kubezero.sh"] - args: - - backup - volumeMounts: - - name: host - mountPath: /host - - name: workdir - mountPath: /tmp - env: - - name: DEBUG - value: "" - - name: RESTIC_REPOSITORY - valueFrom: - secretKeyRef: - name: kubezero-backup-restic - key: repository - - name: RESTIC_PASSWORD - valueFrom: - secretKeyRef: - name: kubezero-backup-restic - key: password - {{- with .Values.clusterBackup.extraEnv }} - {{- toYaml . | nindent 12 }} - {{- end }} - #securityContext: - # readOnlyRootFilesystem: true - hostNetwork: true - volumes: - - name: host - hostPath: - path: / - type: Directory - - name: workdir - emptyDir: {} - nodeSelector: - node-role.kubernetes.io/control-plane: "" - tolerations: - - key: node-role.kubernetes.io/control-plane - effect: NoSchedule - restartPolicy: Never -{{- end }} diff --git a/charts/kubezero-addons/templates/cluster-backup/secret.yaml b/charts/kubezero-addons/templates/cluster-backup/secret.yaml deleted file mode 100644 index b0b020e3..00000000 --- a/charts/kubezero-addons/templates/cluster-backup/secret.yaml +++ /dev/null @@ -1,11 +0,0 @@ -{{- if and .Values.clusterBackup.enabled .Values.clusterBackup.repository .Values.clusterBackup.password }} -apiVersion: v1 -kind: Secret -metadata: - name: kubezero-backup-restic - namespace: kube-system -type: Opaque -data: - repository: {{ default "" .Values.clusterBackup.repository | b64enc }} - password: {{ default "" .Values.clusterBackup.password | b64enc }} -{{- end }} diff --git a/charts/kubezero-addons/templates/device-plugins/aws-neuron-ds.yaml b/charts/kubezero-addons/templates/device-plugins/aws-neuron-ds.yaml deleted file mode 100644 index ae092e96..00000000 --- a/charts/kubezero-addons/templates/device-plugins/aws-neuron-ds.yaml +++ /dev/null @@ -1,70 +0,0 @@ -{{- if .Values.awsNeuron.enabled }} -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: neuron-device-plugin - namespace: kube-system -spec: - selector: - matchLabels: - name: neuron-device-plugin-ds - updateStrategy: - type: RollingUpdate - template: - metadata: - labels: - name: neuron-device-plugin-ds - spec: - serviceAccount: neuron-device-plugin - tolerations: - - key: aws.amazon.com/neuron - operator: Exists - effect: NoSchedule - - key: kubezero-workergroup - effect: NoSchedule - operator: Exists - # Mark this pod as a critical add-on; when enabled, the critical add-on - # scheduler reserves resources for critical add-on pods so that they can - # be rescheduled after a failure. - # See https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/ - priorityClassName: "system-node-critical" - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: "node.kubernetes.io/instance-type" - operator: In - values: - - inf1.xlarge - - inf1.2xlarge - - inf1.6xlarge - - inf1.24xlarge - containers: - - image: "{{ .Values.awsNeuron.image.name }}:{{ .Values.awsNeuron.image.tag }}" - imagePullPolicy: IfNotPresent - name: neuron-device-plugin - env: - - name: KUBECONFIG - value: /etc/kubernetes/kubelet.conf - - name: NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - securityContext: - allowPrivilegeEscalation: false - capabilities: - drop: ["ALL"] - volumeMounts: - - name: device-plugin - mountPath: /var/lib/kubelet/device-plugins - - name: infa-map - mountPath: /run - volumes: - - name: device-plugin - hostPath: - path: /var/lib/kubelet/device-plugins - - name: infa-map - hostPath: - path: /run -{{- end }} diff --git a/charts/kubezero-addons/templates/device-plugins/aws-neuron-rbac.yaml b/charts/kubezero-addons/templates/device-plugins/aws-neuron-rbac.yaml deleted file mode 100644 index 193a82db..00000000 --- a/charts/kubezero-addons/templates/device-plugins/aws-neuron-rbac.yaml +++ /dev/null @@ -1,59 +0,0 @@ -{{- if .Values.awsNeuron.enabled }} -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: neuron-device-plugin -rules: -- apiGroups: - - "" - resources: - - nodes - verbs: - - get - - list - - watch -- apiGroups: - - "" - resources: - - events - verbs: - - create - - patch -- apiGroups: - - "" - resources: - - pods - verbs: - - update - - patch - - get - - list - - watch -- apiGroups: - - "" - resources: - - nodes/status - verbs: - - patch - - update ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: neuron-device-plugin - namespace: kube-system ---- -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: neuron-device-plugin - namespace: kube-system -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: neuron-device-plugin -subjects: -- kind: ServiceAccount - name: neuron-device-plugin - namespace: kube-system -{{- end }} diff --git a/charts/kubezero-addons/templates/device-plugins/fuse-device-plugin.yaml b/charts/kubezero-addons/templates/device-plugins/fuse-device-plugin.yaml deleted file mode 100644 index 053c2836..00000000 --- a/charts/kubezero-addons/templates/device-plugins/fuse-device-plugin.yaml +++ /dev/null @@ -1,32 +0,0 @@ -{{- if .Values.fuseDevicePlugin.enabled }} -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: fuse-device-plugin - namespace: kube-system -spec: - selector: - matchLabels: - name: fuse-device-plugin - template: - metadata: - labels: - name: fuse-device-plugin - spec: - hostNetwork: true - containers: - - image: public.ecr.aws/zero-downtime/fuse-device-plugin:v1.1.0 - # imagePullPolicy: Always - name: fuse-device-plugin - securityContext: - allowPrivilegeEscalation: false - capabilities: - drop: ["ALL"] - volumeMounts: - - name: device-plugin - mountPath: /var/lib/kubelet/device-plugins - volumes: - - name: device-plugin - hostPath: - path: /var/lib/kubelet/device-plugins -{{- end }} diff --git a/charts/kubezero-addons/templates/forseti/deployment.yaml b/charts/kubezero-addons/templates/forseti/deployment.yaml deleted file mode 100644 index 1fddc7ba..00000000 --- a/charts/kubezero-addons/templates/forseti/deployment.yaml +++ /dev/null @@ -1,83 +0,0 @@ -{{- if .Values.forseti.enabled }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: kubezero-forseti - namespace: kube-system - labels: - app: kubezero-forseti -spec: - replicas: 1 - selector: - matchLabels: - app: kubezero-forseti - template: - metadata: - labels: - app: kubezero-forseti - spec: - containers: - - name: kubezero-forseti - image: "{{ .Values.forseti.image.name }}:{{ .Values.forseti.image.tag }}" - imagePullPolicy: Always - args: - - --health-probe-bind-address=:8081 - - --metrics-bind-address=:8080 - #- --zap-log-level=2 - #- --dry-run - #- --leader-elect - command: - - /forseti - env: - - name: AWS_REGION - value: "{{ .Values.forseti.aws.region }}" - - name: AWS_ROLE_ARN - value: "{{ .Values.forseti.aws.iamRoleArn }}" - - name: AWS_STS_REGIONAL_ENDPOINTS - value: regional - - name: AWS_WEB_IDENTITY_TOKEN_FILE - value: /var/run/secrets/sts.amazonaws.com/serviceaccount/token - livenessProbe: - httpGet: - path: /healthz - port: 8081 - initialDelaySeconds: 15 - periodSeconds: 20 - readinessProbe: - httpGet: - path: /readyz - port: 8081 - initialDelaySeconds: 5 - periodSeconds: 10 - resources: - limits: - cpu: 500m - memory: 128Mi - requests: - cpu: 10m - memory: 64Mi - securityContext: - allowPrivilegeEscalation: false - volumeMounts: - - mountPath: /var/run/secrets/sts.amazonaws.com/serviceaccount/ - name: aws-token - readOnly: true - securityContext: - runAsNonRoot: true - serviceAccountName: kubezero-forseti - terminationGracePeriodSeconds: 10 - nodeSelector: - node-role.kubernetes.io/control-plane: "" - tolerations: - - key: node-role.kubernetes.io/control-plane - effect: NoSchedule - volumes: - - name: aws-token - projected: - defaultMode: 420 - sources: - - serviceAccountToken: - audience: sts.amazonaws.com - expirationSeconds: 86400 - path: token -{{- end }} diff --git a/charts/kubezero-addons/templates/forseti/rbac.yaml b/charts/kubezero-addons/templates/forseti/rbac.yaml deleted file mode 100644 index 7eb3f242..00000000 --- a/charts/kubezero-addons/templates/forseti/rbac.yaml +++ /dev/null @@ -1,104 +0,0 @@ -{{- if .Values.forseti.enabled }} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: kubezero-forseti - namespace: kube-system ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: kubezero-forseti-manager -rules: -- apiGroups: - - "" - resources: - - nodes - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - "" - resources: - - nodes/finalizers - verbs: - - update -- apiGroups: - - "" - resources: - - nodes/status - verbs: - - get - - patch - - update ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: forseti-leader-election - namespace: kube-system -rules: -- apiGroups: - - "" - resources: - - configmaps - verbs: - - get - - list - - watch - - create - - update - - patch - - delete -- apiGroups: - - coordination.k8s.io - resources: - - leases - verbs: - - get - - list - - watch - - create - - update - - patch - - delete -- apiGroups: - - "" - resources: - - events - verbs: - - create - - patch ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: kubezero-forseti-manager -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: kubezero-forseti-manager -subjects: - - kind: ServiceAccount - name: kubezero-forseti - namespace: kube-system ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: forseti-leader-election - namespace: kube-system -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: forseti-leader-election -subjects: -- kind: ServiceAccount - name: kubezero-forseti - namespace: kube-system -{{- end }} diff --git a/charts/kubezero-addons/templates/forseti/service.yaml b/charts/kubezero-addons/templates/forseti/service.yaml deleted file mode 100644 index 511204ad..00000000 --- a/charts/kubezero-addons/templates/forseti/service.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{- if .Values.forseti.enabled }} -apiVersion: v1 -kind: Service -metadata: - labels: - app: kubezero-forseti - name: forseti-metrics-service - namespace: kube-system -spec: - ports: - - name: http - port: 8080 - protocol: TCP - selector: - app: kubezero-forseti -{{- end }} diff --git a/charts/kubezero-addons/update.sh b/charts/kubezero-addons/update.sh deleted file mode 100755 index 4b2cf201..00000000 --- a/charts/kubezero-addons/update.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -set -ex - -helm repo update - -NTH_VERSION=$(yq eval '.dependencies[] | select(.name=="aws-node-termination-handler") | .version' Chart.yaml) -RUH_VERSION=$(yq eval '.dependencies[] | select(.name=="aws-eks-asg-rolling-update-handler") | .version' Chart.yaml) - -rm -rf charts/aws-node-termination-handler -helm pull eks/aws-node-termination-handler --untar --untardir charts --version $NTH_VERSION - -# diff -tuNr charts/aws-node-termination-handler.orig charts/aws-node-termination-handler > nth.patch -patch -p0 -i nth.patch --no-backup-if-mismatch - -rm -rf charts/aws-eks-asg-rolling-update-handler -helm pull twin/aws-eks-asg-rolling-update-handler --untar --untardir charts --version $RUH_VERSION -patch -p0 -i ruh.patch --no-backup-if-mismatch - -helm dep update diff --git a/charts/kubezero-addons/values.yaml b/charts/kubezero-addons/values.yaml deleted file mode 100644 index 8df68ea9..00000000 --- a/charts/kubezero-addons/values.yaml +++ /dev/null @@ -1,325 +0,0 @@ -clusterBackup: - enabled: false - - image: - name: public.ecr.aws/zero-downtime/kubezero-admin - # tag: v1.22.8 - - # -- s3:https://s3.amazonaws.com/${CFN[ConfigBucket]}/k8s/${CLUSTERNAME}/clusterBackup - repository: "" - # -- /etc/cloudbender/clusterBackup.passphrase - password: "" - - extraEnv: [] - -forseti: - enabled: false - - image: - name: public.ecr.aws/zero-downtime/forseti - tag: v0.1.2 - - aws: - region: "" - # -- "arn:aws:iam::${AWS::AccountId}:role/${AWS::Region}.${ClusterName}.kubezeroForseti" - iamRoleArn: "" - -sealed-secrets: - enabled: false - - # ensure kubeseal default values match - fullnameOverride: sealed-secrets-controller - - # Disable auto keyrotation for now - keyrenewperiod: "0" - - resources: - requests: - cpu: 10m - memory: 24Mi - limits: - memory: 128Mi - - metrics: - serviceMonitor: - enabled: false - - nodeSelector: - node-role.kubernetes.io/control-plane: "" - tolerations: - - key: node-role.kubernetes.io/control-plane - effect: NoSchedule - -aws-eks-asg-rolling-update-handler: - enabled: false - image: - tag: v1.7.0 - - environmentVars: - - name: CLUSTER_NAME - value: "" - - name: AWS_REGION - value: us-west-2 - - name: EXECUTION_INTERVAL - value: "60" - - name: METRICS - value: "true" - - name: EAGER_CORDONING - value: "true" - # Only disable if all services have PDBs across AZs - - name: SLOW_MODE - value: "true" - - name: AWS_ROLE_ARN - value: "" - - name: AWS_WEB_IDENTITY_TOKEN_FILE - value: "/var/run/secrets/sts.amazonaws.com/serviceaccount/token" - - name: AWS_STS_REGIONAL_ENDPOINTS - value: "regional" - - resources: - requests: - cpu: 10m - memory: 32Mi - limits: - memory: 128Mi - - nodeSelector: - node-role.kubernetes.io/control-plane: "" - tolerations: - - key: node-role.kubernetes.io/control-plane - effect: NoSchedule - -aws-node-termination-handler: - enabled: false - - fullnameOverride: "aws-node-termination-handler" - - checkASGTagBeforeDraining: false - # -- "zdt:kubezero:nth:${ClusterName}" - managedTag: "zdt:kubezero:nth:${ClusterName}" - - useProviderId: true - enableSqsTerminationDraining: true - # otherwise pds fails trying to reach IMDS - enableSpotInterruptionDraining: false - enableProbesServer: true - deleteLocalData: true - ignoreDaemonSets: true - taintNode: true - emitKubernetesEvents: true - - # -- https://sqs.${AWS::Region}.amazonaws.com/${AWS::AccountId}/${ClusterName}_Nth - queueURL: "" - - metadataTries: 0 - extraEnv: - # -- "arn:aws:iam::${AWS::AccountId}:role/${AWS::Region}.${ClusterName}.awsNth" - - name: AWS_ROLE_ARN - value: "" - - name: AWS_WEB_IDENTITY_TOKEN_FILE - value: "/var/run/secrets/sts.amazonaws.com/serviceaccount/token" - - name: AWS_STS_REGIONAL_ENDPOINTS - value: "regional" - - enablePrometheusServer: false - podMonitor: - create: false - - jsonLogging: true - logFormatVersion: 2 - - tolerations: - - key: node-role.kubernetes.io/control-plane - effect: NoSchedule - nodeSelector: - node-role.kubernetes.io/control-plane: "" - - rbac: - pspEnabled: false - -fuseDevicePlugin: - enabled: false - -awsNeuron: - enabled: false - - image: - name: public.ecr.aws/neuron/neuron-device-plugin - tag: 1.9.3.0 - -nvidia-device-plugin: - enabled: false - tolerations: - - key: nvidia.com/gpu - operator: Exists - effect: NoSchedule - - key: kubezero-workergroup - effect: NoSchedule - operator: Exists - - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: "node.kubernetes.io/instance-type" - operator: In - values: - - g5.xlarge - - g5.2xlarge - - g5.4xlarge - - g5.8xlarge - - g5.12xlarge - - g5.16xlarge - - g5.24xlarge - - g5.48xlarge - - g4dn.xlarge - - g4dn.2xlarge - - g4dn.4xlarge - - g4dn.8xlarge - - g4dn.12xlarge - - g4dn.16xlarge - -cluster-autoscaler: - enabled: false - - image: - tag: v1.25.1 - - autoDiscovery: - clusterName: "" - awsRegion: "us-west-2" - - serviceMonitor: - enabled: false - interval: 30s - - prometheusRule: - enabled: false - interval: "30" - - # Disable pdb for now - podDisruptionBudget: false - - extraArgs: - scan-interval: 30s - skip-nodes-with-local-storage: false - balance-similar-node-groups: true - ignore-taint: "node.cilium.io/agent-not-ready" - - #securityContext: - # runAsNonRoot: true - - nodeSelector: - node-role.kubernetes.io/control-plane: "" - tolerations: - - key: node-role.kubernetes.io/control-plane - effect: NoSchedule - - # On AWS enable Projected Service Accounts to assume IAM role - #extraEnv: - # AWS_ROLE_ARN: - # AWS_WEB_IDENTITY_TOKEN_FILE: "/var/run/secrets/sts.amazonaws.com/serviceaccount/token" - # AWS_STS_REGIONAL_ENDPOINTS: "regional" - - #extraVolumes: - #- name: aws-token - # projected: - # sources: - # - serviceAccountToken: - # path: token - # expirationSeconds: 86400 - # audience: "sts.amazonaws.com" - - #extraVolumeMounts: - #- name: aws-token - # mountPath: "/var/run/secrets/sts.amazonaws.com/serviceaccount/" - # readOnly: true - -external-dns: - enabled: false - - interval: 3m - triggerLoopOnEvent: true - - tolerations: - - key: node-role.kubernetes.io/control-plane - effect: NoSchedule - nodeSelector: - node-role.kubernetes.io/control-plane: "" - - #logLevel: debug - sources: - - service - #- istio-gateway - - provider: inmemory - -falco-control-plane: - enabled: false - - fullnameOverride: falco-control-plane - - # -- Disable the drivers since we want to deploy only the k8saudit plugin. - driver: - enabled: false - - # -- Disable the collectors, no syscall events to enrich with metadata. - collectors: - enabled: false - - nodeSelector: - node-role.kubernetes.io/control-plane: "" - - # -- Deploy Falco as a deployment. One instance of Falco is enough. Anyway the number of replicas is configurabale. - controller: - kind: deployment - deployment: - # -- Number of replicas when installing Falco using a deployment. Change it if you really know what you are doing. - # For more info check the section on Plugins in the README.md file. - replicas: 1 - - - falcoctl: - artifact: - install: - # -- Enable the init container. We do not recommend installing (or following) plugins for security reasons since they are executable objects. - enabled: true - follow: - # -- Enable the sidecar container. We do not support it yet for plugins. It is used only for rules feed such as k8saudit-rules rules. - enabled: true - config: - artifact: - install: - # -- Do not resolve the depenencies for artifacts. By default is true, but for our use case we disable it. - resolveDeps: false - # -- List of artifacts to be installed by the falcoctl init container. - # Only rulesfiles, we do no recommend plugins for security reasonts since they are executable objects. - refs: [k8saudit-rules:0.6] - follow: - # -- List of artifacts to be followed by the falcoctl sidecar container. - # Only rulesfiles, we do no recommend plugins for security reasonts since they are executable objects. - refs: [k8saudit-rules:0.6] - - services: - - name: k8saudit-webhook - ports: - - port: 9765 # See plugin open_params - protocol: TCP - - falco: - rules_file: - - /etc/falco/k8s_audit_rules.yaml - - /etc/falco/rules.d - plugins: - - name: k8saudit - library_path: libk8saudit.so - init_config: - maxEventBytes: 1048576 - # sslCertificate: /etc/falco/falco.pem - open_params: "http://:9765/k8s-audit" - - name: json - library_path: libjson.so - init_config: "" - # Plugins that Falco will load. Note: the same plugins are installed by the falcoctl-artifact-install init container. - load_plugins: [k8saudit, json] diff --git a/charts/kubezero-argocd/Chart.yaml b/charts/kubezero-argocd/Chart.yaml deleted file mode 100644 index da012b35..00000000 --- a/charts/kubezero-argocd/Chart.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: v2 -description: KubeZero ArgoCD - config, branding, image-updater (optional) -name: kubezero-argocd -version: 0.13.0 -home: https://kubezero.com -icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png -keywords: - - kubezero - - argocd - - argocd-image-updater -maintainers: - - name: Stefan Reimer - email: stefan@zero-downtime.net -# Url: https://github.com/argoproj/argo-helm/tree/main/charts -dependencies: - - name: kubezero-lib - version: ">= 0.1.6" - repository: https://cdn.zero-downtime.net/charts/ - - name: argo-cd - version: 5.37.1 - repository: https://argoproj.github.io/argo-helm - - name: argocd-apps - version: 1.2.0 - repository: https://argoproj.github.io/argo-helm - - name: argocd-image-updater - version: 0.9.1 - repository: https://argoproj.github.io/argo-helm - condition: argocd-image-updater.enabled -kubeVersion: ">= 1.26.0" diff --git a/charts/kubezero-argocd/README.md b/charts/kubezero-argocd/README.md deleted file mode 100644 index 363d1840..00000000 --- a/charts/kubezero-argocd/README.md +++ /dev/null @@ -1,74 +0,0 @@ -# kubezero-argocd - -![Version: 0.12.0](https://img.shields.io/badge/Version-0.12.0-informational?style=flat-square) - -KubeZero ArgoCD - config, branding, image-updater (optional) - -**Homepage:** - -## Maintainers - -| Name | Email | Url | -| ---- | ------ | --- | -| Stefan Reimer | | | - -## Requirements - -Kubernetes: `>= 1.25.0` - -| Repository | Name | Version | -|------------|------|---------| -| https://argoproj.github.io/argo-helm | argo-cd | 5.28.2 | -| https://argoproj.github.io/argo-helm | argocd-apps | 0.0.9 | -| https://argoproj.github.io/argo-helm | argocd-image-updater | 0.8.5 | -| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 | - -## Values - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| argo-cd.applicationSet.enabled | bool | `false` | | -| argo-cd.configs.cm."resource.customizations" | string | `"cert-manager.io/Certificate:\n # Lua script for customizing the health status assessment\n health.lua: |\n hs = {}\n if obj.status ~= nil then\n if obj.status.conditions ~= nil then\n for i, condition in ipairs(obj.status.conditions) do\n if condition.type == \"Ready\" and condition.status == \"False\" then\n hs.status = \"Degraded\"\n hs.message = condition.message\n return hs\n end\n if condition.type == \"Ready\" and condition.status == \"True\" then\n hs.status = \"Healthy\"\n hs.message = condition.message\n return hs\n end\n end\n end\n end\n hs.status = \"Progressing\"\n hs.message = \"Waiting for certificate\"\n return hs\n"` | | -| argo-cd.configs.cm."timeout.reconciliation" | int | `300` | | -| argo-cd.configs.cm."ui.bannercontent" | string | `"KubeZero v1.25 - Release notes"` | | -| argo-cd.configs.cm."ui.bannerpermanent" | string | `"true"` | | -| argo-cd.configs.cm."ui.bannerposition" | string | `"bottom"` | | -| argo-cd.configs.cm."ui.bannerurl" | string | `"https://kubezero.com/releases/v1.25"` | | -| argo-cd.configs.cm.url | string | `"argocd.example.com"` | | -| argo-cd.configs.knownHosts.data.ssh_known_hosts | string | `"bitbucket.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPIQmuzMBuKdWeF4+a2sjSSpBK0iqitSQ+5BM9KhpexuGt20JpTVM7u5BDZngncgrqDMbWdxMWWOGtZ9UgbqgZE=\nbitbucket.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIazEu89wgQZ4bqs3d63QSMzYVa0MuJ2e2gKTKqu+UUO\nbitbucket.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDQeJzhupRu0u0cdegZIa8e86EG2qOCsIsD1Xw0xSeiPDlCr7kq97NLmMbpKTX6Esc30NuoqEEHCuc7yWtwp8dI76EEEB1VqY9QJq6vk+aySyboD5QF61I/1WeTwu+deCbgKMGbUijeXhtfbxSxm6JwGrXrhBdofTsbKRUsrN1WoNgUa8uqN1Vx6WAJw1JHPhglEGGHea6QICwJOAr/6mrui/oB7pkaWKHj3z7d1IC4KWLtY47elvjbaTlkN04Kc/5LFEirorGYVbt15kAUlqGM65pk6ZBxtaO3+30LVlORZkxOh+LKL/BvbZ/iRNhItLqNyieoQj/uh/7Iv4uyH/cV/0b4WDSd3DptigWq84lJubb9t/DnZlrJazxyDCulTmKdOR7vs9gMTo+uoIrPSb8ScTtvw65+odKAlBj59dhnVp9zd7QUojOpXlL62Aw56U4oO+FALuevvMjiWeavKhJqlR7i5n9srYcrNV7ttmDw7kf/97P5zauIhxcjX+xHv4M=\ngithub.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=\ngithub.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl\ngithub.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==\ngitlab.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFSMqzJeV9rUzU4kWitGjeR4PWSa29SPqJ1fVkhtj3Hw9xjLVXVYrU9QlYWrOLXBpQ6KWjbjTDTdDkoohFzgbEY=\ngitlab.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAfuCHKVTjquxvt6CM6tdG4SLp1Btn/nOeHHE5UOzRdf\ngitlab.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCsj2bNKTBSpIYDEGk9KxsGh3mySTRgMtXL583qmBpzeQ+jqCMRgBqB98u3z++J1sKlXHWfM9dyhSevkMwSbhoR8XIq/U0tCNyokEi/ueaBMCvbcTHhO7FcwzY92WK4Yt0aGROY5qX2UKSeOvuP4D6TPqKF1onrSzH9bx9XUf2lEdWT/ia1NEKjunUqu1xOB/StKDHMoX4/OKyIzuS0q/T1zOATthvasJFoPrAjkohTyaDUz2LN5JoH839hViyEG82yB+MjcFV5MU3N1l1QL3cVUCh93xSaua1N85qivl+siMkPGbO5xR/En4iEY6K2XPASUEMaieWVNTRCtJ4S8H+9\ngit.zero-downtime.net ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC8YdJ4YcOK7A0K7qOWsRjCS+wHTStXRcwBe7gjG43HPSNijiCKoGf/c+tfNsRhyouawg7Law6M6ahmS/jKWBpznRIM+OdOFVSuhnK/nr6h6wG3/ZfdLicyAPvx1/STGY/Fc6/zXA88i/9PV+g84gSVmhf3fGY92wokiASiu9DU4T9dT1gIkdyOX6fbMi1/mMKLSrHnAQcjyasYDvw9ISCJ95EoSwbj7O4c+7jo9fxYvdCfZZZAEZGozTRLAAO0AnjVcRah7bZV/jfHJuhOipV/TB7UVAhlVv1dfGV7hoTp9UKtKZFJF4cjIrSGxqQA/mdhSdLgkepK7yc4Jp2xGnaarhY29DfqsQqop+ugFpTbj7Xy5Rco07mXc6XssbAZhI1xtCOX20N4PufBuYippCK5AE6AiAyVtJmvfGQk4HP+TjOyhFo7PZm3wc9Hym7IBBVC0Sl30K8ddufkAgHwNGvvu1ZmD9ZWaMOXJDHBCZGMMr16QREZwVtZTwMEQalc7/yqmuqMhmcJIfs/GA2Lt91y+pq9C8XyeUL0VFPch0vkcLSRe3ghMZpRFJ/ht307xPcLzgTJqN6oQtNNDzSQglSEjwhge2K4GyWcIh+oGsWxWz5dHyk1iJmw90Y976BZIl/mYVgbTtZAJ81oGe/0k5rAe+LDL+Yq6tG28QFOg0QmiQ==\n"` | | -| argo-cd.configs.params."controller.operation.processors" | string | `"5"` | | -| argo-cd.configs.params."controller.status.processors" | string | `"10"` | | -| argo-cd.configs.params."server.enable.gzip" | bool | `true` | | -| argo-cd.configs.params."server.insecure" | bool | `true` | | -| argo-cd.configs.secret.createSecret | bool | `false` | | -| argo-cd.configs.styles | string | `".sidebar__logo img { content: url(https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png); }\n.sidebar { background: linear-gradient(to bottom, #6A4D79, #493558, #2D1B30, #0D0711); }\n"` | | -| argo-cd.controller.metrics.enabled | bool | `false` | | -| argo-cd.controller.metrics.serviceMonitor.enabled | bool | `true` | | -| argo-cd.controller.resources.requests.cpu | string | `"100m"` | | -| argo-cd.controller.resources.requests.memory | string | `"256Mi"` | | -| argo-cd.dex.enabled | bool | `false` | | -| argo-cd.global.logging.format | string | `"json"` | | -| argo-cd.notifications.enabled | bool | `false` | | -| argo-cd.repoServer.metrics.enabled | bool | `false` | | -| argo-cd.repoServer.metrics.serviceMonitor.enabled | bool | `true` | | -| argo-cd.server.metrics.enabled | bool | `false` | | -| argo-cd.server.metrics.serviceMonitor.enabled | bool | `true` | | -| argo-cd.server.service.servicePortHttpsName | string | `"grpc"` | | -| argocd-apps.applications | list | `[]` | | -| argocd-apps.projects | list | `[]` | | -| argocd-image-updater.authScripts.enabled | bool | `true` | | -| argocd-image-updater.authScripts.scripts."ecr-login.sh" | string | `"#!/bin/sh\naws ecr --region $AWS_REGION get-authorization-token --output text --query 'authorizationData[].authorizationToken' | base64 -d\n"` | | -| argocd-image-updater.authScripts.scripts."ecr-public-login.sh" | string | `"#!/bin/sh\naws ecr-public --region us-east-1 get-authorization-token --output text --query 'authorizationData.authorizationToken' | base64 -d\n"` | | -| argocd-image-updater.config.argocd.plaintext | bool | `true` | | -| argocd-image-updater.enabled | bool | `false` | | -| argocd-image-updater.fullnameOverride | string | `"argocd-image-updater"` | | -| argocd-image-updater.metrics.enabled | bool | `false` | | -| argocd-image-updater.metrics.serviceMonitor.enabled | bool | `true` | | -| argocd-image-updater.sshConfig.config | string | `"Host *\n PubkeyAcceptedAlgorithms +ssh-rsa\n HostkeyAlgorithms +ssh-rsa\n"` | | -| istio.enabled | bool | `false` | Deploy Istio VirtualService to expose ArgoCD | -| istio.gateway | string | `"istio-ingress/ingressgateway"` | Name of the Istio gateway to add the VirtualService to | -| istio.ipBlocks | list | `[]` | | - -## Resources -- https://argoproj.github.io/argo-cd/operator-manual/metrics/ -- https://raw.githubusercontent.com/argoproj/argo-cd/master/examples/dashboard.json diff --git a/charts/kubezero-argocd/README.md.gotmpl b/charts/kubezero-argocd/README.md.gotmpl deleted file mode 100644 index 63b02508..00000000 --- a/charts/kubezero-argocd/README.md.gotmpl +++ /dev/null @@ -1,20 +0,0 @@ -{{ template "chart.header" . }} -{{ template "chart.deprecationWarning" . }} - -{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }} - -{{ template "chart.description" . }} - -{{ template "chart.homepageLine" . }} - -{{ template "chart.maintainersSection" . }} - -{{ template "chart.sourcesSection" . }} - -{{ template "chart.requirementsSection" . }} - -{{ template "chart.valuesSection" . }} - -## Resources -- https://argoproj.github.io/argo-cd/operator-manual/metrics/ -- https://raw.githubusercontent.com/argoproj/argo-cd/master/examples/dashboard.json diff --git a/charts/kubezero-argocd/dashboards.yaml b/charts/kubezero-argocd/dashboards.yaml deleted file mode 100644 index 86f759d8..00000000 --- a/charts/kubezero-argocd/dashboards.yaml +++ /dev/null @@ -1,9 +0,0 @@ -configmap: grafana-dashboards -gzip: true -condition: 'index .Values "argo-cd" "controller" "metrics" "enabled"' -folder: KubeZero -dashboards: -- name: ArgoCD - url: https://grafana.com/api/dashboards/14584/revisions/1/download - tags: - - ArgoCD diff --git a/charts/kubezero-argocd/templates/grafana-dashboards.yaml b/charts/kubezero-argocd/templates/grafana-dashboards.yaml deleted file mode 100644 index 26895285..00000000 --- a/charts/kubezero-argocd/templates/grafana-dashboards.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if index .Values "argo-cd" "controller" "metrics" "enabled" }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ printf "%s-%s" (include "kubezero-lib.fullname" $) "grafana-dashboards" | trunc 63 | trimSuffix "-" }} - namespace: {{ .Release.Namespace }} - labels: - grafana_dashboard: "1" - {{- include "kubezero-lib.labels" . | nindent 4 }} - annotations: - k8s-sidecar-target-directory: KubeZero -binaryData: - ArgoCD.json.gz: - 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 -{{- end }} diff --git a/charts/kubezero-argocd/templates/istio-authorization-policy.yaml b/charts/kubezero-argocd/templates/istio-authorization-policy.yaml deleted file mode 100644 index cb313733..00000000 --- a/charts/kubezero-argocd/templates/istio-authorization-policy.yaml +++ /dev/null @@ -1,28 +0,0 @@ -{{- if .Values.istio.enabled }} -{{- if .Values.istio.ipBlocks }} -apiVersion: security.istio.io/v1beta1 -kind: AuthorizationPolicy -metadata: - name: argocd-deny-not-in-ipblocks - namespace: istio-system - labels: - {{- include "kubezero-lib.labels" . | nindent 4 }} -spec: - selector: - matchLabels: - app: istio-ingressgateway - action: DENY - rules: - - from: - - source: - notIpBlocks: - {{- toYaml .Values.istio.ipBlocks | nindent 8 }} - to: - - operation: - hosts: [{{ index .Values "argo-cd" "configs" "cm" "url" | quote }}] - when: - - key: connection.sni - values: - - '*' -{{- end }} -{{- end }} diff --git a/charts/kubezero-argocd/templates/istio-service.yaml b/charts/kubezero-argocd/templates/istio-service.yaml deleted file mode 100644 index a5bfbbdd..00000000 --- a/charts/kubezero-argocd/templates/istio-service.yaml +++ /dev/null @@ -1,31 +0,0 @@ -{{- if .Values.istio.enabled }} -apiVersion: networking.istio.io/v1alpha3 -kind: VirtualService -metadata: - name: argocd-server - namespace: {{ $.Release.Namespace }} - labels: - {{- include "kubezero-lib.labels" . | nindent 4 }} -spec: - gateways: - - {{ .Values.istio.gateway }} - hosts: - - {{ index .Values "argo-cd" "configs" "cm" "url" }} - http: - - name: grpc - match: - - headers: - user-agent: - prefix: argocd-client - route: - - destination: - host: argocd-server - port: - number: 443 - - name: http - route: - - destination: - host: argocd-server - port: - number: 80 -{{- end }} diff --git a/charts/kubezero-argocd/update.sh b/charts/kubezero-argocd/update.sh deleted file mode 100755 index 035ab68d..00000000 --- a/charts/kubezero-argocd/update.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -helm dep update - -# Create ZDT dashboard configmap -../kubezero-metrics/sync_grafana_dashboards.py dashboards.yaml templates/grafana-dashboards.yaml diff --git a/charts/kubezero-argocd/values.yaml b/charts/kubezero-argocd/values.yaml deleted file mode 100644 index b10603d1..00000000 --- a/charts/kubezero-argocd/values.yaml +++ /dev/null @@ -1,162 +0,0 @@ -# Support for Istio Ingress for ArgoCD -istio: - # istio.enabled -- Deploy Istio VirtualService to expose ArgoCD - enabled: false - # istio.gateway -- Name of the Istio gateway to add the VirtualService to - gateway: istio-ingress/ingressgateway - ipBlocks: [] - -argocd-apps: - projects: [] - applications: [] - -argo-cd: - #configs: - # secret: - # `htpasswd -nbBC 10 "" $ARGO_PWD | tr -d ':\n' | sed 's/$2y/$2a/'` - # argocdServerAdminPassword: "$2a$10$ivKzaXVxMqdeDSfS3nqi1Od3iDbnL7oXrixzDfZFRHlXHnAG6LydG" - # argocdServerAdminPasswordMtime: "2020-04-24T15:33:09BST" - - global: - logging: - format: json - # image: - # tag: v2.1.6 - - configs: - styles: | - .sidebar__logo img { content: url(https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png); } - .sidebar__logo__text-logo { height: 0em; } - .sidebar { background: linear-gradient(to bottom, #6A4D79, #493558, #2D1B30, #0D0711); } - - cm: - ui.bannercontent: "KubeZero v1.25 - Release notes" - ui.bannerurl: "https://kubezero.com/releases/v1.25" - ui.bannerpermanent: "true" - ui.bannerposition: "bottom" - - # argo-cd.server.config.url -- ArgoCD hostname to be exposed via Istio - url: argocd.example.com - - timeout.reconciliation: 300 - - resource.customizations: | - cert-manager.io/Certificate: - # Lua script for customizing the health status assessment - health.lua: | - hs = {} - if obj.status ~= nil then - if obj.status.conditions ~= nil then - for i, condition in ipairs(obj.status.conditions) do - if condition.type == "Ready" and condition.status == "False" then - hs.status = "Degraded" - hs.message = condition.message - return hs - end - if condition.type == "Ready" and condition.status == "True" then - hs.status = "Healthy" - hs.message = condition.message - return hs - end - end - end - end - hs.status = "Progressing" - hs.message = "Waiting for certificate" - return hs - - secret: - createSecret: false - - knownHosts: - data: - ssh_known_hosts: | - bitbucket.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPIQmuzMBuKdWeF4+a2sjSSpBK0iqitSQ+5BM9KhpexuGt20JpTVM7u5BDZngncgrqDMbWdxMWWOGtZ9UgbqgZE= - bitbucket.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIazEu89wgQZ4bqs3d63QSMzYVa0MuJ2e2gKTKqu+UUO - bitbucket.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDQeJzhupRu0u0cdegZIa8e86EG2qOCsIsD1Xw0xSeiPDlCr7kq97NLmMbpKTX6Esc30NuoqEEHCuc7yWtwp8dI76EEEB1VqY9QJq6vk+aySyboD5QF61I/1WeTwu+deCbgKMGbUijeXhtfbxSxm6JwGrXrhBdofTsbKRUsrN1WoNgUa8uqN1Vx6WAJw1JHPhglEGGHea6QICwJOAr/6mrui/oB7pkaWKHj3z7d1IC4KWLtY47elvjbaTlkN04Kc/5LFEirorGYVbt15kAUlqGM65pk6ZBxtaO3+30LVlORZkxOh+LKL/BvbZ/iRNhItLqNyieoQj/uh/7Iv4uyH/cV/0b4WDSd3DptigWq84lJubb9t/DnZlrJazxyDCulTmKdOR7vs9gMTo+uoIrPSb8ScTtvw65+odKAlBj59dhnVp9zd7QUojOpXlL62Aw56U4oO+FALuevvMjiWeavKhJqlR7i5n9srYcrNV7ttmDw7kf/97P5zauIhxcjX+xHv4M= - github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg= - github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl - github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== - gitlab.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFSMqzJeV9rUzU4kWitGjeR4PWSa29SPqJ1fVkhtj3Hw9xjLVXVYrU9QlYWrOLXBpQ6KWjbjTDTdDkoohFzgbEY= - gitlab.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAfuCHKVTjquxvt6CM6tdG4SLp1Btn/nOeHHE5UOzRdf - gitlab.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCsj2bNKTBSpIYDEGk9KxsGh3mySTRgMtXL583qmBpzeQ+jqCMRgBqB98u3z++J1sKlXHWfM9dyhSevkMwSbhoR8XIq/U0tCNyokEi/ueaBMCvbcTHhO7FcwzY92WK4Yt0aGROY5qX2UKSeOvuP4D6TPqKF1onrSzH9bx9XUf2lEdWT/ia1NEKjunUqu1xOB/StKDHMoX4/OKyIzuS0q/T1zOATthvasJFoPrAjkohTyaDUz2LN5JoH839hViyEG82yB+MjcFV5MU3N1l1QL3cVUCh93xSaua1N85qivl+siMkPGbO5xR/En4iEY6K2XPASUEMaieWVNTRCtJ4S8H+9 - git.zero-downtime.net ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC8YdJ4YcOK7A0K7qOWsRjCS+wHTStXRcwBe7gjG43HPSNijiCKoGf/c+tfNsRhyouawg7Law6M6ahmS/jKWBpznRIM+OdOFVSuhnK/nr6h6wG3/ZfdLicyAPvx1/STGY/Fc6/zXA88i/9PV+g84gSVmhf3fGY92wokiASiu9DU4T9dT1gIkdyOX6fbMi1/mMKLSrHnAQcjyasYDvw9ISCJ95EoSwbj7O4c+7jo9fxYvdCfZZZAEZGozTRLAAO0AnjVcRah7bZV/jfHJuhOipV/TB7UVAhlVv1dfGV7hoTp9UKtKZFJF4cjIrSGxqQA/mdhSdLgkepK7yc4Jp2xGnaarhY29DfqsQqop+ugFpTbj7Xy5Rco07mXc6XssbAZhI1xtCOX20N4PufBuYippCK5AE6AiAyVtJmvfGQk4HP+TjOyhFo7PZm3wc9Hym7IBBVC0Sl30K8ddufkAgHwNGvvu1ZmD9ZWaMOXJDHBCZGMMr16QREZwVtZTwMEQalc7/yqmuqMhmcJIfs/GA2Lt91y+pq9C8XyeUL0VFPch0vkcLSRe3ghMZpRFJ/ht307xPcLzgTJqN6oQtNNDzSQglSEjwhge2K4GyWcIh+oGsWxWz5dHyk1iJmw90Y976BZIl/mYVgbTtZAJ81oGe/0k5rAe+LDL+Yq6tG28QFOg0QmiQ== - - params: - controller.status.processors: "10" - controller.operation.processors: "5" - - server.insecure: true - server.enable.gzip: true - - controller: - metrics: - enabled: false - serviceMonitor: - enabled: true - - resources: - # limits: - # cpu: 500m - # memory: 2048Mi - requests: - cpu: 100m - memory: 256Mi - - repoServer: - metrics: - enabled: false - serviceMonitor: - enabled: true - - server: - # Rename former https port to grpc, works with istio + insecure - service: - servicePortHttpsName: grpc - metrics: - enabled: false - serviceMonitor: - enabled: true - - # redis: - # We might want to try to keep redis close to the controller - # affinity: - - dex: - enabled: false - - applicationSet: - enabled: false - - notifications: - enabled: false - -argocd-image-updater: - enabled: false - - # Unify all ArgoCD pieces under the same argocd namespace - fullnameOverride: argocd-image-updater - - config: - argocd: - plaintext: true - - metrics: - enabled: false - serviceMonitor: - enabled: true - - authScripts: - enabled: true - scripts: - ecr-login.sh: | - #!/bin/sh - aws ecr --region $AWS_REGION get-authorization-token --output text --query 'authorizationData[].authorizationToken' | base64 -d - ecr-public-login.sh: | - #!/bin/sh - aws ecr-public --region us-east-1 get-authorization-token --output text --query 'authorizationData.authorizationToken' | base64 -d - sshConfig: - config: | - Host * - PubkeyAcceptedAlgorithms +ssh-rsa - HostkeyAlgorithms +ssh-rsa diff --git a/charts/kubezero-auth/Chart.yaml b/charts/kubezero-auth/Chart.yaml deleted file mode 100644 index 452a186e..00000000 --- a/charts/kubezero-auth/Chart.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: v2 -name: kubezero-auth -description: KubeZero umbrella chart for all things Authentication and Identity management -type: application -version: 0.3.5 -appVersion: 21.1.1 -home: https://kubezero.com -icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png -keywords: - - kubezero - - keycloak -maintainers: - - name: Stefan Reimer - email: stefan@zero-downtime.net -dependencies: - - name: kubezero-lib - version: ">= 0.1.6" - repository: https://cdn.zero-downtime.net/charts/ - - name: postgresql - version: 11.8.1 - repository: https://charts.bitnami.com/bitnami - condition: postgresql.enabled -kubeVersion: ">= 1.25.0" diff --git a/charts/kubezero-auth/README.md b/charts/kubezero-auth/README.md deleted file mode 100644 index 5fd3eceb..00000000 --- a/charts/kubezero-auth/README.md +++ /dev/null @@ -1,53 +0,0 @@ -# kubezero-auth - -![Version: 0.3.5](https://img.shields.io/badge/Version-0.3.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 21.1.1](https://img.shields.io/badge/AppVersion-21.1.1-informational?style=flat-square) - -KubeZero umbrella chart for all things Authentication and Identity management - -**Homepage:** - -## Maintainers - -| Name | Email | Url | -| ---- | ------ | --- | -| Stefan Reimer | | | - -## Requirements - -Kubernetes: `>= 1.25.0` - -| Repository | Name | Version | -|------------|------|---------| -| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 | -| https://charts.bitnami.com/bitnami | postgresql | 11.8.1 | - -# Keycloak - -## Operator - -https://github.com/keycloak/keycloak/tree/main/operator -https://github.com/aerogear/keycloak-metrics-spi -https://github.com/keycloak/keycloak-benchmark/tree/main/provision/minikube/keycloak/templates - -## Resources - -- Codecentric Helm chart: `https://github.com/codecentric/helm-charts/tree/master/charts/keycloak` -- custom image: `https://www.keycloak.org/server/containers` - -## Values - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| keycloak.enabled | bool | `false` | | -| keycloak.istio.enabled | bool | `false` | | -| keycloak.istio.gateway | string | `"istio-ingress/private-ingressgateway"` | | -| keycloak.istio.url | string | `""` | | -| keycloak.metrics.enabled | bool | `false` | | -| keycloak.podDisruptionBudget.minAvailable | int | `1` | | -| keycloak.replicas | int | `1` | | -| postgresql.auth.database | string | `"keycloak"` | | -| postgresql.auth.existingSecret | string | `"kubezero-auth-postgresql"` | | -| postgresql.auth.username | string | `"keycloak"` | | -| postgresql.enabled | bool | `false` | | -| postgresql.primary.persistence.size | string | `"1Gi"` | | -| postgresql.readReplicas.replicaCount | int | `0` | | diff --git a/charts/kubezero-auth/README.md.gotmpl b/charts/kubezero-auth/README.md.gotmpl deleted file mode 100644 index c0b6241a..00000000 --- a/charts/kubezero-auth/README.md.gotmpl +++ /dev/null @@ -1,29 +0,0 @@ -{{ template "chart.header" . }} -{{ template "chart.deprecationWarning" . }} - -{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }} - -{{ template "chart.description" . }} - -{{ template "chart.homepageLine" . }} - -{{ template "chart.maintainersSection" . }} - -{{ template "chart.sourcesSection" . }} - -{{ template "chart.requirementsSection" . }} - -# Keycloak - -## Operator - -https://github.com/keycloak/keycloak/tree/main/operator -https://github.com/aerogear/keycloak-metrics-spi -https://github.com/keycloak/keycloak-benchmark/tree/main/provision/minikube/keycloak/templates - -## Resources - -- Codecentric Helm chart: `https://github.com/codecentric/helm-charts/tree/master/charts/keycloak` -- custom image: `https://www.keycloak.org/server/containers` - -{{ template "chart.valuesSection" . }} diff --git a/charts/kubezero-auth/crds/keycloak-realmimports.yaml b/charts/kubezero-auth/crds/keycloak-realmimports.yaml deleted file mode 100644 index b617a305..00000000 --- a/charts/kubezero-auth/crds/keycloak-realmimports.yaml +++ /dev/null @@ -1,2248 +0,0 @@ -# Generated by Fabric8 CRDGenerator, manual edits might get overwritten! -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - name: keycloakrealmimports.k8s.keycloak.org -spec: - group: k8s.keycloak.org - names: - kind: KeycloakRealmImport - plural: keycloakrealmimports - singular: keycloakrealmimport - scope: Namespaced - versions: - - name: v2alpha1 - schema: - openAPIV3Schema: - properties: - spec: - properties: - keycloakCRName: - description: "The name of the Keycloak CR to reference, in the same\ - \ namespace." - type: string - realm: - description: The RealmRepresentation to import into Keycloak. - properties: - webAuthnPolicyAvoidSameAuthenticatorRegister: - type: boolean - federatedUsers: - items: - properties: - id: - type: string - clientConsents: - items: - properties: - grantedClientScopes: - items: - type: string - type: array - grantedRealmRoles: - items: - type: string - type: array - lastUpdatedDate: - type: integer - createdDate: - type: integer - clientId: - type: string - type: object - type: array - clientRoles: - additionalProperties: - items: - type: string - type: array - type: object - requiredActions: - items: - type: string - type: array - enabled: - type: boolean - realmRoles: - items: - type: string - type: array - createdTimestamp: - type: integer - emailVerified: - type: boolean - disableableCredentialTypes: - items: - type: string - type: array - socialLinks: - items: - properties: - socialUserId: - type: string - socialProvider: - type: string - socialUsername: - type: string - type: object - type: array - username: - type: string - federationLink: - type: string - access: - additionalProperties: - type: boolean - type: object - totp: - type: boolean - serviceAccountClientId: - type: string - attributes: - additionalProperties: - items: - type: string - type: array - type: object - federatedIdentities: - items: - properties: - userId: - type: string - identityProvider: - type: string - userName: - type: string - type: object - type: array - firstName: - type: string - self: - type: string - notBefore: - type: integer - groups: - items: - type: string - type: array - credentials: - items: - properties: - id: - type: string - period: - type: integer - counter: - type: integer - value: - type: string - hashIterations: - type: integer - algorithm: - type: string - hashedSaltedValue: - type: string - type: - type: string - priority: - type: integer - device: - type: string - temporary: - type: boolean - userLabel: - type: string - createdDate: - type: integer - secretData: - type: string - config: - additionalProperties: - items: - type: string - type: array - type: object - credentialData: - type: string - salt: - type: string - digits: - type: integer - type: object - type: array - applicationRoles: - additionalProperties: - items: - type: string - type: array - type: object - lastName: - type: string - email: - type: string - origin: - type: string - type: object - type: array - adminEventsEnabled: - type: boolean - registrationEmailAsUsername: - type: boolean - keycloakVersion: - type: string - oauth2DeviceCodeLifespan: - type: integer - sslRequired: - type: string - realm: - type: string - defaultGroups: - items: - type: string - type: array - enabled: - type: boolean - webAuthnPolicySignatureAlgorithms: - items: - type: string - type: array - ssoSessionMaxLifespanRememberMe: - type: integer - webAuthnPolicyRpId: - type: string - webAuthnPolicyPasswordlessAvoidSameAuthenticatorRegister: - type: boolean - users: - items: - properties: - id: - type: string - clientConsents: - items: - properties: - grantedClientScopes: - items: - type: string - type: array - grantedRealmRoles: - items: - type: string - type: array - lastUpdatedDate: - type: integer - createdDate: - type: integer - clientId: - type: string - type: object - type: array - clientRoles: - additionalProperties: - items: - type: string - type: array - type: object - requiredActions: - items: - type: string - type: array - enabled: - type: boolean - realmRoles: - items: - type: string - type: array - createdTimestamp: - type: integer - emailVerified: - type: boolean - disableableCredentialTypes: - items: - type: string - type: array - socialLinks: - items: - properties: - socialUserId: - type: string - socialProvider: - type: string - socialUsername: - type: string - type: object - type: array - username: - type: string - federationLink: - type: string - access: - additionalProperties: - type: boolean - type: object - totp: - type: boolean - serviceAccountClientId: - type: string - attributes: - additionalProperties: - items: - type: string - type: array - type: object - federatedIdentities: - items: - properties: - userId: - type: string - identityProvider: - type: string - userName: - type: string - type: object - type: array - firstName: - type: string - self: - type: string - notBefore: - type: integer - groups: - items: - type: string - type: array - credentials: - items: - properties: - id: - type: string - period: - type: integer - counter: - type: integer - value: - type: string - hashIterations: - type: integer - algorithm: - type: string - hashedSaltedValue: - type: string - type: - type: string - priority: - type: integer - device: - type: string - temporary: - type: boolean - userLabel: - type: string - createdDate: - type: integer - secretData: - type: string - config: - additionalProperties: - items: - type: string - type: array - type: object - credentialData: - type: string - salt: - type: string - digits: - type: integer - type: object - type: array - applicationRoles: - additionalProperties: - items: - type: string - type: array - type: object - lastName: - type: string - email: - type: string - origin: - type: string - type: object - type: array - clientTemplates: - items: - properties: - protocol: - type: string - id: - type: string - fullScopeAllowed: - type: boolean - frontchannelLogout: - type: boolean - serviceAccountsEnabled: - type: boolean - standardFlowEnabled: - type: boolean - description: - type: string - publicClient: - type: boolean - consentRequired: - type: boolean - bearerOnly: - type: boolean - protocolMappers: - items: - properties: - protocol: - type: string - id: - type: string - name: - type: string - protocolMapper: - type: string - consentText: - type: string - consentRequired: - type: boolean - config: - additionalProperties: - type: string - type: object - type: object - type: array - name: - type: string - directAccessGrantsEnabled: - type: boolean - implicitFlowEnabled: - type: boolean - attributes: - additionalProperties: - type: string - type: object - type: object - type: array - webAuthnPolicyPasswordlessUserVerificationRequirement: - type: string - registrationFlow: - type: string - publicKey: - type: string - webAuthnPolicyPasswordlessCreateTimeout: - type: integer - authenticationFlows: - items: - properties: - id: - type: string - providerId: - type: string - authenticationExecutions: - items: - properties: - userSetupAllowed: - type: boolean - flowAlias: - type: string - autheticatorFlow: - type: boolean - authenticatorConfig: - type: string - authenticator: - type: string - priority: - type: integer - requirement: - type: string - authenticatorFlow: - type: boolean - type: object - type: array - topLevel: - type: boolean - alias: - type: string - builtIn: - type: boolean - description: - type: string - type: object - type: array - applicationScopeMappings: - additionalProperties: - items: - properties: - clientTemplate: - type: string - self: - type: string - clientScope: - type: string - client: - type: string - roles: - items: - type: string - type: array - type: object - type: array - type: object - offlineSessionMaxLifespan: - type: integer - codeSecret: - type: string - offlineSessionIdleTimeout: - type: integer - quickLoginCheckMilliSeconds: - type: integer - privateKey: - type: string - webAuthnPolicyRpEntityName: - type: string - emailTheme: - type: string - accessCodeLifespanLogin: - type: integer - passwordPolicy: - type: string - ssoSessionIdleTimeoutRememberMe: - type: integer - resetPasswordAllowed: - type: boolean - failureFactor: - type: integer - otpPolicyAlgorithm: - type: string - requiredActions: - items: - properties: - providerId: - type: string - alias: - type: string - defaultAction: - type: boolean - priority: - type: integer - name: - type: string - enabled: - type: boolean - config: - additionalProperties: - type: string - type: object - type: object - type: array - actionTokenGeneratedByUserLifespan: - type: integer - clientAuthenticationFlow: - type: string - webAuthnPolicyAuthenticatorAttachment: - type: string - actionTokenGeneratedByAdminLifespan: - type: integer - id: - type: string - clientPolicies: - type: object - x-kubernetes-preserve-unknown-fields: true - webAuthnPolicyUserVerificationRequirement: - type: string - loginTheme: - type: string - requiredCredentials: - items: - type: string - type: array - webAuthnPolicyPasswordlessAttestationConveyancePreference: - type: string - directGrantFlow: - type: string - identityProviderMappers: - items: - properties: - id: - type: string - name: - type: string - identityProviderMapper: - type: string - identityProviderAlias: - type: string - config: - additionalProperties: - type: string - type: object - type: object - type: array - dockerAuthenticationFlow: - type: string - browserFlow: - type: string - bruteForceProtected: - type: boolean - displayNameHtml: - type: string - ssoSessionIdleTimeout: - type: integer - browserSecurityHeaders: - additionalProperties: - type: string - type: object - eventsListeners: - items: - type: string - type: array - accessTokenLifespan: - type: integer - applications: - items: - properties: - name: - type: string - claims: - properties: - picture: - type: boolean - gender: - type: boolean - phone: - type: boolean - website: - type: boolean - email: - type: boolean - profile: - type: boolean - address: - type: boolean - name: - type: boolean - username: - type: boolean - locale: - type: boolean - type: object - id: - type: string - frontchannelLogout: - type: boolean - useTemplateConfig: - type: boolean - registrationAccessToken: - type: string - baseUrl: - type: string - serviceAccountsEnabled: - type: boolean - registeredNodes: - additionalProperties: - type: integer - type: object - useTemplateMappers: - type: boolean - description: - type: string - publicClient: - type: boolean - useTemplateScope: - type: boolean - authorizationSettings: - properties: - id: - type: string - resources: - items: - properties: - _id: - type: string - uris: - items: - type: string - type: array - attributes: - additionalProperties: - items: - type: string - type: array - type: object - displayName: - type: string - scopes: - items: - properties: - id: - type: string - displayName: - type: string - name: - type: string - iconUri: - type: string - type: object - type: array - owner: - properties: - id: - type: string - name: - type: string - type: object - name: - type: string - type: - type: string - icon_uri: - type: string - ownerManagedAccess: - type: boolean - type: object - type: array - decisionStrategy: - enum: - - AFFIRMATIVE - - stableIndex - - CONSENSUS - - UNANIMOUS - type: string - name: - type: string - policyEnforcementMode: - enum: - - stableIndex - - PERMISSIVE - - ENFORCING - - DISABLED - type: string - scopes: - items: - properties: - id: - type: string - displayName: - type: string - name: - type: string - iconUri: - type: string - type: object - type: array - policies: - items: - properties: - config: - additionalProperties: - type: string - type: object - id: - type: string - owner: - type: string - resources: - items: - type: string - type: array - policies: - items: - type: string - type: array - decisionStrategy: - enum: - - AFFIRMATIVE - - stableIndex - - CONSENSUS - - UNANIMOUS - type: string - logic: - enum: - - stableIndex - - POSITIVE - - NEGATIVE - type: string - resourcesData: - items: - properties: - _id: - type: string - uris: - items: - type: string - type: array - attributes: - additionalProperties: - items: - type: string - type: array - type: object - displayName: - type: string - scopes: - items: - properties: - id: - type: string - displayName: - type: string - name: - type: string - iconUri: - type: string - type: object - type: array - owner: - properties: - id: - type: string - name: - type: string - type: object - name: - type: string - type: - type: string - icon_uri: - type: string - ownerManagedAccess: - type: boolean - type: object - type: array - name: - type: string - type: - type: string - scopesData: - items: - properties: - id: - type: string - displayName: - type: string - name: - type: string - iconUri: - type: string - type: object - type: array - description: - type: string - scopes: - items: - type: string - type: array - type: object - type: array - clientId: - type: string - allowRemoteResourceManagement: - type: boolean - type: object - clientId: - type: string - enabled: - type: boolean - clientAuthenticatorType: - type: string - surrogateAuthRequired: - type: boolean - webOrigins: - items: - type: string - type: array - authorizationServicesEnabled: - type: boolean - secret: - type: string - protocol: - type: string - fullScopeAllowed: - type: boolean - nodeReRegistrationTimeout: - type: integer - clientTemplate: - type: string - access: - additionalProperties: - type: boolean - type: object - alwaysDisplayInConsole: - type: boolean - rootUrl: - type: string - oauth2DeviceAuthorizationGrantEnabled: - type: boolean - standardFlowEnabled: - type: boolean - optionalClientScopes: - items: - type: string - type: array - consentRequired: - type: boolean - authenticationFlowBindingOverrides: - additionalProperties: - type: string - type: object - bearerOnly: - type: boolean - defaultClientScopes: - items: - type: string - type: array - adminUrl: - type: string - protocolMappers: - items: - properties: - protocol: - type: string - id: - type: string - name: - type: string - protocolMapper: - type: string - consentText: - type: string - consentRequired: - type: boolean - config: - additionalProperties: - type: string - type: object - type: object - type: array - notBefore: - type: integer - directGrantsOnly: - type: boolean - defaultRoles: - items: - type: string - type: array - directAccessGrantsEnabled: - type: boolean - implicitFlowEnabled: - type: boolean - origin: - type: string - attributes: - additionalProperties: - type: string - type: object - redirectUris: - items: - type: string - type: array - type: object - type: array - otpPolicyCodeReusable: - type: boolean - clientProfiles: - type: object - x-kubernetes-preserve-unknown-fields: true - userFederationMappers: - items: - properties: - id: - type: string - federationProviderDisplayName: - type: string - federationMapperType: - type: string - name: - type: string - config: - additionalProperties: - type: string - type: object - type: object - type: array - enabledEventTypes: - items: - type: string - type: array - otpPolicyLookAheadWindow: - type: integer - displayName: - type: string - eventsEnabled: - type: boolean - clientSessionMaxLifespan: - type: integer - roles: - properties: - application: - additionalProperties: - items: - properties: - attributes: - additionalProperties: - items: - type: string - type: array - type: object - id: - type: string - clientRole: - type: boolean - name: - type: string - description: - type: string - scopeParamRequired: - type: boolean - composites: - properties: - realm: - items: - type: string - type: array - application: - additionalProperties: - items: - type: string - type: array - type: object - client: - additionalProperties: - items: - type: string - type: array - type: object - type: object - containerId: - type: string - composite: - type: boolean - type: object - type: array - type: object - client: - additionalProperties: - items: - properties: - attributes: - additionalProperties: - items: - type: string - type: array - type: object - id: - type: string - clientRole: - type: boolean - name: - type: string - description: - type: string - scopeParamRequired: - type: boolean - composites: - properties: - realm: - items: - type: string - type: array - application: - additionalProperties: - items: - type: string - type: array - type: object - client: - additionalProperties: - items: - type: string - type: array - type: object - type: object - containerId: - type: string - composite: - type: boolean - type: object - type: array - type: object - realm: - items: - properties: - attributes: - additionalProperties: - items: - type: string - type: array - type: object - id: - type: string - clientRole: - type: boolean - name: - type: string - description: - type: string - scopeParamRequired: - type: boolean - composites: - properties: - realm: - items: - type: string - type: array - application: - additionalProperties: - items: - type: string - type: array - type: object - client: - additionalProperties: - items: - type: string - type: array - type: object - type: object - containerId: - type: string - composite: - type: boolean - type: object - type: array - type: object - groups: - items: - properties: - attributes: - additionalProperties: - items: - type: string - type: array - type: object - id: - type: string - access: - additionalProperties: - type: boolean - type: object - realmRoles: - items: - type: string - type: array - path: - type: string - clientRoles: - additionalProperties: - items: - type: string - type: array - type: object - name: - type: string - subGroups: - items: - properties: - attributes: - additionalProperties: - items: - type: string - type: array - type: object - id: - type: string - access: - additionalProperties: - type: boolean - type: object - realmRoles: - items: - type: string - type: array - path: - type: string - clientRoles: - additionalProperties: - items: - type: string - type: array - type: object - name: - type: string - type: object - type: array - type: object - type: array - webAuthnPolicyCreateTimeout: - type: integer - webAuthnPolicyAttestationConveyancePreference: - type: string - clientOfflineSessionIdleTimeout: - type: integer - notBefore: - type: integer - webAuthnPolicyPasswordlessRpEntityName: - type: string - verifyEmail: - type: boolean - clientScopeMappings: - additionalProperties: - items: - properties: - clientTemplate: - type: string - self: - type: string - clientScope: - type: string - client: - type: string - roles: - items: - type: string - type: array - type: object - type: array - type: object - identityProviders: - items: - properties: - storeToken: - type: boolean - trustEmail: - type: boolean - updateProfileFirstLoginMode: - type: string - authenticateByDefault: - type: boolean - displayName: - type: string - providerId: - type: string - linkOnly: - type: boolean - postBrokerLoginFlowAlias: - type: string - alias: - type: string - enabled: - type: boolean - firstBrokerLoginFlowAlias: - type: string - internalId: - type: string - addReadTokenRoleOnCreate: - type: boolean - config: - additionalProperties: - type: string - type: object - type: object - type: array - resetCredentialsFlow: - type: string - duplicateEmailsAllowed: - type: boolean - maxDeltaTimeSeconds: - type: integer - offlineSessionMaxLifespanEnabled: - type: boolean - realmCacheEnabled: - type: boolean - attributes: - additionalProperties: - type: string - type: object - adminTheme: - type: string - loginWithEmailAllowed: - type: boolean - otpSupportedApplications: - items: - type: string - type: array - clientOfflineSessionMaxLifespan: - type: integer - userFederationProviders: - items: - properties: - id: - type: string - providerName: - type: string - displayName: - type: string - priority: - type: integer - fullSyncPeriod: - type: integer - lastSync: - type: integer - changedSyncPeriod: - type: integer - config: - additionalProperties: - type: string - type: object - type: object - type: array - internationalizationEnabled: - type: boolean - permanentLockout: - type: boolean - userManagedAccessAllowed: - type: boolean - smtpServer: - additionalProperties: - type: string - type: object - otpPolicyDigits: - type: integer - webAuthnPolicyPasswordlessSignatureAlgorithms: - items: - type: string - type: array - socialProviders: - additionalProperties: - type: string - type: object - otpPolicyInitialCounter: - type: integer - defaultSignatureAlgorithm: - type: string - refreshTokenMaxReuse: - type: integer - revokeRefreshToken: - type: boolean - accountTheme: - type: string - webAuthnPolicyPasswordlessAcceptableAaguids: - items: - type: string - type: array - webAuthnPolicyPasswordlessAuthenticatorAttachment: - type: string - supportedLocales: - items: - type: string - type: array - defaultDefaultClientScopes: - items: - type: string - type: array - authenticatorConfig: - items: - properties: - id: - type: string - alias: - type: string - config: - additionalProperties: - type: string - type: object - type: object - type: array - webAuthnPolicyPasswordlessRpId: - type: string - scopeMappings: - items: - properties: - clientTemplate: - type: string - self: - type: string - clientScope: - type: string - client: - type: string - roles: - items: - type: string - type: array - type: object - type: array - clientScopes: - items: - properties: - protocol: - type: string - id: - type: string - protocolMappers: - items: - properties: - protocol: - type: string - id: - type: string - name: - type: string - protocolMapper: - type: string - consentText: - type: string - consentRequired: - type: boolean - config: - additionalProperties: - type: string - type: object - type: object - type: array - name: - type: string - description: - type: string - attributes: - additionalProperties: - type: string - type: object - type: object - type: array - oauth2DevicePollingInterval: - type: integer - eventsExpiration: - type: integer - certificate: - type: string - defaultRole: - properties: - attributes: - additionalProperties: - items: - type: string - type: array - type: object - id: - type: string - clientRole: - type: boolean - name: - type: string - description: - type: string - scopeParamRequired: - type: boolean - composites: - properties: - realm: - items: - type: string - type: array - application: - additionalProperties: - items: - type: string - type: array - type: object - client: - additionalProperties: - items: - type: string - type: array - type: object - type: object - containerId: - type: string - composite: - type: boolean - type: object - defaultOptionalClientScopes: - items: - type: string - type: array - editUsernameAllowed: - type: boolean - defaultLocale: - type: string - webAuthnPolicyRequireResidentKey: - type: string - oauthClients: - items: - properties: - name: - type: string - claims: - properties: - picture: - type: boolean - gender: - type: boolean - phone: - type: boolean - website: - type: boolean - email: - type: boolean - profile: - type: boolean - address: - type: boolean - name: - type: boolean - username: - type: boolean - locale: - type: boolean - type: object - id: - type: string - frontchannelLogout: - type: boolean - useTemplateConfig: - type: boolean - registrationAccessToken: - type: string - baseUrl: - type: string - serviceAccountsEnabled: - type: boolean - registeredNodes: - additionalProperties: - type: integer - type: object - useTemplateMappers: - type: boolean - description: - type: string - publicClient: - type: boolean - useTemplateScope: - type: boolean - authorizationSettings: - properties: - id: - type: string - resources: - items: - properties: - _id: - type: string - uris: - items: - type: string - type: array - attributes: - additionalProperties: - items: - type: string - type: array - type: object - displayName: - type: string - scopes: - items: - properties: - id: - type: string - displayName: - type: string - name: - type: string - iconUri: - type: string - type: object - type: array - owner: - properties: - id: - type: string - name: - type: string - type: object - name: - type: string - type: - type: string - icon_uri: - type: string - ownerManagedAccess: - type: boolean - type: object - type: array - decisionStrategy: - enum: - - AFFIRMATIVE - - stableIndex - - CONSENSUS - - UNANIMOUS - type: string - name: - type: string - policyEnforcementMode: - enum: - - stableIndex - - PERMISSIVE - - ENFORCING - - DISABLED - type: string - scopes: - items: - properties: - id: - type: string - displayName: - type: string - name: - type: string - iconUri: - type: string - type: object - type: array - policies: - items: - properties: - config: - additionalProperties: - type: string - type: object - id: - type: string - owner: - type: string - resources: - items: - type: string - type: array - policies: - items: - type: string - type: array - decisionStrategy: - enum: - - AFFIRMATIVE - - stableIndex - - CONSENSUS - - UNANIMOUS - type: string - logic: - enum: - - stableIndex - - POSITIVE - - NEGATIVE - type: string - resourcesData: - items: - properties: - _id: - type: string - uris: - items: - type: string - type: array - attributes: - additionalProperties: - items: - type: string - type: array - type: object - displayName: - type: string - scopes: - items: - properties: - id: - type: string - displayName: - type: string - name: - type: string - iconUri: - type: string - type: object - type: array - owner: - properties: - id: - type: string - name: - type: string - type: object - name: - type: string - type: - type: string - icon_uri: - type: string - ownerManagedAccess: - type: boolean - type: object - type: array - name: - type: string - type: - type: string - scopesData: - items: - properties: - id: - type: string - displayName: - type: string - name: - type: string - iconUri: - type: string - type: object - type: array - description: - type: string - scopes: - items: - type: string - type: array - type: object - type: array - clientId: - type: string - allowRemoteResourceManagement: - type: boolean - type: object - clientId: - type: string - enabled: - type: boolean - clientAuthenticatorType: - type: string - surrogateAuthRequired: - type: boolean - webOrigins: - items: - type: string - type: array - authorizationServicesEnabled: - type: boolean - secret: - type: string - protocol: - type: string - fullScopeAllowed: - type: boolean - nodeReRegistrationTimeout: - type: integer - clientTemplate: - type: string - access: - additionalProperties: - type: boolean - type: object - alwaysDisplayInConsole: - type: boolean - rootUrl: - type: string - oauth2DeviceAuthorizationGrantEnabled: - type: boolean - standardFlowEnabled: - type: boolean - optionalClientScopes: - items: - type: string - type: array - consentRequired: - type: boolean - authenticationFlowBindingOverrides: - additionalProperties: - type: string - type: object - bearerOnly: - type: boolean - defaultClientScopes: - items: - type: string - type: array - adminUrl: - type: string - protocolMappers: - items: - properties: - protocol: - type: string - id: - type: string - name: - type: string - protocolMapper: - type: string - consentText: - type: string - consentRequired: - type: boolean - config: - additionalProperties: - type: string - type: object - type: object - type: array - notBefore: - type: integer - directGrantsOnly: - type: boolean - defaultRoles: - items: - type: string - type: array - directAccessGrantsEnabled: - type: boolean - implicitFlowEnabled: - type: boolean - origin: - type: string - attributes: - additionalProperties: - type: string - type: object - redirectUris: - items: - type: string - type: array - type: object - type: array - adminEventsDetailsEnabled: - type: boolean - ssoSessionMaxLifespan: - type: integer - accessCodeLifespanUserAction: - type: integer - registrationAllowed: - type: boolean - social: - type: boolean - accessTokenLifespanForImplicitFlow: - type: integer - rememberMe: - type: boolean - maxFailureWaitSeconds: - type: integer - defaultRoles: - items: - type: string - type: array - otpPolicyType: - type: string - otpPolicyPeriod: - type: integer - accessCodeLifespan: - type: integer - minimumQuickLoginWaitSeconds: - type: integer - webAuthnPolicyAcceptableAaguids: - items: - type: string - type: array - updateProfileOnInitialSocialLogin: - type: boolean - clientSessionIdleTimeout: - type: integer - webAuthnPolicyPasswordlessRequireResidentKey: - type: string - waitIncrementSeconds: - type: integer - protocolMappers: - items: - properties: - protocol: - type: string - id: - type: string - name: - type: string - protocolMapper: - type: string - consentText: - type: string - consentRequired: - type: boolean - config: - additionalProperties: - type: string - type: object - type: object - type: array - clients: - items: - properties: - id: - type: string - frontchannelLogout: - type: boolean - useTemplateConfig: - type: boolean - registrationAccessToken: - type: string - baseUrl: - type: string - serviceAccountsEnabled: - type: boolean - registeredNodes: - additionalProperties: - type: integer - type: object - useTemplateMappers: - type: boolean - description: - type: string - publicClient: - type: boolean - useTemplateScope: - type: boolean - authorizationSettings: - properties: - id: - type: string - resources: - items: - properties: - _id: - type: string - uris: - items: - type: string - type: array - attributes: - additionalProperties: - items: - type: string - type: array - type: object - displayName: - type: string - scopes: - items: - properties: - id: - type: string - displayName: - type: string - name: - type: string - iconUri: - type: string - type: object - type: array - owner: - properties: - id: - type: string - name: - type: string - type: object - name: - type: string - type: - type: string - icon_uri: - type: string - ownerManagedAccess: - type: boolean - type: object - type: array - decisionStrategy: - enum: - - AFFIRMATIVE - - stableIndex - - CONSENSUS - - UNANIMOUS - type: string - name: - type: string - policyEnforcementMode: - enum: - - stableIndex - - PERMISSIVE - - ENFORCING - - DISABLED - type: string - scopes: - items: - properties: - id: - type: string - displayName: - type: string - name: - type: string - iconUri: - type: string - type: object - type: array - policies: - items: - properties: - config: - additionalProperties: - type: string - type: object - id: - type: string - owner: - type: string - resources: - items: - type: string - type: array - policies: - items: - type: string - type: array - decisionStrategy: - enum: - - AFFIRMATIVE - - stableIndex - - CONSENSUS - - UNANIMOUS - type: string - logic: - enum: - - stableIndex - - POSITIVE - - NEGATIVE - type: string - resourcesData: - items: - properties: - _id: - type: string - uris: - items: - type: string - type: array - attributes: - additionalProperties: - items: - type: string - type: array - type: object - displayName: - type: string - scopes: - items: - properties: - id: - type: string - displayName: - type: string - name: - type: string - iconUri: - type: string - type: object - type: array - owner: - properties: - id: - type: string - name: - type: string - type: object - name: - type: string - type: - type: string - icon_uri: - type: string - ownerManagedAccess: - type: boolean - type: object - type: array - name: - type: string - type: - type: string - scopesData: - items: - properties: - id: - type: string - displayName: - type: string - name: - type: string - iconUri: - type: string - type: object - type: array - description: - type: string - scopes: - items: - type: string - type: array - type: object - type: array - clientId: - type: string - allowRemoteResourceManagement: - type: boolean - type: object - clientId: - type: string - enabled: - type: boolean - clientAuthenticatorType: - type: string - name: - type: string - surrogateAuthRequired: - type: boolean - webOrigins: - items: - type: string - type: array - authorizationServicesEnabled: - type: boolean - secret: - type: string - protocol: - type: string - fullScopeAllowed: - type: boolean - nodeReRegistrationTimeout: - type: integer - clientTemplate: - type: string - access: - additionalProperties: - type: boolean - type: object - alwaysDisplayInConsole: - type: boolean - rootUrl: - type: string - oauth2DeviceAuthorizationGrantEnabled: - type: boolean - standardFlowEnabled: - type: boolean - optionalClientScopes: - items: - type: string - type: array - consentRequired: - type: boolean - authenticationFlowBindingOverrides: - additionalProperties: - type: string - type: object - bearerOnly: - type: boolean - defaultClientScopes: - items: - type: string - type: array - adminUrl: - type: string - protocolMappers: - items: - properties: - protocol: - type: string - id: - type: string - name: - type: string - protocolMapper: - type: string - consentText: - type: string - consentRequired: - type: boolean - config: - additionalProperties: - type: string - type: object - type: object - type: array - notBefore: - type: integer - directGrantsOnly: - type: boolean - defaultRoles: - items: - type: string - type: array - directAccessGrantsEnabled: - type: boolean - implicitFlowEnabled: - type: boolean - origin: - type: string - attributes: - additionalProperties: - type: string - type: object - redirectUris: - items: - type: string - type: array - type: object - type: array - components: - additionalProperties: - items: - properties: - id: - type: string - providerId: - type: string - subType: - type: string - subComponents: - additionalProperties: - items: - properties: - id: - type: string - providerId: - type: string - subType: - type: string - name: - type: string - config: - additionalProperties: - items: - type: string - type: array - type: object - type: object - type: array - type: object - name: - type: string - config: - additionalProperties: - items: - type: string - type: array - type: object - type: object - type: array - type: object - passwordCredentialGrantAllowed: - type: boolean - userCacheEnabled: - type: boolean - type: object - required: - - keycloakCRName - - realm - type: object - status: - properties: - conditions: - items: - properties: - status: - type: boolean - type: - type: string - message: - type: string - type: object - type: array - type: object - type: object - served: true - storage: true - subresources: - status: {} diff --git a/charts/kubezero-auth/crds/keycloak.yaml b/charts/kubezero-auth/crds/keycloak.yaml deleted file mode 100644 index 50036592..00000000 --- a/charts/kubezero-auth/crds/keycloak.yaml +++ /dev/null @@ -1,2917 +0,0 @@ -# Generated by Fabric8 CRDGenerator, manual edits might get overwritten! -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - name: keycloaks.k8s.keycloak.org -spec: - group: k8s.keycloak.org - names: - kind: Keycloak - plural: keycloaks - shortNames: - - kc - singular: keycloak - scope: Namespaced - versions: - - name: v2alpha1 - schema: - openAPIV3Schema: - properties: - spec: - properties: - instances: - description: Number of Keycloak instances in HA mode. Default is 1. - type: integer - transaction: - description: In this section you can find all properties related to - the settings of transaction behavior. - properties: - xaEnabled: - description: Determine whether Keycloak should use a non-XA datasource - in case the database does not support XA transactions. - type: boolean - type: object - http: - description: In this section you can configure Keycloak features related - to HTTP and HTTPS - properties: - httpPort: - description: The used HTTP port. - type: integer - tlsSecret: - description: "A secret containing the TLS configuration for HTTPS.\ - \ Reference: https://kubernetes.io/docs/concepts/configuration/secret/#tls-secrets." - type: string - httpsPort: - description: The used HTTPS port. - type: integer - httpEnabled: - description: Enables the HTTP listener. - type: boolean - type: object - hostname: - description: In this section you can configure Keycloak hostname and - related properties. - properties: - hostname: - description: Hostname for the Keycloak server. - type: string - strict: - description: Disables dynamically resolving the hostname from - request headers. - type: boolean - strictBackchannel: - description: By default backchannel URLs are dynamically resolved - from request headers to allow internal and external applications. - type: boolean - admin: - description: The hostname for accessing the administration console. - type: string - adminUrl: - description: "Set the base URL for accessing the administration\ - \ console, including scheme, host, port and path" - type: string - type: object - unsupported: - description: |- - In this section you can configure podTemplate advanced features, not production-ready, and not supported settings. - Use at your own risk and open an issue with your use-case if you don't find an alternative way. - properties: - podTemplate: - description: |- - You can configure that will be merged with the one configured by default by the operator. - Use at your own risk, we reserve the possibility to remove/change the way any field gets merged in future releases without notice. - Reference: https://kubernetes.io/docs/concepts/workloads/pods/#pod-templates - properties: - metadata: - properties: - generateName: - type: string - deletionGracePeriodSeconds: - type: integer - deletionTimestamp: - type: string - clusterName: - type: string - resourceVersion: - type: string - annotations: - additionalProperties: - type: string - type: object - selfLink: - type: string - creationTimestamp: - type: string - finalizers: - items: - type: string - type: array - labels: - additionalProperties: - type: string - type: object - ownerReferences: - items: - properties: - blockOwnerDeletion: - type: boolean - uid: - type: string - apiVersion: - type: string - name: - type: string - kind: - type: string - controller: - type: boolean - type: object - type: array - uid: - type: string - generation: - type: integer - name: - type: string - managedFields: - items: - properties: - time: - type: string - apiVersion: - type: string - fieldsV1: - type: object - fieldsType: - type: string - manager: - type: string - operation: - type: string - subresource: - type: string - type: object - type: array - namespace: - type: string - type: object - spec: - properties: - volumes: - items: - properties: - hostPath: - properties: - path: - type: string - type: - type: string - type: object - flexVolume: - properties: - readOnly: - type: boolean - options: - additionalProperties: - type: string - type: object - secretRef: - properties: - name: - type: string - type: object - fsType: - type: string - driver: - type: string - type: object - gcePersistentDisk: - properties: - readOnly: - type: boolean - pdName: - type: string - partition: - type: integer - fsType: - type: string - type: object - ephemeral: - properties: - volumeClaimTemplate: - properties: - metadata: - properties: - generateName: - type: string - deletionGracePeriodSeconds: - type: integer - deletionTimestamp: - type: string - clusterName: - type: string - resourceVersion: - type: string - annotations: - additionalProperties: - type: string - type: object - selfLink: - type: string - creationTimestamp: - type: string - finalizers: - items: - type: string - type: array - labels: - additionalProperties: - type: string - type: object - ownerReferences: - items: - properties: - blockOwnerDeletion: - type: boolean - uid: - type: string - apiVersion: - type: string - name: - type: string - kind: - type: string - controller: - type: boolean - type: object - type: array - uid: - type: string - generation: - type: integer - name: - type: string - managedFields: - items: - properties: - time: - type: string - apiVersion: - type: string - fieldsV1: - type: object - fieldsType: - type: string - manager: - type: string - operation: - type: string - subresource: - type: string - type: object - type: array - namespace: - type: string - type: object - spec: - properties: - selector: - properties: - matchExpressions: - items: - properties: - key: - type: string - values: - items: - type: string - type: array - operator: - type: string - type: object - type: array - matchLabels: - additionalProperties: - type: string - type: object - type: object - storageClassName: - type: string - dataSource: - properties: - name: - type: string - kind: - type: string - apiGroup: - type: string - type: object - resources: - properties: - limits: - additionalProperties: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - requests: - additionalProperties: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - type: object - dataSourceRef: - properties: - name: - type: string - kind: - type: string - apiGroup: - type: string - type: object - accessModes: - items: - type: string - type: array - volumeMode: - type: string - volumeName: - type: string - type: object - type: object - type: object - scaleIO: - properties: - readOnly: - type: boolean - storageMode: - type: string - storagePool: - type: string - system: - type: string - gateway: - type: string - secretRef: - properties: - name: - type: string - type: object - fsType: - type: string - sslEnabled: - type: boolean - volumeName: - type: string - protectionDomain: - type: string - type: object - csi: - properties: - nodePublishSecretRef: - properties: - name: - type: string - type: object - readOnly: - type: boolean - volumeAttributes: - additionalProperties: - type: string - type: object - fsType: - type: string - driver: - type: string - type: object - secret: - properties: - optional: - type: boolean - secretName: - type: string - items: - items: - properties: - path: - type: string - key: - type: string - mode: - type: integer - type: object - type: array - defaultMode: - type: integer - type: object - name: - type: string - vsphereVolume: - properties: - storagePolicyName: - type: string - storagePolicyID: - type: string - volumePath: - type: string - fsType: - type: string - type: object - gitRepo: - properties: - revision: - type: string - repository: - type: string - directory: - type: string - type: object - glusterfs: - properties: - path: - type: string - readOnly: - type: boolean - endpoints: - type: string - type: object - nfs: - properties: - path: - type: string - readOnly: - type: boolean - server: - type: string - type: object - cinder: - properties: - readOnly: - type: boolean - secretRef: - properties: - name: - type: string - type: object - fsType: - type: string - volumeID: - type: string - type: object - flocker: - properties: - datasetUUID: - type: string - datasetName: - type: string - type: object - quobyte: - properties: - group: - type: string - readOnly: - type: boolean - volume: - type: string - user: - type: string - registry: - type: string - tenant: - type: string - type: object - photonPersistentDisk: - properties: - pdID: - type: string - fsType: - type: string - type: object - persistentVolumeClaim: - properties: - readOnly: - type: boolean - claimName: - type: string - type: object - awsElasticBlockStore: - properties: - readOnly: - type: boolean - partition: - type: integer - fsType: - type: string - volumeID: - type: string - type: object - configMap: - properties: - optional: - type: boolean - items: - items: - properties: - path: - type: string - key: - type: string - mode: - type: integer - type: object - type: array - defaultMode: - type: integer - name: - type: string - type: object - storageos: - properties: - readOnly: - type: boolean - volumeNamespace: - type: string - secretRef: - properties: - name: - type: string - type: object - fsType: - type: string - volumeName: - type: string - type: object - portworxVolume: - properties: - readOnly: - type: boolean - fsType: - type: string - volumeID: - type: string - type: object - iscsi: - properties: - readOnly: - type: boolean - chapAuthSession: - type: boolean - lun: - type: integer - targetPortal: - type: string - iscsiInterface: - type: string - portals: - items: - type: string - type: array - initiatorName: - type: string - secretRef: - properties: - name: - type: string - type: object - fsType: - type: string - iqn: - type: string - chapAuthDiscovery: - type: boolean - type: object - rbd: - properties: - readOnly: - type: boolean - pool: - type: string - keyring: - type: string - image: - type: string - secretRef: - properties: - name: - type: string - type: object - monitors: - items: - type: string - type: array - fsType: - type: string - user: - type: string - type: object - azureFile: - properties: - readOnly: - type: boolean - secretName: - type: string - shareName: - type: string - type: object - downwardAPI: - properties: - items: - items: - properties: - path: - type: string - fieldRef: - properties: - apiVersion: - type: string - fieldPath: - type: string - type: object - resourceFieldRef: - properties: - containerName: - type: string - divisor: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - resource: - type: string - type: object - mode: - type: integer - type: object - type: array - defaultMode: - type: integer - type: object - projected: - properties: - defaultMode: - type: integer - sources: - items: - properties: - secret: - properties: - optional: - type: boolean - items: - items: - properties: - path: - type: string - key: - type: string - mode: - type: integer - type: object - type: array - name: - type: string - type: object - configMap: - properties: - optional: - type: boolean - items: - items: - properties: - path: - type: string - key: - type: string - mode: - type: integer - type: object - type: array - name: - type: string - type: object - serviceAccountToken: - properties: - path: - type: string - audience: - type: string - expirationSeconds: - type: integer - type: object - downwardAPI: - properties: - items: - items: - properties: - path: - type: string - fieldRef: - properties: - apiVersion: - type: string - fieldPath: - type: string - type: object - resourceFieldRef: - properties: - containerName: - type: string - divisor: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - resource: - type: string - type: object - mode: - type: integer - type: object - type: array - type: object - type: object - type: array - type: object - azureDisk: - properties: - readOnly: - type: boolean - diskName: - type: string - cachingMode: - type: string - fsType: - type: string - kind: - type: string - diskURI: - type: string - type: object - cephfs: - properties: - path: - type: string - readOnly: - type: boolean - secretRef: - properties: - name: - type: string - type: object - monitors: - items: - type: string - type: array - secretFile: - type: string - user: - type: string - type: object - emptyDir: - properties: - sizeLimit: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - medium: - type: string - type: object - fc: - properties: - readOnly: - type: boolean - lun: - type: integer - wwids: - items: - type: string - type: array - targetWWNs: - items: - type: string - type: array - fsType: - type: string - type: object - type: object - type: array - restartPolicy: - type: string - terminationGracePeriodSeconds: - type: integer - setHostnameAsFQDN: - type: boolean - dnsConfig: - properties: - nameservers: - items: - type: string - type: array - searches: - items: - type: string - type: array - options: - items: - properties: - value: - type: string - name: - type: string - type: object - type: array - type: object - securityContext: - properties: - runAsGroup: - type: integer - runAsNonRoot: - type: boolean - windowsOptions: - properties: - gmsaCredentialSpecName: - type: string - hostProcess: - type: boolean - gmsaCredentialSpec: - type: string - runAsUserName: - type: string - type: object - sysctls: - items: - properties: - value: - type: string - name: - type: string - type: object - type: array - fsGroupChangePolicy: - type: string - seLinuxOptions: - properties: - role: - type: string - type: - type: string - user: - type: string - level: - type: string - type: object - fsGroup: - type: integer - supplementalGroups: - items: - type: integer - type: array - runAsUser: - type: integer - seccompProfile: - properties: - type: - type: string - localhostProfile: - type: string - type: object - type: object - imagePullSecrets: - items: - properties: - name: - type: string - type: object - type: array - subdomain: - type: string - serviceAccount: - type: string - activeDeadlineSeconds: - type: integer - priority: - type: integer - ephemeralContainers: - items: - properties: - lifecycle: - properties: - postStart: - properties: - tcpSocket: - properties: - host: - type: string - port: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - exec: - properties: - command: - items: - type: string - type: array - type: object - httpGet: - properties: - path: - type: string - scheme: - type: string - host: - type: string - httpHeaders: - items: - properties: - value: - type: string - name: - type: string - type: object - type: array - port: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - type: object - preStop: - properties: - tcpSocket: - properties: - host: - type: string - port: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - exec: - properties: - command: - items: - type: string - type: array - type: object - httpGet: - properties: - path: - type: string - scheme: - type: string - host: - type: string - httpHeaders: - items: - properties: - value: - type: string - name: - type: string - type: object - type: array - port: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - type: object - type: object - command: - items: - type: string - type: array - livenessProbe: - properties: - periodSeconds: - type: integer - failureThreshold: - type: integer - initialDelaySeconds: - type: integer - grpc: - properties: - port: - type: integer - service: - type: string - type: object - successThreshold: - type: integer - terminationGracePeriodSeconds: - type: integer - tcpSocket: - properties: - host: - type: string - port: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - timeoutSeconds: - type: integer - exec: - properties: - command: - items: - type: string - type: array - type: object - httpGet: - properties: - path: - type: string - scheme: - type: string - host: - type: string - httpHeaders: - items: - properties: - value: - type: string - name: - type: string - type: object - type: array - port: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - type: object - stdin: - type: boolean - image: - type: string - targetContainerName: - type: string - terminationMessagePolicy: - type: string - readinessProbe: - properties: - periodSeconds: - type: integer - failureThreshold: - type: integer - initialDelaySeconds: - type: integer - grpc: - properties: - port: - type: integer - service: - type: string - type: object - successThreshold: - type: integer - terminationGracePeriodSeconds: - type: integer - tcpSocket: - properties: - host: - type: string - port: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - timeoutSeconds: - type: integer - exec: - properties: - command: - items: - type: string - type: array - type: object - httpGet: - properties: - path: - type: string - scheme: - type: string - host: - type: string - httpHeaders: - items: - properties: - value: - type: string - name: - type: string - type: object - type: array - port: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - type: object - terminationMessagePath: - type: string - env: - items: - properties: - value: - type: string - valueFrom: - properties: - configMapKeyRef: - properties: - optional: - type: boolean - key: - type: string - name: - type: string - type: object - fieldRef: - properties: - apiVersion: - type: string - fieldPath: - type: string - type: object - resourceFieldRef: - properties: - containerName: - type: string - divisor: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - resource: - type: string - type: object - secretKeyRef: - properties: - optional: - type: boolean - key: - type: string - name: - type: string - type: object - type: object - name: - type: string - type: object - type: array - tty: - type: boolean - args: - items: - type: string - type: array - startupProbe: - properties: - periodSeconds: - type: integer - failureThreshold: - type: integer - initialDelaySeconds: - type: integer - grpc: - properties: - port: - type: integer - service: - type: string - type: object - successThreshold: - type: integer - terminationGracePeriodSeconds: - type: integer - tcpSocket: - properties: - host: - type: string - port: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - timeoutSeconds: - type: integer - exec: - properties: - command: - items: - type: string - type: array - type: object - httpGet: - properties: - path: - type: string - scheme: - type: string - host: - type: string - httpHeaders: - items: - properties: - value: - type: string - name: - type: string - type: object - type: array - port: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - type: object - stdinOnce: - type: boolean - ports: - items: - properties: - containerPort: - type: integer - hostPort: - type: integer - name: - type: string - protocol: - type: string - hostIP: - type: string - type: object - type: array - workingDir: - type: string - envFrom: - items: - properties: - prefix: - type: string - configMapRef: - properties: - optional: - type: boolean - name: - type: string - type: object - secretRef: - properties: - optional: - type: boolean - name: - type: string - type: object - type: object - type: array - volumeMounts: - items: - properties: - readOnly: - type: boolean - subPathExpr: - type: string - mountPath: - type: string - mountPropagation: - type: string - subPath: - type: string - name: - type: string - type: object - type: array - securityContext: - properties: - runAsGroup: - type: integer - runAsNonRoot: - type: boolean - windowsOptions: - properties: - gmsaCredentialSpecName: - type: string - hostProcess: - type: boolean - gmsaCredentialSpec: - type: string - runAsUserName: - type: string - type: object - allowPrivilegeEscalation: - type: boolean - capabilities: - properties: - add: - items: - type: string - type: array - drop: - items: - type: string - type: array - type: object - seLinuxOptions: - properties: - role: - type: string - type: - type: string - user: - type: string - level: - type: string - type: object - readOnlyRootFilesystem: - type: boolean - privileged: - type: boolean - runAsUser: - type: integer - procMount: - type: string - seccompProfile: - properties: - type: - type: string - localhostProfile: - type: string - type: object - type: object - name: - type: string - resources: - properties: - limits: - additionalProperties: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - requests: - additionalProperties: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - type: object - imagePullPolicy: - type: string - volumeDevices: - items: - properties: - devicePath: - type: string - name: - type: string - type: object - type: array - type: object - type: array - automountServiceAccountToken: - type: boolean - containers: - items: - properties: - lifecycle: - properties: - postStart: - properties: - tcpSocket: - properties: - host: - type: string - port: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - exec: - properties: - command: - items: - type: string - type: array - type: object - httpGet: - properties: - path: - type: string - scheme: - type: string - host: - type: string - httpHeaders: - items: - properties: - value: - type: string - name: - type: string - type: object - type: array - port: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - type: object - preStop: - properties: - tcpSocket: - properties: - host: - type: string - port: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - exec: - properties: - command: - items: - type: string - type: array - type: object - httpGet: - properties: - path: - type: string - scheme: - type: string - host: - type: string - httpHeaders: - items: - properties: - value: - type: string - name: - type: string - type: object - type: array - port: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - type: object - type: object - command: - items: - type: string - type: array - livenessProbe: - properties: - periodSeconds: - type: integer - failureThreshold: - type: integer - initialDelaySeconds: - type: integer - grpc: - properties: - port: - type: integer - service: - type: string - type: object - successThreshold: - type: integer - terminationGracePeriodSeconds: - type: integer - tcpSocket: - properties: - host: - type: string - port: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - timeoutSeconds: - type: integer - exec: - properties: - command: - items: - type: string - type: array - type: object - httpGet: - properties: - path: - type: string - scheme: - type: string - host: - type: string - httpHeaders: - items: - properties: - value: - type: string - name: - type: string - type: object - type: array - port: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - type: object - stdin: - type: boolean - image: - type: string - terminationMessagePolicy: - type: string - readinessProbe: - properties: - periodSeconds: - type: integer - failureThreshold: - type: integer - initialDelaySeconds: - type: integer - grpc: - properties: - port: - type: integer - service: - type: string - type: object - successThreshold: - type: integer - terminationGracePeriodSeconds: - type: integer - tcpSocket: - properties: - host: - type: string - port: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - timeoutSeconds: - type: integer - exec: - properties: - command: - items: - type: string - type: array - type: object - httpGet: - properties: - path: - type: string - scheme: - type: string - host: - type: string - httpHeaders: - items: - properties: - value: - type: string - name: - type: string - type: object - type: array - port: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - type: object - terminationMessagePath: - type: string - env: - items: - properties: - value: - type: string - valueFrom: - properties: - configMapKeyRef: - properties: - optional: - type: boolean - key: - type: string - name: - type: string - type: object - fieldRef: - properties: - apiVersion: - type: string - fieldPath: - type: string - type: object - resourceFieldRef: - properties: - containerName: - type: string - divisor: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - resource: - type: string - type: object - secretKeyRef: - properties: - optional: - type: boolean - key: - type: string - name: - type: string - type: object - type: object - name: - type: string - type: object - type: array - tty: - type: boolean - args: - items: - type: string - type: array - startupProbe: - properties: - periodSeconds: - type: integer - failureThreshold: - type: integer - initialDelaySeconds: - type: integer - grpc: - properties: - port: - type: integer - service: - type: string - type: object - successThreshold: - type: integer - terminationGracePeriodSeconds: - type: integer - tcpSocket: - properties: - host: - type: string - port: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - timeoutSeconds: - type: integer - exec: - properties: - command: - items: - type: string - type: array - type: object - httpGet: - properties: - path: - type: string - scheme: - type: string - host: - type: string - httpHeaders: - items: - properties: - value: - type: string - name: - type: string - type: object - type: array - port: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - type: object - stdinOnce: - type: boolean - ports: - items: - properties: - containerPort: - type: integer - hostPort: - type: integer - name: - type: string - protocol: - type: string - hostIP: - type: string - type: object - type: array - workingDir: - type: string - envFrom: - items: - properties: - prefix: - type: string - configMapRef: - properties: - optional: - type: boolean - name: - type: string - type: object - secretRef: - properties: - optional: - type: boolean - name: - type: string - type: object - type: object - type: array - volumeMounts: - items: - properties: - readOnly: - type: boolean - subPathExpr: - type: string - mountPath: - type: string - mountPropagation: - type: string - subPath: - type: string - name: - type: string - type: object - type: array - securityContext: - properties: - runAsGroup: - type: integer - runAsNonRoot: - type: boolean - windowsOptions: - properties: - gmsaCredentialSpecName: - type: string - hostProcess: - type: boolean - gmsaCredentialSpec: - type: string - runAsUserName: - type: string - type: object - allowPrivilegeEscalation: - type: boolean - capabilities: - properties: - add: - items: - type: string - type: array - drop: - items: - type: string - type: array - type: object - seLinuxOptions: - properties: - role: - type: string - type: - type: string - user: - type: string - level: - type: string - type: object - readOnlyRootFilesystem: - type: boolean - privileged: - type: boolean - runAsUser: - type: integer - procMount: - type: string - seccompProfile: - properties: - type: - type: string - localhostProfile: - type: string - type: object - type: object - name: - type: string - resources: - properties: - limits: - additionalProperties: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - requests: - additionalProperties: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - type: object - imagePullPolicy: - type: string - volumeDevices: - items: - properties: - devicePath: - type: string - name: - type: string - type: object - type: array - type: object - type: array - initContainers: - items: - properties: - lifecycle: - properties: - postStart: - properties: - tcpSocket: - properties: - host: - type: string - port: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - exec: - properties: - command: - items: - type: string - type: array - type: object - httpGet: - properties: - path: - type: string - scheme: - type: string - host: - type: string - httpHeaders: - items: - properties: - value: - type: string - name: - type: string - type: object - type: array - port: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - type: object - preStop: - properties: - tcpSocket: - properties: - host: - type: string - port: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - exec: - properties: - command: - items: - type: string - type: array - type: object - httpGet: - properties: - path: - type: string - scheme: - type: string - host: - type: string - httpHeaders: - items: - properties: - value: - type: string - name: - type: string - type: object - type: array - port: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - type: object - type: object - command: - items: - type: string - type: array - livenessProbe: - properties: - periodSeconds: - type: integer - failureThreshold: - type: integer - initialDelaySeconds: - type: integer - grpc: - properties: - port: - type: integer - service: - type: string - type: object - successThreshold: - type: integer - terminationGracePeriodSeconds: - type: integer - tcpSocket: - properties: - host: - type: string - port: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - timeoutSeconds: - type: integer - exec: - properties: - command: - items: - type: string - type: array - type: object - httpGet: - properties: - path: - type: string - scheme: - type: string - host: - type: string - httpHeaders: - items: - properties: - value: - type: string - name: - type: string - type: object - type: array - port: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - type: object - stdin: - type: boolean - image: - type: string - terminationMessagePolicy: - type: string - readinessProbe: - properties: - periodSeconds: - type: integer - failureThreshold: - type: integer - initialDelaySeconds: - type: integer - grpc: - properties: - port: - type: integer - service: - type: string - type: object - successThreshold: - type: integer - terminationGracePeriodSeconds: - type: integer - tcpSocket: - properties: - host: - type: string - port: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - timeoutSeconds: - type: integer - exec: - properties: - command: - items: - type: string - type: array - type: object - httpGet: - properties: - path: - type: string - scheme: - type: string - host: - type: string - httpHeaders: - items: - properties: - value: - type: string - name: - type: string - type: object - type: array - port: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - type: object - terminationMessagePath: - type: string - env: - items: - properties: - value: - type: string - valueFrom: - properties: - configMapKeyRef: - properties: - optional: - type: boolean - key: - type: string - name: - type: string - type: object - fieldRef: - properties: - apiVersion: - type: string - fieldPath: - type: string - type: object - resourceFieldRef: - properties: - containerName: - type: string - divisor: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - resource: - type: string - type: object - secretKeyRef: - properties: - optional: - type: boolean - key: - type: string - name: - type: string - type: object - type: object - name: - type: string - type: object - type: array - tty: - type: boolean - args: - items: - type: string - type: array - startupProbe: - properties: - periodSeconds: - type: integer - failureThreshold: - type: integer - initialDelaySeconds: - type: integer - grpc: - properties: - port: - type: integer - service: - type: string - type: object - successThreshold: - type: integer - terminationGracePeriodSeconds: - type: integer - tcpSocket: - properties: - host: - type: string - port: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - timeoutSeconds: - type: integer - exec: - properties: - command: - items: - type: string - type: array - type: object - httpGet: - properties: - path: - type: string - scheme: - type: string - host: - type: string - httpHeaders: - items: - properties: - value: - type: string - name: - type: string - type: object - type: array - port: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - type: object - stdinOnce: - type: boolean - ports: - items: - properties: - containerPort: - type: integer - hostPort: - type: integer - name: - type: string - protocol: - type: string - hostIP: - type: string - type: object - type: array - workingDir: - type: string - envFrom: - items: - properties: - prefix: - type: string - configMapRef: - properties: - optional: - type: boolean - name: - type: string - type: object - secretRef: - properties: - optional: - type: boolean - name: - type: string - type: object - type: object - type: array - volumeMounts: - items: - properties: - readOnly: - type: boolean - subPathExpr: - type: string - mountPath: - type: string - mountPropagation: - type: string - subPath: - type: string - name: - type: string - type: object - type: array - securityContext: - properties: - runAsGroup: - type: integer - runAsNonRoot: - type: boolean - windowsOptions: - properties: - gmsaCredentialSpecName: - type: string - hostProcess: - type: boolean - gmsaCredentialSpec: - type: string - runAsUserName: - type: string - type: object - allowPrivilegeEscalation: - type: boolean - capabilities: - properties: - add: - items: - type: string - type: array - drop: - items: - type: string - type: array - type: object - seLinuxOptions: - properties: - role: - type: string - type: - type: string - user: - type: string - level: - type: string - type: object - readOnlyRootFilesystem: - type: boolean - privileged: - type: boolean - runAsUser: - type: integer - procMount: - type: string - seccompProfile: - properties: - type: - type: string - localhostProfile: - type: string - type: object - type: object - name: - type: string - resources: - properties: - limits: - additionalProperties: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - requests: - additionalProperties: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - type: object - imagePullPolicy: - type: string - volumeDevices: - items: - properties: - devicePath: - type: string - name: - type: string - type: object - type: array - type: object - type: array - priorityClassName: - type: string - tolerations: - items: - properties: - key: - type: string - operator: - type: string - tolerationSeconds: - type: integer - value: - type: string - effect: - type: string - type: object - type: array - hostPID: - type: boolean - os: - properties: - name: - type: string - type: object - serviceAccountName: - type: string - shareProcessNamespace: - type: boolean - hostNetwork: - type: boolean - hostname: - type: string - nodeSelector: - additionalProperties: - type: string - type: object - enableServiceLinks: - type: boolean - affinity: - properties: - podAntiAffinity: - properties: - requiredDuringSchedulingIgnoredDuringExecution: - items: - properties: - namespaces: - items: - type: string - type: array - topologyKey: - type: string - labelSelector: - properties: - matchExpressions: - items: - properties: - key: - type: string - values: - items: - type: string - type: array - operator: - type: string - type: object - type: array - matchLabels: - additionalProperties: - type: string - type: object - type: object - namespaceSelector: - properties: - matchExpressions: - items: - properties: - key: - type: string - values: - items: - type: string - type: array - operator: - type: string - type: object - type: array - matchLabels: - additionalProperties: - type: string - type: object - type: object - type: object - type: array - preferredDuringSchedulingIgnoredDuringExecution: - items: - properties: - podAffinityTerm: - properties: - namespaces: - items: - type: string - type: array - topologyKey: - type: string - labelSelector: - properties: - matchExpressions: - items: - properties: - key: - type: string - values: - items: - type: string - type: array - operator: - type: string - type: object - type: array - matchLabels: - additionalProperties: - type: string - type: object - type: object - namespaceSelector: - properties: - matchExpressions: - items: - properties: - key: - type: string - values: - items: - type: string - type: array - operator: - type: string - type: object - type: array - matchLabels: - additionalProperties: - type: string - type: object - type: object - type: object - weight: - type: integer - type: object - type: array - type: object - nodeAffinity: - properties: - preferredDuringSchedulingIgnoredDuringExecution: - items: - properties: - weight: - type: integer - preference: - properties: - matchFields: - items: - properties: - key: - type: string - values: - items: - type: string - type: array - operator: - type: string - type: object - type: array - matchExpressions: - items: - properties: - key: - type: string - values: - items: - type: string - type: array - operator: - type: string - type: object - type: array - type: object - type: object - type: array - requiredDuringSchedulingIgnoredDuringExecution: - properties: - nodeSelectorTerms: - items: - properties: - matchFields: - items: - properties: - key: - type: string - values: - items: - type: string - type: array - operator: - type: string - type: object - type: array - matchExpressions: - items: - properties: - key: - type: string - values: - items: - type: string - type: array - operator: - type: string - type: object - type: array - type: object - type: array - type: object - type: object - podAffinity: - properties: - requiredDuringSchedulingIgnoredDuringExecution: - items: - properties: - namespaces: - items: - type: string - type: array - topologyKey: - type: string - labelSelector: - properties: - matchExpressions: - items: - properties: - key: - type: string - values: - items: - type: string - type: array - operator: - type: string - type: object - type: array - matchLabels: - additionalProperties: - type: string - type: object - type: object - namespaceSelector: - properties: - matchExpressions: - items: - properties: - key: - type: string - values: - items: - type: string - type: array - operator: - type: string - type: object - type: array - matchLabels: - additionalProperties: - type: string - type: object - type: object - type: object - type: array - preferredDuringSchedulingIgnoredDuringExecution: - items: - properties: - podAffinityTerm: - properties: - namespaces: - items: - type: string - type: array - topologyKey: - type: string - labelSelector: - properties: - matchExpressions: - items: - properties: - key: - type: string - values: - items: - type: string - type: array - operator: - type: string - type: object - type: array - matchLabels: - additionalProperties: - type: string - type: object - type: object - namespaceSelector: - properties: - matchExpressions: - items: - properties: - key: - type: string - values: - items: - type: string - type: array - operator: - type: string - type: object - type: array - matchLabels: - additionalProperties: - type: string - type: object - type: object - type: object - weight: - type: integer - type: object - type: array - type: object - type: object - readinessGates: - items: - properties: - conditionType: - type: string - type: object - type: array - dnsPolicy: - type: string - hostIPC: - type: boolean - topologySpreadConstraints: - items: - properties: - topologyKey: - type: string - maxSkew: - type: integer - whenUnsatisfiable: - type: string - labelSelector: - properties: - matchExpressions: - items: - properties: - key: - type: string - values: - items: - type: string - type: array - operator: - type: string - type: object - type: array - matchLabels: - additionalProperties: - type: string - type: object - type: object - type: object - type: array - overhead: - additionalProperties: - anyOf: - - type: integer - - type: string - x-kubernetes-int-or-string: true - type: object - schedulerName: - type: string - nodeName: - type: string - preemptionPolicy: - type: string - hostAliases: - items: - properties: - hostnames: - items: - type: string - type: array - ip: - type: string - type: object - type: array - runtimeClassName: - type: string - type: object - type: object - type: object - ingress: - description: |- - The deployment is, by default, exposed through a basic ingress. - You can change this behaviour by setting the enabled property to false. - properties: - enabled: - type: boolean - type: object - image: - description: Custom Keycloak image to be used. - type: string - imagePullSecrets: - description: Secret(s) that might be used when pulling an image from - a private container image registry or repository. - items: - properties: - name: - type: string - type: object - type: array - additionalOptions: - description: |- - Configuration of the Keycloak server. - expressed as a keys (reference: https://www.keycloak.org/server/all-config) and values that can be either direct values or references to secrets. - items: - properties: - secret: - properties: - optional: - type: boolean - key: - type: string - name: - type: string - type: object - value: - type: string - name: - type: string - type: object - type: array - db: - description: In this section you can find all properties related to - connect to a database. - properties: - passwordSecret: - description: The reference to a secret holding the password of - the database user. - properties: - optional: - type: boolean - key: - type: string - name: - type: string - type: object - usernameSecret: - description: The reference to a secret holding the username of - the database user. - properties: - optional: - type: boolean - key: - type: string - name: - type: string - type: object - port: - description: "Sets the port of the default JDBC URL of the chosen\ - \ vendor. If the `url` option is set, this option is ignored." - type: integer - schema: - description: The database schema to be used. - type: string - host: - description: "Sets the hostname of the default JDBC URL of the\ - \ chosen vendor. If the `url` option is set, this option is\ - \ ignored." - type: string - url: - description: "The full database JDBC URL. If not provided, a default\ - \ URL is set based on the selected database vendor. For instance,\ - \ if using 'postgres', the default JDBC URL would be 'jdbc:postgresql://localhost/keycloak'. " - type: string - poolInitialSize: - description: The initial size of the connection pool. - type: integer - poolMaxSize: - description: The maximum size of the connection pool. - type: integer - vendor: - description: The database vendor. - type: string - database: - description: "Sets the database name of the default JDBC URL of\ - \ the chosen vendor. If the `url` option is set, this option\ - \ is ignored." - type: string - poolMinSize: - description: The minimal size of the connection pool. - type: integer - type: object - features: - description: "In this section you can configure Keycloak features,\ - \ which should be enabled/disabled." - properties: - disabled: - description: Disabled Keycloak features - items: - type: string - type: array - enabled: - description: Enabled Keycloak features - items: - type: string - type: array - type: object - type: object - status: - properties: - conditions: - items: - properties: - status: - type: boolean - type: - type: string - message: - type: string - type: object - type: array - type: object - type: object - served: true - storage: true - subresources: - status: {} diff --git a/charts/kubezero-auth/dashboards-keycloak.yaml b/charts/kubezero-auth/dashboards-keycloak.yaml deleted file mode 100644 index 033324fc..00000000 --- a/charts/kubezero-auth/dashboards-keycloak.yaml +++ /dev/null @@ -1,8 +0,0 @@ -configmap: grafana-dashboards -condition: '.Values.keycloak.metrics.enabled' -gzip: true -# folder: -dashboards: -- name: keycloak - url: https://grafana.com/api/dashboards/10441/revisions/2/download - tags: ['Keycloak', 'Auth'] diff --git a/charts/kubezero-auth/keycloak.patch b/charts/kubezero-auth/keycloak.patch deleted file mode 100644 index bde84836..00000000 --- a/charts/kubezero-auth/keycloak.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- templates/keycloak/operator.yaml.orig 2022-05-11 12:46:15.860204871 +0200 -+++ templates/keycloak/operator.yaml 2022-05-11 12:46:02.840068240 +0200 -@@ -1,3 +1,4 @@ -+{{- if .Values.keycloak.enabled }} - --- - apiVersion: v1 - kind: ServiceAccount -@@ -233,3 +234,4 @@ - successThreshold: 1 - timeoutSeconds: 10 - serviceAccountName: keycloak-operator -+{{- end }} diff --git a/charts/kubezero-auth/templates/keycloak/grafana-dashboards.yaml b/charts/kubezero-auth/templates/keycloak/grafana-dashboards.yaml deleted file mode 100644 index 8528a1ec..00000000 --- a/charts/kubezero-auth/templates/keycloak/grafana-dashboards.yaml +++ /dev/null @@ -1,13 +0,0 @@ -{{- if .Values.keycloak.metrics.enabled }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ printf "%s-%s" (include "kubezero-lib.fullname" $) "grafana-dashboards" | trunc 63 | trimSuffix "-" }} - namespace: {{ .Release.Namespace }} - labels: - grafana_dashboard: "1" - {{- include "kubezero-lib.labels" . | nindent 4 }} -binaryData: - keycloak.json.gz: - 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 -{{- end }} diff --git a/charts/kubezero-auth/templates/keycloak/istio-authorization-policy.yaml b/charts/kubezero-auth/templates/keycloak/istio-authorization-policy.yaml deleted file mode 100644 index 8cdbf8ee..00000000 --- a/charts/kubezero-auth/templates/keycloak/istio-authorization-policy.yaml +++ /dev/null @@ -1,36 +0,0 @@ -{{- if and .Values.keycloak.enabled .Values.keycloak.istio.enabled }} -apiVersion: security.istio.io/v1beta1 -kind: AuthorizationPolicy -metadata: - name: {{ .Release.Name }}-deny-metrics-ipblocks - namespace: istio-system - labels: - {{- include "kubezero-lib.labels" $ | nindent 4 }} -spec: - selector: - matchLabels: - app: istio-ingressgateway - action: DENY - rules: - - to: - - operation: - hosts: ["{{ .Values.keycloak.istio.url }}"] - paths: ["/auth/realms/master/metrics"] - when: - - key: connection.sni - values: - - '*' - {{- if .Values.keycloak.istio.ipBlocks }} - - from: - - source: - notIpBlocks: - {{- toYaml .Values.keycloak.istio.ipBlocks | nindent 8 }} - to: - - operation: - hosts: ["{{ .Values.keycloak.istio.url }}"] - when: - - key: connection.sni - values: - - '*' - {{- end }} -{{- end }} diff --git a/charts/kubezero-auth/templates/keycloak/istio-service.yaml b/charts/kubezero-auth/templates/keycloak/istio-service.yaml deleted file mode 100644 index 3032256a..00000000 --- a/charts/kubezero-auth/templates/keycloak/istio-service.yaml +++ /dev/null @@ -1,18 +0,0 @@ -{{- if and .Values.keycloak.enabled .Values.keycloak.istio.enabled .Values.keycloak.istio.url }} -apiVersion: networking.istio.io/v1beta1 -kind: VirtualService -metadata: - name: {{ template "kubezero-lib.fullname" $ }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "kubezero-lib.labels" $ | nindent 4 }} -spec: - gateways: - - {{ .Values.keycloak.istio.gateway }} - hosts: - - {{ .Values.keycloak.istio.url }} - http: - - route: - - destination: - host: {{ template "kubezero-lib.fullname" $ }}-service -{{- end }} diff --git a/charts/kubezero-auth/templates/keycloak/keycloak.yaml b/charts/kubezero-auth/templates/keycloak/keycloak.yaml deleted file mode 100644 index f11b23f5..00000000 --- a/charts/kubezero-auth/templates/keycloak/keycloak.yaml +++ /dev/null @@ -1,56 +0,0 @@ -{{- if .Values.keycloak.enabled }} -apiVersion: k8s.keycloak.org/v2alpha1 -kind: Keycloak -metadata: - name: {{ template "kubezero-lib.fullname" . }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "kubezero-lib.labels" . | nindent 4 }} -spec: - instances: {{ .Values.keycloak.replicas }} - - additionalOptions: - # Needs int casting thx to https://github.com/kubernetes-sigs/yaml/issues/45 - {{- if lt (int .Values.keycloak.replicas) 2 }} - - name: cache - value: local - {{- end }} - {{- if .Values.postgresql.enabled }} - - name: db - value: postgres - - name: db-url-host - value: {{ template "kubezero-lib.fullname" . }}-postgresql - - name: db-username - value: keycloak - - name: db-password - secret: - name: {{ template "kubezero-lib.fullname" . }}-postgresql - key: password - {{- else }} - # Fallback to local file within the pod - dev ONLY !! - - name: db - value: dev-file - {{- end }} - - name: hostname-strict-https - value: "false" - - name: proxy - value: edge - - name: http-enabled - value: "true" - - name: log-console-output - value: json - - - ingress: - enabled: false - - http: - httpEnabled: true - - # We use Istio Ingress to terminate TLS - # mTls down the road - hostname: - hostname: {{ default "keycloak" .Values.keycloak.istio.url }} - strict: false - strictBackchannel: false -{{- end }} diff --git a/charts/kubezero-auth/templates/keycloak/operator.yaml b/charts/kubezero-auth/templates/keycloak/operator.yaml deleted file mode 100644 index f31e3b22..00000000 --- a/charts/kubezero-auth/templates/keycloak/operator.yaml +++ /dev/null @@ -1,237 +0,0 @@ -{{- if .Values.keycloak.enabled }} ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - annotations: - app.quarkus.io/build-timestamp: 2023-04-26 - 10:32:03 +0000 - labels: - app.kubernetes.io/name: keycloak-operator - app.kubernetes.io/version: 21.1.1 - name: keycloak-operator ---- -apiVersion: v1 -kind: Service -metadata: - annotations: - app.quarkus.io/build-timestamp: 2023-04-26 - 10:32:03 +0000 - labels: - app.kubernetes.io/name: keycloak-operator - app.kubernetes.io/version: 21.1.1 - name: keycloak-operator -spec: - ports: - - name: http - port: 80 - targetPort: 8080 - selector: - app.kubernetes.io/name: keycloak-operator - app.kubernetes.io/version: 21.1.1 - type: ClusterIP ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: keycloak-operator-role -rules: - - apiGroups: - - apps - - extensions - resources: - - statefulsets - verbs: - - get - - list - - watch - - create - - delete - - patch - - update - - apiGroups: - - "" - resources: - - secrets - - services - verbs: - - get - - list - - watch - - create - - delete - - patch - - update - - apiGroups: - - batch - resources: - - jobs - verbs: - - get - - list - - watch - - create - - delete - - patch - - update - - apiGroups: - - networking.k8s.io - resources: - - ingresses - verbs: - - get - - list - - watch - - create - - delete - - patch - - update ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - labels: - app.kubernetes.io/name: keycloak-operator - name: keycloak-operator-role-binding -roleRef: - kind: Role - apiGroup: rbac.authorization.k8s.io - name: keycloak-operator-role -subjects: - - kind: ServiceAccount - name: keycloak-operator ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: keycloak-operator-view -roleRef: - kind: ClusterRole - apiGroup: rbac.authorization.k8s.io - name: view -subjects: - - kind: ServiceAccount - name: keycloak-operator ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: keycloakcontroller-role-binding -roleRef: - kind: ClusterRole - apiGroup: rbac.authorization.k8s.io - name: keycloakcontroller-cluster-role -subjects: - - kind: ServiceAccount - name: keycloak-operator ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: keycloakrealmimportcontroller-role-binding -roleRef: - kind: ClusterRole - apiGroup: rbac.authorization.k8s.io - name: keycloakrealmimportcontroller-cluster-role -subjects: - - kind: ServiceAccount - name: keycloak-operator ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: keycloakcontroller-cluster-role -rules: - - apiGroups: - - k8s.keycloak.org - resources: - - keycloaks - - keycloaks/status - - keycloaks/finalizers - verbs: - - get - - list - - watch - - create - - delete - - patch - - update ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: keycloakrealmimportcontroller-cluster-role -rules: - - apiGroups: - - k8s.keycloak.org - resources: - - keycloakrealmimports - - keycloakrealmimports/status - - keycloakrealmimports/finalizers - verbs: - - get - - list - - watch - - create - - delete - - patch - - update ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - app.quarkus.io/build-timestamp: 2023-04-26 - 10:32:03 +0000 - labels: - app.kubernetes.io/name: keycloak-operator - app.kubernetes.io/version: 21.1.1 - name: keycloak-operator -spec: - replicas: 1 - selector: - matchLabels: - app.kubernetes.io/name: keycloak-operator - app.kubernetes.io/version: 21.1.1 - template: - metadata: - annotations: - app.quarkus.io/build-timestamp: 2023-04-26 - 10:32:03 +0000 - labels: - app.kubernetes.io/name: keycloak-operator - app.kubernetes.io/version: 21.1.1 - spec: - containers: - - env: - - name: KUBERNETES_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: OPERATOR_KEYCLOAK_IMAGE - value: quay.io/keycloak/keycloak:21.1.1 - image: quay.io/keycloak/keycloak-operator:21.1.1 - imagePullPolicy: Always - livenessProbe: - failureThreshold: 3 - httpGet: - path: /q/health/live - port: 8080 - scheme: HTTP - initialDelaySeconds: 0 - periodSeconds: 30 - successThreshold: 1 - timeoutSeconds: 10 - name: keycloak-operator - ports: - - containerPort: 8080 - name: http - protocol: TCP - readinessProbe: - failureThreshold: 3 - httpGet: - path: /q/health/ready - port: 8080 - scheme: HTTP - initialDelaySeconds: 0 - periodSeconds: 30 - successThreshold: 1 - timeoutSeconds: 10 - serviceAccountName: keycloak-operator -{{- end }} diff --git a/charts/kubezero-auth/templates/keycloak/pdb.yaml b/charts/kubezero-auth/templates/keycloak/pdb.yaml deleted file mode 100644 index 6386d207..00000000 --- a/charts/kubezero-auth/templates/keycloak/pdb.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if and .Values.keycloak.podDisruptionBudget (gt (int .Values.keycloak.replicas) 1) }} -apiVersion: policy/v1 -kind: PodDisruptionBudget -metadata: - name: {{ template "kubezero-lib.fullname" . }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "kubezero-lib.labels" . | nindent 4 }} -spec: - selector: - matchLabels: - app: keycloak - app.kubernetes.io/managed-by: keycloak-operator - {{- toYaml .Values.keycloak.podDisruptionBudget | nindent 2 }} -{{- end }} diff --git a/charts/kubezero-auth/update.sh b/charts/kubezero-auth/update.sh deleted file mode 100755 index 393f71a9..00000000 --- a/charts/kubezero-auth/update.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -# https://www.keycloak.org/operator/installation - -set -ex - -helm dep update - -# Operator -VERSION=$(yq eval '.appVersion' Chart.yaml) - -wget -O crds/keycloak.yaml https://raw.githubusercontent.com/keycloak/keycloak-k8s-resources/"${VERSION}"/kubernetes/keycloaks.k8s.keycloak.org-v1.yml -wget -O crds/keycloak-realmimports.yaml https://raw.githubusercontent.com/keycloak/keycloak-k8s-resources/"${VERSION}"/kubernetes/keycloakrealmimports.k8s.keycloak.org-v1.yml - -wget -O templates/keycloak/operator.yaml https://raw.githubusercontent.com/keycloak/keycloak-k8s-resources/"${VERSION}"/kubernetes/kubernetes.yml -patch -i keycloak.patch -p0 --no-backup-if-mismatch - -# Fetch dashboards -../kubezero-metrics/sync_grafana_dashboards.py dashboards-keycloak.yaml templates/keycloak/grafana-dashboards.yaml diff --git a/charts/kubezero-auth/values.yaml b/charts/kubezero-auth/values.yaml deleted file mode 100644 index 8cf95a5b..00000000 --- a/charts/kubezero-auth/values.yaml +++ /dev/null @@ -1,29 +0,0 @@ -keycloak: - enabled: false - - replicas: 1 - podDisruptionBudget: - minAvailable: 1 - - istio: - enabled: false - gateway: istio-ingress/private-ingressgateway - url: "" - - metrics: - enabled: false - -postgresql: - enabled: false - - auth: - existingSecret: kubezero-auth-postgresql - username: keycloak - database: keycloak - - primary: - persistence: - size: 1Gi - - readReplicas: - replicaCount: 0 diff --git a/charts/kubezero-cert-manager/.gitignore b/charts/kubezero-cert-manager/.gitignore deleted file mode 100644 index 22d0d82f..00000000 --- a/charts/kubezero-cert-manager/.gitignore +++ /dev/null @@ -1 +0,0 @@ -vendor diff --git a/charts/kubezero-cert-manager/.helmignore b/charts/kubezero-cert-manager/.helmignore deleted file mode 100644 index 2f309f27..00000000 --- a/charts/kubezero-cert-manager/.helmignore +++ /dev/null @@ -1,25 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ -vendor -rules diff --git a/charts/kubezero-cert-manager/Chart.yaml b/charts/kubezero-cert-manager/Chart.yaml deleted file mode 100644 index babc0c4c..00000000 --- a/charts/kubezero-cert-manager/Chart.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: v2 -name: kubezero-cert-manager -description: KubeZero Umbrella Chart for cert-manager -type: application -version: 0.9.4 -home: https://kubezero.com -icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png -keywords: - - kubezero - - cert-manager -maintainers: - - name: Stefan Reimer - email: stefan@zero-downtime.net -dependencies: - - name: kubezero-lib - version: ">= 0.1.6" - repository: https://cdn.zero-downtime.net/charts/ - - name: cert-manager - version: 1.11.1 - repository: https://charts.jetstack.io -kubeVersion: ">= 1.25.0" diff --git a/charts/kubezero-cert-manager/README.md b/charts/kubezero-cert-manager/README.md deleted file mode 100644 index 6917735f..00000000 --- a/charts/kubezero-cert-manager/README.md +++ /dev/null @@ -1,53 +0,0 @@ -# kubezero-cert-manager - -![Version: 0.9.4](https://img.shields.io/badge/Version-0.9.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) - -KubeZero Umbrella Chart for cert-manager - -**Homepage:** - -## Maintainers - -| Name | Email | Url | -| ---- | ------ | --- | -| Stefan Reimer | | | - -## Requirements - -Kubernetes: `>= 1.25.0` - -| Repository | Name | Version | -|------------|------|---------| -| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 | -| https://charts.jetstack.io | cert-manager | 1.11.1 | - -## AWS - OIDC IAM roles - -## Resolver Secrets -If your resolvers need additional sercrets like CloudFlare API tokens etc. make sure to provide these secrets separatly matching your defined issuers. - -## Resources -- [Backup & Restore](https://cert-manager.io/docs/tutorials/backup/) -## Values - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| cert-manager.cainjector.nodeSelector."node-role.kubernetes.io/control-plane" | string | `""` | | -| cert-manager.cainjector.tolerations[0].effect | string | `"NoSchedule"` | | -| cert-manager.cainjector.tolerations[0].key | string | `"node-role.kubernetes.io/control-plane"` | | -| cert-manager.enabled | bool | `true` | | -| cert-manager.extraArgs[0] | string | `"--dns01-recursive-nameservers-only"` | | -| cert-manager.global.leaderElection.namespace | string | `"cert-manager"` | | -| cert-manager.ingressShim.defaultIssuerKind | string | `"ClusterIssuer"` | | -| cert-manager.ingressShim.defaultIssuerName | string | `"letsencrypt-dns-prod"` | | -| cert-manager.nodeSelector."node-role.kubernetes.io/control-plane" | string | `""` | | -| cert-manager.prometheus.servicemonitor.enabled | bool | `false` | | -| cert-manager.startupapicheck.enabled | bool | `false` | | -| cert-manager.tolerations[0].effect | string | `"NoSchedule"` | | -| cert-manager.tolerations[0].key | string | `"node-role.kubernetes.io/control-plane"` | | -| cert-manager.webhook.nodeSelector."node-role.kubernetes.io/control-plane" | string | `""` | | -| cert-manager.webhook.tolerations[0].effect | string | `"NoSchedule"` | | -| cert-manager.webhook.tolerations[0].key | string | `"node-role.kubernetes.io/control-plane"` | | -| clusterIssuer | object | `{}` | | -| localCA.enabled | bool | `false` | | -| localCA.selfsigning | bool | `true` | | diff --git a/charts/kubezero-cert-manager/README.md.gotmpl b/charts/kubezero-cert-manager/README.md.gotmpl deleted file mode 100644 index 0d3b9061..00000000 --- a/charts/kubezero-cert-manager/README.md.gotmpl +++ /dev/null @@ -1,23 +0,0 @@ -{{ template "chart.header" . }} -{{ template "chart.deprecationWarning" . }} - -{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }} - -{{ template "chart.description" . }} - -{{ template "chart.homepageLine" . }} - -{{ template "chart.maintainersSection" . }} - -{{ template "chart.sourcesSection" . }} - -{{ template "chart.requirementsSection" . }} - -## AWS - OIDC IAM roles - -## Resolver Secrets -If your resolvers need additional sercrets like CloudFlare API tokens etc. make sure to provide these secrets separatly matching your defined issuers. - -## Resources -- [Backup & Restore](https://cert-manager.io/docs/tutorials/backup/) -{{ template "chart.valuesSection" . }} diff --git a/charts/kubezero-cert-manager/backup-all.sh b/charts/kubezero-cert-manager/backup-all.sh deleted file mode 100755 index 03707bb0..00000000 --- a/charts/kubezero-cert-manager/backup-all.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -kubectl get -A -o yaml issuer,clusterissuer,certificates,certificaterequests > cert-manager-backup.yaml -echo '---' >> cert-manager-backup.yaml -kubectl get -A -o yaml secrets --field-selector type=kubernetes.io/tls >> cert-manager-backup.yaml -echo '---' >> cert-manager-backup.yaml -kubectl get -o yaml secrets -n cert-manager letsencrypt-dns-prod >> cert-manager-backup.yaml diff --git a/charts/kubezero-cert-manager/cert-manager-rules.yaml b/charts/kubezero-cert-manager/cert-manager-rules.yaml deleted file mode 100644 index 2a72ef21..00000000 --- a/charts/kubezero-cert-manager/cert-manager-rules.yaml +++ /dev/null @@ -1,3 +0,0 @@ -rules: -- name: prometheus-rules - url: file://rules/cert-manager-mixin-prometheusRule diff --git a/charts/kubezero-cert-manager/dashboards.yaml b/charts/kubezero-cert-manager/dashboards.yaml deleted file mode 100644 index e0613f81..00000000 --- a/charts/kubezero-cert-manager/dashboards.yaml +++ /dev/null @@ -1,9 +0,0 @@ -configmap: grafana-dashboard -gzip: true -folder: KubeZero -condition: 'index .Values "cert-manager" "prometheus" "servicemonitor" "enabled"' -dashboards: -- name: cert-manager - url: https://gitlab.com/uneeq-oss/cert-manager-mixin/-/raw/master/dashboards/cert-manager.json - tags: - - cert-manager diff --git a/charts/kubezero-cert-manager/jsonnetfile.json b/charts/kubezero-cert-manager/jsonnetfile.json deleted file mode 100644 index 4fe58404..00000000 --- a/charts/kubezero-cert-manager/jsonnetfile.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "version": 1, - "dependencies": [ - { - "source": { - "git": { - "remote": "https://github.com/prometheus-operator/kube-prometheus.git", - "subdir": "jsonnet/kube-prometheus" - } - }, - "version": "release-0.10" - }, - { - "source": { - "git": { - "remote": "https://gitlab.com/uneeq-oss/cert-manager-mixin.git", - "subdir": "" - } - }, - "version": "master" - } - ], - "legacyImports": true -} diff --git a/charts/kubezero-cert-manager/jsonnetfile.lock.json b/charts/kubezero-cert-manager/jsonnetfile.lock.json deleted file mode 100644 index ffb2c5e1..00000000 --- a/charts/kubezero-cert-manager/jsonnetfile.lock.json +++ /dev/null @@ -1,170 +0,0 @@ -{ - "version": 1, - "dependencies": [ - { - "source": { - "git": { - "remote": "https://github.com/brancz/kubernetes-grafana.git", - "subdir": "grafana" - } - }, - "version": "199e363523104ff8b3a12483a4e3eca86372b078", - "sum": "/jDHzVAjHB4AOLkJHw1GyATX5ogZ1iMdcJXZAgaG3+g=" - }, - { - "source": { - "git": { - "remote": "https://github.com/etcd-io/etcd.git", - "subdir": "contrib/mixin" - } - }, - "version": "9d2cda4e44a26f064d8578e258bbba2fc3cd5b73", - "sum": "W/Azptf1PoqjyMwJON96UY69MFugDA4IAYiKURscryc=" - }, - { - "source": { - "git": { - "remote": "https://github.com/grafana/grafonnet-lib.git", - "subdir": "grafonnet" - } - }, - "version": "f0b70307b8e5f12236b277883d998af129a8211f", - "sum": "342u++/7rViR/zj2jeJOjshzglkZ1SY+hFNuyCBFMdc=" - }, - { - "source": { - "git": { - "remote": "https://github.com/grafana/jsonnet-libs.git", - "subdir": "grafana-builder" - } - }, - "version": "e0b90a4435817ad642d8d049e7dd975264cb960e", - "sum": "tDR6yT2GVfw0wTU12iZH+m01HrbIr6g/xN+/8nzNkU0=" - }, - { - "source": { - "git": { - "remote": "https://github.com/kubernetes-monitoring/kubernetes-mixin.git", - "subdir": "" - } - }, - "version": "ab104c5c406b91078d676475c14ab18644f84f2d", - "sum": "tRpIInEClWUNe5IS6uIjucFN/KqDFgg19+yo78VrLfU=" - }, - { - "source": { - "git": { - "remote": "https://github.com/kubernetes-monitoring/kubernetes-mixin.git", - "subdir": "lib/promgrafonnet" - } - }, - "version": "eed459199703c969afc318ea55b9361ae48180a7", - "sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps=" - }, - { - "source": { - "git": { - "remote": "https://github.com/kubernetes/kube-state-metrics.git", - "subdir": "jsonnet/kube-state-metrics" - } - }, - "version": "e080c3ce73ad514254e38dccb37c93bec6b257ae", - "sum": "U1wzIpTAtOvC1yj43Y8PfvT0JfvnAcMfNH12Wi+ab0Y=" - }, - { - "source": { - "git": { - "remote": "https://github.com/kubernetes/kube-state-metrics.git", - "subdir": "jsonnet/kube-state-metrics-mixin" - } - }, - "version": "e080c3ce73ad514254e38dccb37c93bec6b257ae", - "sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk=" - }, - { - "source": { - "git": { - "remote": "https://github.com/prometheus-operator/kube-prometheus.git", - "subdir": "jsonnet/kube-prometheus" - } - }, - "version": "e7eff18e7e70d7f1168105521451c4d7bd6a6d96", - "sum": "gcgf9y8wos4W8jgcJKuTDfORYDigCxx+q3QOYEijQFo=" - }, - { - "source": { - "git": { - "remote": "https://github.com/prometheus-operator/prometheus-operator.git", - "subdir": "jsonnet/mixin" - } - }, - "version": "d8ba1c766a141cb35072ae2f2578ec8588c9efcd", - "sum": "qZ4WgiweaE6eeKtFK60QUjLO8sf2L9Q8fgafWvDcyfY=", - "name": "prometheus-operator-mixin" - }, - { - "source": { - "git": { - "remote": "https://github.com/prometheus-operator/prometheus-operator.git", - "subdir": "jsonnet/prometheus-operator" - } - }, - "version": "d8ba1c766a141cb35072ae2f2578ec8588c9efcd", - "sum": "yjdwZ+5UXL42EavJleAJmd8Ou6MSDfExvlKAxFCxXVE=" - }, - { - "source": { - "git": { - "remote": "https://github.com/prometheus/alertmanager.git", - "subdir": "doc/alertmanager-mixin" - } - }, - "version": "16fa045db47d68a09a102c7b80b8899c1f57c153", - "sum": "pep+dHzfIjh2SU5pEkwilMCAT/NoL6YYflV4x8cr7vU=", - "name": "alertmanager" - }, - { - "source": { - "git": { - "remote": "https://github.com/prometheus/node_exporter.git", - "subdir": "docs/node-mixin" - } - }, - "version": "a2321e7b940ddcff26873612bccdf7cd4c42b6b6", - "sum": "MlWDAKGZ+JArozRKdKEvewHeWn8j2DNBzesJfLVd0dk=" - }, - { - "source": { - "git": { - "remote": "https://github.com/prometheus/prometheus.git", - "subdir": "documentation/prometheus-mixin" - } - }, - "version": "41f1a8125e664985dd30674e5bdf6b683eff5d32", - "sum": "ZjQoYhvgKwJNkg+h+m9lW3SYjnjv5Yx5btEipLhru88=", - "name": "prometheus" - }, - { - "source": { - "git": { - "remote": "https://github.com/thanos-io/thanos.git", - "subdir": "mixin" - } - }, - "version": "fb97c9a5ef51849ccb7960abbeb9581ad7f511b9", - "sum": "X+060DnePPeN/87fgj0SrfxVitywTk8hZA9V4nHxl1g=", - "name": "thanos-mixin" - }, - { - "source": { - "git": { - "remote": "https://gitlab.com/uneeq-oss/cert-manager-mixin.git", - "subdir": "" - } - }, - "version": "eae22f642aaa5d422e4766f6811df2158fc05539", - "sum": "DOg3fzS0OWrjjRPVsKgxID/rk9AC3ESQ4gDELc2RNgM=" - } - ], - "legacyImports": false -} diff --git a/charts/kubezero-cert-manager/rules.jsonnet b/charts/kubezero-cert-manager/rules.jsonnet deleted file mode 100644 index 1302a5c2..00000000 --- a/charts/kubezero-cert-manager/rules.jsonnet +++ /dev/null @@ -1,9 +0,0 @@ -local addMixin = (import 'kube-prometheus/lib/mixin.libsonnet'); - -local certManagerMixin = addMixin({ - name: 'cert-manager', - mixin: (import 'gitlab.com/uneeq-oss/cert-manager-mixin/mixin.libsonnet') - }); - -{ 'cert-manager-mixin-prometheusRule': certManagerMixin.prometheusRules } - diff --git a/charts/kubezero-cert-manager/rules/cert-manager-mixin-prometheusRule b/charts/kubezero-cert-manager/rules/cert-manager-mixin-prometheusRule deleted file mode 100644 index 7e858081..00000000 --- a/charts/kubezero-cert-manager/rules/cert-manager-mixin-prometheusRule +++ /dev/null @@ -1,80 +0,0 @@ -{ - "apiVersion": "monitoring.coreos.com/v1", - "kind": "PrometheusRule", - "metadata": { - "labels": { - "prometheus": "k8s" - }, - "name": "cert-manager", - "namespace": "monitoring" - }, - "spec": { - "groups": [ - { - "name": "cert-manager", - "rules": [ - { - "alert": "CertManagerAbsent", - "annotations": { - "description": "New certificates will not be able to be minted, and existing ones can't be renewed until cert-manager is back.", - "runbook_url": "https://gitlab.com/uneeq-oss/cert-manager-mixin/-/blob/master/RUNBOOK.md#certmanagerabsent", - "summary": "Cert Manager has dissapeared from Prometheus service discovery." - }, - "expr": "absent(up{job=\"cert-manager\"})", - "for": "10m", - "labels": { - "severity": "critical" - } - } - ] - }, - { - "name": "certificates", - "rules": [ - { - "alert": "CertManagerCertExpirySoon", - "annotations": { - "dashboard_url": "https://grafana.example.com/d/TvuRo2iMk/cert-manager", - "description": "The domain that this cert covers will be unavailable after {{ $value | humanizeDuration }}. Clients using endpoints that this cert protects will start to fail in {{ $value | humanizeDuration }}.", - "runbook_url": "https://gitlab.com/uneeq-oss/cert-manager-mixin/-/blob/master/RUNBOOK.md#certmanagercertexpirysoon", - "summary": "The cert `{{ $labels.name }}` is {{ $value | humanizeDuration }} from expiry, it should have renewed over a week ago." - }, - "expr": "avg by (exported_namespace, namespace, name) (\n certmanager_certificate_expiration_timestamp_seconds - time()\n) < (21 * 24 * 3600) # 21 days in seconds\n", - "for": "1h", - "labels": { - "severity": "warning" - } - }, - { - "alert": "CertManagerCertNotReady", - "annotations": { - "dashboard_url": "https://grafana.example.com/d/TvuRo2iMk/cert-manager", - "description": "This certificate has not been ready to serve traffic for at least 10m. If the cert is being renewed or there is another valid cert, the ingress controller _may_ be able to serve that instead.", - "runbook_url": "https://gitlab.com/uneeq-oss/cert-manager-mixin/-/blob/master/RUNBOOK.md#certmanagercertnotready", - "summary": "The cert `{{ $labels.name }}` is not ready to serve traffic." - }, - "expr": "max by (name, exported_namespace, namespace, condition) (\n certmanager_certificate_ready_status{condition!=\"True\"} == 1\n)\n", - "for": "10m", - "labels": { - "severity": "critical" - } - }, - { - "alert": "CertManagerHittingRateLimits", - "annotations": { - "dashboard_url": "https://grafana.example.com/d/TvuRo2iMk/cert-manager", - "description": "Depending on the rate limit, cert-manager may be unable to generate certificates for up to a week.", - "runbook_url": "https://gitlab.com/uneeq-oss/cert-manager-mixin/-/blob/master/RUNBOOK.md#certmanagerhittingratelimits", - "summary": "Cert manager hitting LetsEncrypt rate limits." - }, - "expr": "sum by (host) (\n rate(certmanager_http_acme_client_request_count{status=\"429\"}[5m])\n) > 0\n", - "for": "5m", - "labels": { - "severity": "critical" - } - } - ] - } - ] - } -} diff --git a/charts/kubezero-cert-manager/templates/cluster-ca.yaml b/charts/kubezero-cert-manager/templates/cluster-ca.yaml deleted file mode 100644 index 01889599..00000000 --- a/charts/kubezero-cert-manager/templates/cluster-ca.yaml +++ /dev/null @@ -1,64 +0,0 @@ -{{- if .Values.localCA.enabled }} -{{- if .Values.localCA.selfsigning }} - -# KubeZero / Local cluster CA -# The resources are serialized via waves in Argo -apiVersion: cert-manager.io/v1 -kind: ClusterIssuer -metadata: - name: kubezero-selfsigning-issuer - namespace: {{ .Release.Namespace }} - labels: -{{ include "kubezero-lib.labels" . | indent 4 }} - annotations: - argocd.argoproj.io/sync-wave: "10" -spec: - selfSigned: {} ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: kubezero-local-ca - namespace: {{ .Release.Namespace }} - labels: -{{ include "kubezero-lib.labels" . | indent 4 }} - annotations: - argocd.argoproj.io/sync-wave: "11" -spec: - secretName: kubezero-ca-tls - commonName: "kubezero-local-ca" - isCA: true - issuerRef: - name: kubezero-selfsigning-issuer - kind: ClusterIssuer - usages: - - "any" ---- - -{{ else }} -apiVersion: v1 -kind: Secret -metadata: - name: kubezero-ca-tls - namespace: {{ .Release.Namespace }} - labels: -{{ include "kubezero-lib.labels" . | indent 4 }} -data: - tls.crt: {{ .Values.localCA.ca.crt | b64enc }} - tls.key: {{ .Values.localCA.ca.key | b64enc }} ---- -{{- end }} - -apiVersion: cert-manager.io/v1 -kind: ClusterIssuer -metadata: - name: kubezero-local-ca-issuer - namespace: {{ .Release.Namespace }} - labels: -{{ include "kubezero-lib.labels" . | indent 4 }} - annotations: - argocd.argoproj.io/sync-wave: "12" -spec: - ca: - secretName: kubezero-ca-tls -{{- end }} diff --git a/charts/kubezero-cert-manager/templates/cluster-issuer.yaml b/charts/kubezero-cert-manager/templates/cluster-issuer.yaml deleted file mode 100644 index f7280fc4..00000000 --- a/charts/kubezero-cert-manager/templates/cluster-issuer.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{- if .Values.clusterIssuer.name }} -apiVersion: cert-manager.io/v1 -kind: ClusterIssuer -metadata: - name: {{ .Values.clusterIssuer.name }} - labels: -{{ include "kubezero-lib.labels" . | indent 4 }} -spec: - acme: - server: {{ .Values.clusterIssuer.server }} - email: {{ .Values.clusterIssuer.email }} - privateKeySecretRef: - name: {{ .Values.clusterIssuer.name }} - solvers: -{{ toYaml .Values.clusterIssuer.solvers | indent 6 }} -{{- end }} diff --git a/charts/kubezero-cert-manager/templates/grafana-dashboards.yaml b/charts/kubezero-cert-manager/templates/grafana-dashboards.yaml deleted file mode 100644 index 45cfc655..00000000 --- a/charts/kubezero-cert-manager/templates/grafana-dashboards.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if index .Values "cert-manager" "prometheus" "servicemonitor" "enabled" }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ printf "%s-%s" (include "kubezero-lib.fullname" $) "grafana-dashboard" | trunc 63 | trimSuffix "-" }} - namespace: {{ .Release.Namespace }} - labels: - grafana_dashboard: "1" - {{- include "kubezero-lib.labels" . | nindent 4 }} - annotations: - k8s-sidecar-target-directory: KubeZero -binaryData: - cert-manager.json.gz: - H4sIAAAAAAAC/+1d+2/bOBL+vX8FoT0cmoWTWG6SJgfsAUmuuRZou0GTFthrCoOWaJsbmdSSVBJvkP/9htSLelh2/GjTVvnBsUiKjxnON9+MHr5/hpCDGeMKK8qZdP6F7qEICgMqFRx9NkcoKTU1g4gG6g2DSreTl/pYYckj4RGocM4FnxA1JpF0rDaE4UGg65WIiFU+pn5NKfU4O+UBF7pDMRrg590O6rkufOzvd5C7ZXfN8MQMfJyvBf0THQdEqMIU1DQ07XwsxwOOhe8kdQ/m/xf4fNDNHZ9IT9BQ96Tbmz4c4lNVWoIzYkS98aGERUEQlwgcji85DxQNUyk5VDfZP4q/KyJw0rN74B7s7e0fHvVednumNqDsWivi8xdzGGJGApmpIlXEfIGXl3A5JjDHyYAIxIfIA8nQIfWwIhJRhuBcJAj2p0iC/MhO3s2QksA/5WxIR9n2SPof4ihQslAK5V4kFZ/o0oeOXT7BYUjZKF9brpWxIHLMA7/clz6Lm83h4IHkQaSI0ynWS0VCae3U9O++dKwnlu6mkSCElToyLW5wEJFEl6Xah84jBhDEb+reLfddOP7yrK7GGt/hN0QIMJryusuiw8obE1GRabodncH0vbab8kwdHqZo4FzCPneeNQjCCQUP9WYiC2ohHtpSeYOgqqfP3xFz9sWseS26R+bvlDqdVjVb32qRnZCWZoqAuVL/nBeNxxnD4aG1aW71xutZBXdQ0LWOp/q40rdRV3aatTWsoYzQ3iVqiSVj9WvwMK3FADJ25Z8AFnQ4zaojxe1qLihhKgXLSjXYWeSR32vmpGeFA6+6A5wAS/Weq/egOHtjFxHJgJ7MkL+odl0+xIEktcapyJ0qgZ8pKyyxIuYwiEaUfSJCJkt9ubO3s5+jsMJiRFRxOYXVkrvQ7FsZTdBgip6D9wRvBZ1twXewzwlmeERE3wL+vgH8vgb8SG4VF0oZOClYbVUEARkR5p9xAfCia+/vs6EeHopNBRka1+gc55JO9/GXfGl0Qs6E8RipD83KL8Z0qKoVyvhg59R2Yh/0YiyBJZ5ery4ePRH2Izzo2lyfTzw6wcaNu0/UJ85xWat6xF9eHZ8cvjhqGuKgu3fY7a4yyFy/7va6RwfVMWaDbkElEaNmx/vKj0RCmOf753XCdaGgAa/3Wrz+XvB6QtlMfIY2NN5ofQ2GAGWTsC+JxluJ/o26W2gb6YrnJfBOAiqz5hKqQx9MVYKtRwH+AhjfaV7zDfEUF8/d3n4X/uonXzPBzc39ZDP+6YJzBlpD2k+hV1qZa3ZQpRDvwnhyHd7pcM4O8XbQJ2MJCOwZaU7fQWd6dyAu0Ed2zfgtW0/IV7RdHNARK4knGyPQYXAcTRets4y7tpN81uQLnGGsJqca0hhY7NZEOjoUj71H9aQEGpw/iKyp5DNOivXqVipSJ+SU4qmZoPazhcWHqzpmBubmfOuI2fBQFJviJiLn2NZ2bqmvxo1cZ1meswGZAPhQH4BG0WATIjH6bxCFRlJyCXB9LN9I7rRiWVEsXyUVcVhPbY+aqS3g5e1rsECjmVJGWXKhTqbNCKA9ah110lVUhgGOtTpbeU3CWRtpDPCABP0/OXBHfDMy8b7OgHeQ/pQh9uBrFpV3EJwGSyd+P6teMCmAfvsNuVsddOVkZ8adXDm6cDv+l9XFh9XR8mZXTontDTNqFmfWnyJdXUTajxJxE6/fQr9q6O7+kEI/2XweyLImgZmMl5rgxAyritFSEohd5SU/BT41YUXCV4s18dWw6Zkmy4Z9FLXlzEvj18yBixFm9G+y4ODkzgsin5ykmFTxRBrcaxSZ1SG3sbY3q9YEE+iX41n11d1Yj6m1Tc2kFm48c466yez1lZU1r1k2TqOfpswnd83qMFM6nC1vt9sk7YNZlSf68mKlMvMBdk5onujdRcXuurOFflRfpU97MVvKtTFaVVUvG/SkB+81KkkQ3XoBLdUEd5a0CwSgUfLFkGAxY7ExDb3PKhbV4Qqn9+pXnl5htzp2Zut4frNsoQ2zq2receao3upuZpT90OSEkqxM7Bhr0zKgdizNnQmykDd0BljIMnSZOw3eEjZS44Jxm3JS13yJy/pCa1lf1OdMCR4ERCA5ZR4S5K8I2IXcxNX8/DaFZVLgQxoENtSYgv8K7Ov0sY0C60yWVyOKMfV9wi6M56+owrjkl/mhRX56XUshMfcpThB4YtWJgSyFiNdXrpngu7pSympKdYhTDW4UV2Zu5da1GfBcAqBGU2v3Zgrj/IKtIpjjf2B3ngMPNtukt59rSfMyU5FmzXWB0xyqYX13zmWa4yq6VytmImALTAGHrihoXjgV6gnpPRXJwjXsMF1BsTtQDYSNJnB0hgHPQ+eEGv5e2NJ5pQabOgsHGu1dV0bRibmQ+G9BxJW6ZS7yJgYP0cYVQwYJimFH1qKvIaHv4SCAwoipz//o93Xzfrqxv2xdsdWuAicjLXkZ2M52fl4sLPhARim1//KYeCHHyQuNkx8SnNyFGMyKH7JbuAr5BayzmLW5hVISw1heP3UoQA3pDfUjHFQvJqVtzJW3fAJ3+I6WbGYQedfxDimm1LN8sF58zY1xpdb1EJJBRQ1gT/EdadiYeUQJPicsBU8mfq65CuAEfHSCJam5Kn5X1zyGQ6db7N1ay9woK58mnCXUJqdZKa6dZ8UKplWdpxdRyshuyt+Sm2zShVsZnzZr+ZAwlpShIMXR8em7VygUHKyEiJ+TspRzoO7BEpTl4OtQFn2d9tUkVNP6G3r/RwRviU5LdNZDdDSecL+DQqzGHZTcsTaD8oyVCvvYm5C+F2jb7CcgsxnaE8/s4QHd3+vJmS/x/J48DTKA+/ry8rwlQC0BagnQVyVAx4CxgFYovZOwmQyhNoGzNB2ylGfj+ouWD7V86EfjQ4tzoRR30svOfei5hhoBN9q9YpsbdRYlawmZERjS9xukQmuJ2WrErCVlT56Ulf0i8CpxvT0lQQCzrGj+mxC30/OP6KPU1A0zHwV0QpXsICxR4q80kcPoRjfzuCBPl7p110jdDubksXp7yxC3Xi1xcyc/36W34jPhLSkrk7J6XDXgkths6Qa4UvRSZwb7c3E76383cdc7v+4Wx8kffzs7Ozp8UfIRGSQt5CXy0d5q0Gkaq7d3tH+60FgVpP8WpDa9qTLkfsYmOWwy6FT0vTDqRxpvM85ozO0+a/HblaO553ZCPq+ch/l80roBElhJP95RCz9DNYuLpjVn2IsfKek1UlXtIoCjaq66+j2qRRleRwPSh6/9XI5g2MbN9WOXZeSqHZRskuTSYnvEraMVqbmNUjObf47cTjYhtzQ7891KLo0pmmV3+lSu0VuY3QY8SwU8ibOuPAbShj5t6LNM6HOeRzj6+VK9v+ELVuZIezMq0YBQNoICwRUYsr+DXtPRmAhThX3D6H7OkOhgLSHRXhsSrSkkAt/NiKesJ1J/vrhol9zBJmI42PaZrAQUjwySnmAokd8eUAgnvCEEESlC9UF1lC8ZVugBdhtGWa3vpxi0LB6wfGPyiC5jDYM7anlkyyNbHvl0eOQ7MuFiiiJFAyrjux/yXPrOz0gOK3c6LMcOD1p22CbM10EMYwvdaM48yUZ9hXy5yRj+mLnynHFOjMaSTPlgqjaUnVyJWTanJxOv8O0y4okINyC8Hyj5/R0I6fvKc5egtg1RlgpRzH5sg5M2OFk5OHlP1C0X14iyEWCA3CXm3/f3ONr+GqKSw7VEJYdtVDI7KmkjjyJZNy9tqvD17FVORkJkhBW9Idt/OE+PnJucs75f+paqMY8Uem42/TB+IZiurCSLWYw4wLE8AsuKuVWSMs5ebrJwOvqJ5o2Txa2F1q8g43R7/ZhCrjeeBd++9vUob+JiW867Guc92exjhotRyZby6s/4p5rA0LQN2U+XOdIbkwnOXW3vZVyspgFJCXDcEjx1rvYCDjnZCIpMwgCcHxst8ktdOVkq6EaSIL7wXYdF6Suvw7pf8LLfHWs1qKWvRVpdsgrgAwbOSsUJQtqmTZl5xeFxUMfM0o3k6MQuuohpvm2qQMdpzXnpy8Ss4MAm3hnnsn+Sw/krImI6UzRx9afsFd+FHz1It4VbKB2Ru3JTeU3DjyLQL6WpmXb+42XZtGf8epmi1qvtsreiM3677aaol7y/nMWBV35aSAH38tcap7PPHKANTY5rP0RZeKLSpvf71nfXPnjRtWssPO5Z393kN9qKq/ubs1zQxTeBoneJ2ZiqKH6z5uVN9IH36LvE2G4yg3SfPfwfcWiyPgZvAAA= -{{- end }} diff --git a/charts/kubezero-cert-manager/templates/prometheus-rules.yaml b/charts/kubezero-cert-manager/templates/prometheus-rules.yaml deleted file mode 100644 index 2734b4e6..00000000 --- a/charts/kubezero-cert-manager/templates/prometheus-rules.yaml +++ /dev/null @@ -1,55 +0,0 @@ -{{- if index .Values "cert-manager" "prometheus" "servicemonitor" "enabled" }} -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - name: {{ printf "%s-%s" (include "kubezero-lib.fullname" $) "prometheus-rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "kubezero-lib.labels" . | nindent 4 }} -spec: - groups: - - name: cert-manager - rules: - - alert: CertManagerAbsent - annotations: - description: New certificates will not be able to be minted, and existing ones can't be renewed until cert-manager is back. - runbook_url: https://gitlab.com/uneeq-oss/cert-manager-mixin/-/blob/master/RUNBOOK.md#certmanagerabsent - summary: Cert Manager has dissapeared from Prometheus service discovery. - expr: absent(up{job="cert-manager"}) - for: 10m - labels: - severity: critical - - name: certificates - rules: - - alert: CertManagerCertExpirySoon - annotations: - dashboard_url: https://grafana.example.com/d/TvuRo2iMk/cert-manager - description: The domain that this cert covers will be unavailable after {{`{{`}} $value | humanizeDuration {{`}}`}}. Clients using endpoints that this cert protects will start to fail in {{`{{`}} $value | humanizeDuration {{`}}`}}. - runbook_url: https://gitlab.com/uneeq-oss/cert-manager-mixin/-/blob/master/RUNBOOK.md#certmanagercertexpirysoon - summary: The cert `{{`{{`}} $labels.name {{`}}`}}` is {{`{{`}} $value | humanizeDuration {{`}}`}} from expiry, it should have renewed over a week ago. - expr: "avg by (exported_namespace, namespace, name) (\n certmanager_certificate_expiration_timestamp_seconds - time()\n) < (21 * 24 * 3600) # 21 days in seconds\n" - for: 1h - labels: - severity: warning - - alert: CertManagerCertNotReady - annotations: - dashboard_url: https://grafana.example.com/d/TvuRo2iMk/cert-manager - description: This certificate has not been ready to serve traffic for at least 10m. If the cert is being renewed or there is another valid cert, the ingress controller _may_ be able to serve that instead. - runbook_url: https://gitlab.com/uneeq-oss/cert-manager-mixin/-/blob/master/RUNBOOK.md#certmanagercertnotready - summary: The cert `{{`{{`}} $labels.name {{`}}`}}` is not ready to serve traffic. - expr: "max by (name, exported_namespace, namespace, condition) (\n certmanager_certificate_ready_status{condition!=\"True\"} == 1\n)\n" - for: 10m - labels: - severity: critical - - alert: CertManagerHittingRateLimits - annotations: - dashboard_url: https://grafana.example.com/d/TvuRo2iMk/cert-manager - description: Depending on the rate limit, cert-manager may be unable to generate certificates for up to a week. - runbook_url: https://gitlab.com/uneeq-oss/cert-manager-mixin/-/blob/master/RUNBOOK.md#certmanagerhittingratelimits - summary: Cert manager hitting LetsEncrypt rate limits. - expr: "sum by (host) (\n rate(certmanager_http_acme_client_request_count{status=\"429\"}[5m])\n) > 0\n" - for: 5m - labels: - severity: critical - -{{- end }} diff --git a/charts/kubezero-cert-manager/update.sh b/charts/kubezero-cert-manager/update.sh deleted file mode 100755 index 0e5b955b..00000000 --- a/charts/kubezero-cert-manager/update.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -set -ex - -helm dep update - -# Fetch dashboards from Grafana.com and update ZDT CM -../kubezero-metrics/sync_grafana_dashboards.py dashboards.yaml templates/grafana-dashboards.yaml - -# Get kube-mixin for alerts -which jsonnet > /dev/null || { echo "Required jsonnet not found!"; exit 1;} -which jb > /dev/null || { echo "Required jb ( json-bundler ) not found!"; exit 1;} - -[ -r jsonnetfile.json ] || jb init -if [ -r jsonnetfile.lock.json ]; then - jb update -else - jb install github.com/prometheus-operator/kube-prometheus/jsonnet/kube-prometheus@release-0.10 - jb install gitlab.com/uneeq-oss/cert-manager-mixin@master -fi - -rm -rf rules && mkdir -p rules -jsonnet -J vendor -m rules rules.jsonnet - -../kubezero-metrics/sync_prometheus_rules.py cert-manager-rules.yaml templates diff --git a/charts/kubezero-cert-manager/values.yaml b/charts/kubezero-cert-manager/values.yaml deleted file mode 100644 index d3d0bb04..00000000 --- a/charts/kubezero-cert-manager/values.yaml +++ /dev/null @@ -1,87 +0,0 @@ -clusterIssuer: {} -# name: letsencrypt-dns-prod -# server: https://acme-v02.api.letsencrypt.org/directory -# email: admin@example.com -# solvers: -# - dns01: -# route53: -# region: us-west-2 -# hostedZoneID: 1234567890 - -localCA: - enabled: false - # If selfsigning is false you must provide the ca key and crt below - selfsigning: true - #ca: - # key: - # crt: - -cert-manager: - enabled: true - - global: - leaderElection: - namespace: "cert-manager" - - #enableCertificateOwnerRef: true - - # On AWS enable Projected Service Accounts to assume IAM role - #extraEnv: - #- name: AWS_ROLE_ARN - # value: "" - #- name: AWS_WEB_IDENTITY_TOKEN_FILE - # value: "/var/run/secrets/sts.amazonaws.com/serviceaccount/token" - #- name: AWS_STS_REGIONAL_ENDPOINTS - # value: regional - - #volumes: - #- name: aws-token - # projected: - # sources: - # - serviceAccountToken: - # path: token - # expirationSeconds: 86400 - # audience: "sts.amazonaws.com" - - #volumeMounts: - #- name: aws-token - # mountPath: "/var/run/secrets/sts.amazonaws.com/serviceaccount/" - # readOnly: true - - tolerations: - - key: node-role.kubernetes.io/control-plane - effect: NoSchedule - nodeSelector: - node-role.kubernetes.io/control-plane: "" - - ingressShim: - defaultIssuerName: letsencrypt-dns-prod - defaultIssuerKind: ClusterIssuer - - webhook: - tolerations: - - key: node-role.kubernetes.io/control-plane - effect: NoSchedule - nodeSelector: - node-role.kubernetes.io/control-plane: "" - - cainjector: - tolerations: - - key: node-role.kubernetes.io/control-plane - effect: NoSchedule - nodeSelector: - node-role.kubernetes.io/control-plane: "" - - extraArgs: - - "--dns01-recursive-nameservers-only" - # When this flag is enabled, secrets will be automatically removed when the certificate resource is deleted - # - --enable-certificate-owner-ref=true - - prometheus: - servicemonitor: - enabled: false - - # cert-manager.podAnnotations -- "iam.amazonaws.com/roleIAM:" role ARN the cert-manager might use via kiam eg."arn:aws:iam::123456789012:role/certManagerRoleArn" - - startupapicheck: - enabled: false diff --git a/charts/kubezero-ci/Chart.yaml b/charts/kubezero-ci/Chart.yaml deleted file mode 100644 index e5e82ada..00000000 --- a/charts/kubezero-ci/Chart.yaml +++ /dev/null @@ -1,36 +0,0 @@ -apiVersion: v2 -name: kubezero-ci -description: KubeZero umbrella chart for all things CI -type: application -version: 0.7.0 -home: https://kubezero.com -icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png -keywords: - - kubezero - - jenkins - - gitea - - renovate -maintainers: - - name: Stefan Reimer - email: stefan@zero-downtime.net -dependencies: - - name: kubezero-lib - version: ">= 0.1.6" - repository: https://cdn.zero-downtime.net/charts/ - - name: gitea - version: 9.1.0 - repository: https://dl.gitea.io/charts/ - condition: gitea.enabled - - name: jenkins - version: 4.5.0 - repository: https://charts.jenkins.io - condition: jenkins.enabled - - name: trivy - version: 0.7.0 - repository: https://aquasecurity.github.io/helm-charts/ - condition: trivy.enabled - - name: renovate - version: 36.31.0 - repository: https://docs.renovatebot.com/helm-charts - condition: renovate.enabled -kubeVersion: ">= 1.25.0" diff --git a/charts/kubezero-ci/README.md b/charts/kubezero-ci/README.md deleted file mode 100644 index 0269a38a..00000000 --- a/charts/kubezero-ci/README.md +++ /dev/null @@ -1,139 +0,0 @@ -# kubezero-ci - -![Version: 0.6.3](https://img.shields.io/badge/Version-0.6.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) - -KubeZero umbrella chart for all things CI - -**Homepage:** - -## Maintainers - -| Name | Email | Url | -| ---- | ------ | --- | -| Stefan Reimer | | | - -## Requirements - -Kubernetes: `>= 1.24.0` - -| Repository | Name | Version | -|------------|------|---------| -| https://aquasecurity.github.io/helm-charts/ | trivy | 0.7.0 | -| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 | -| https://charts.jenkins.io | jenkins | 4.3.24 | -| https://dl.gitea.io/charts/ | gitea | 8.3.0 | -| https://gocd.github.io/helm-chart | gocd | 1.40.8 | - -# Jenkins -- default build retention 10 builds, 32days -- memory request 1.25GB -- dark theme -- trivy scanner incl. HTML reporting and publisher - -# goCD - -# Gitea - -# Verdaccio - -## Authentication sealed-secret -```htpasswd -n -b -B -C 4 | kubeseal --raw --namespace verdaccio --name verdaccio-htpasswd``` - -## Resources - -### JVM tuning in containers -- https://developers.redhat.com/blog/2017/04/04/openjdk-and-containers?extIdCarryOver=true&sc_cid=701f2000001Css5AAC - -## Values - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| gitea.enabled | bool | `false` | | -| gitea.gitea.admin.existingSecret | string | `"gitea-admin-secret"` | | -| gitea.gitea.config.cache.ADAPTER | string | `"memory"` | | -| gitea.gitea.config.database.DB_TYPE | string | `"sqlite3"` | | -| gitea.gitea.demo | bool | `false` | | -| gitea.gitea.metrics.enabled | bool | `false` | | -| gitea.gitea.metrics.serviceMonitor.enabled | bool | `true` | | -| gitea.image.rootless | bool | `true` | | -| gitea.istio.enabled | bool | `false` | | -| gitea.istio.gateway | string | `"istio-ingress/private-ingressgateway"` | | -| gitea.istio.url | string | `"git.example.com"` | | -| gitea.mariadb.enabled | bool | `false` | | -| gitea.memcached.enabled | bool | `false` | | -| gitea.mysql.enabled | bool | `false` | | -| gitea.persistence.enabled | bool | `true` | | -| gitea.persistence.size | string | `"4Gi"` | | -| gitea.postgresql.enabled | bool | `false` | | -| gitea.resources.limits.memory | string | `"2048Mi"` | | -| gitea.resources.requests.cpu | string | `"150m"` | | -| gitea.resources.requests.memory | string | `"320Mi"` | | -| gitea.securityContext.allowPrivilegeEscalation | bool | `false` | | -| gitea.securityContext.capabilities.add[0] | string | `"SYS_CHROOT"` | | -| gitea.securityContext.capabilities.drop[0] | string | `"ALL"` | | -| gocd.enabled | bool | `false` | | -| gocd.istio.enabled | bool | `false` | | -| gocd.istio.gateway | string | `"istio-ingress/private-ingressgateway"` | | -| gocd.istio.url | string | `""` | | -| gocd.server.ingress.enabled | bool | `false` | | -| gocd.server.service.type | string | `"ClusterIP"` | | -| jenkins.agent.annotations."container.apparmor.security.beta.kubernetes.io/jnlp" | string | `"unconfined"` | | -| jenkins.agent.containerCap | int | `2` | | -| jenkins.agent.customJenkinsLabels[0] | string | `"podman-aws-trivy"` | | -| jenkins.agent.idleMinutes | int | `15` | | -| jenkins.agent.image | string | `"public.ecr.aws/zero-downtime/jenkins-podman"` | | -| jenkins.agent.podName | string | `"podman-aws"` | | -| jenkins.agent.podRetention | string | `"Default"` | | -| jenkins.agent.resources.limits.cpu | string | `""` | | -| jenkins.agent.resources.limits.memory | string | `""` | | -| jenkins.agent.resources.requests.cpu | string | `""` | | -| jenkins.agent.resources.requests.memory | string | `""` | | -| jenkins.agent.showRawYaml | bool | `false` | | -| jenkins.agent.tag | string | `"v0.4.2"` | | -| jenkins.agent.yamlMergeStrategy | string | `"merge"` | | -| jenkins.agent.yamlTemplate | string | `"apiVersion: v1\nkind: Pod\nspec:\n securityContext:\n fsGroup: 1000\n serviceAccountName: jenkins-podman-aws\n containers:\n - name: jnlp\n resources:\n requests:\n cpu: \"512m\"\n memory: \"1024Mi\"\n limits:\n cpu: \"4\"\n memory: \"6144Mi\"\n github.com/fuse: 1\n volumeMounts:\n - name: aws-token\n mountPath: \"/var/run/secrets/sts.amazonaws.com/serviceaccount/\"\n readOnly: true\n - name: host-registries-conf\n mountPath: \"/home/jenkins/.config/containers/registries.conf\"\n readOnly: true\n volumes:\n - name: aws-token\n projected:\n sources:\n - serviceAccountToken:\n path: token\n expirationSeconds: 86400\n audience: \"sts.amazonaws.com\"\n - name: host-registries-conf\n hostPath:\n path: /etc/containers/registries.conf\n type: File"` | | -| jenkins.controller.JCasC.configScripts.zdt-settings | string | `"jenkins:\n noUsageStatistics: true\n disabledAdministrativeMonitors:\n - \"jenkins.security.ResourceDomainRecommendation\"\nunclassified:\n buildDiscarders:\n configuredBuildDiscarders:\n - \"jobBuildDiscarder\"\n - defaultBuildDiscarder:\n discarder:\n logRotator:\n artifactDaysToKeepStr: \"32\"\n artifactNumToKeepStr: \"10\"\n daysToKeepStr: \"100\"\n numToKeepStr: \"10\"\n"` | | -| jenkins.controller.disableRememberMe | bool | `true` | | -| jenkins.controller.enableRawHtmlMarkupFormatter | bool | `true` | | -| jenkins.controller.initContainerResources.limits.memory | string | `"1024Mi"` | | -| jenkins.controller.initContainerResources.requests.cpu | string | `"50m"` | | -| jenkins.controller.initContainerResources.requests.memory | string | `"256Mi"` | | -| jenkins.controller.installPlugins[0] | string | `"kubernetes:3937.vd7b_82db_e347b_"` | | -| jenkins.controller.installPlugins[10] | string | `"build-discarder:139.v05696a_7fe240"` | | -| jenkins.controller.installPlugins[11] | string | `"dark-theme:315.va_22e7d692ea_a"` | | -| jenkins.controller.installPlugins[1] | string | `"workflow-aggregator:581.v0c46fa_697ffd"` | | -| jenkins.controller.installPlugins[2] | string | `"git:5.1.0"` | | -| jenkins.controller.installPlugins[3] | string | `"basic-branch-build-strategies:71.vc1421f89888e"` | | -| jenkins.controller.installPlugins[4] | string | `"pipeline-graph-view:183.v9e27732d970f"` | | -| jenkins.controller.installPlugins[5] | string | `"pipeline-stage-view:2.32"` | | -| jenkins.controller.installPlugins[6] | string | `"configuration-as-code:1647.ve39ca_b_829b_42"` | | -| jenkins.controller.installPlugins[7] | string | `"antisamy-markup-formatter:159.v25b_c67cd35fb_"` | | -| jenkins.controller.installPlugins[8] | string | `"prometheus:2.2.3"` | | -| jenkins.controller.installPlugins[9] | string | `"htmlpublisher:1.31"` | | -| jenkins.controller.javaOpts | string | `"-XX:+UseContainerSupport -XX:+UseStringDeduplication -Dhudson.model.DirectoryBrowserSupport.CSP=\"sandbox allow-popups; default-src 'none'; img-src 'self' cdn.zero-downtime.net; style-src 'unsafe-inline';\""` | | -| jenkins.controller.jenkinsOpts | string | `"--sessionTimeout=300 --sessionEviction=10800"` | | -| jenkins.controller.prometheus.enabled | bool | `false` | | -| jenkins.controller.resources.limits.memory | string | `"4096Mi"` | | -| jenkins.controller.resources.requests.cpu | string | `"250m"` | | -| jenkins.controller.resources.requests.memory | string | `"1280Mi"` | | -| jenkins.controller.tag | string | `"alpine-jdk17"` | | -| jenkins.controller.testEnabled | bool | `false` | | -| jenkins.enabled | bool | `false` | | -| jenkins.istio.agent.enabled | bool | `false` | | -| jenkins.istio.agent.gateway | string | `"istio-ingress/private-ingressgateway"` | | -| jenkins.istio.agent.url | string | `"jenkins-agent.example.com"` | | -| jenkins.istio.enabled | bool | `false` | | -| jenkins.istio.gateway | string | `"istio-ingress/private-ingressgateway"` | | -| jenkins.istio.url | string | `"jenkins.example.com"` | | -| jenkins.istio.webhook.enabled | bool | `false` | | -| jenkins.istio.webhook.gateway | string | `"istio-ingress/ingressgateway"` | | -| jenkins.istio.webhook.url | string | `"jenkins-webhook.example.com"` | | -| jenkins.persistence.size | string | `"4Gi"` | | -| jenkins.rbac.readSecrets | bool | `true` | | -| jenkins.serviceAccountAgent.create | bool | `true` | | -| jenkins.serviceAccountAgent.name | string | `"jenkins-podman-aws"` | | -| trivy.enabled | bool | `false` | | -| trivy.image.tag | string | `"0.42.0"` | | -| trivy.persistence.enabled | bool | `true` | | -| trivy.persistence.size | string | `"1Gi"` | | -| trivy.rbac.create | bool | `false` | | diff --git a/charts/kubezero-ci/README.md.gotmpl b/charts/kubezero-ci/README.md.gotmpl deleted file mode 100644 index 5b389823..00000000 --- a/charts/kubezero-ci/README.md.gotmpl +++ /dev/null @@ -1,36 +0,0 @@ -{{ template "chart.header" . }} -{{ template "chart.deprecationWarning" . }} - -{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }} - -{{ template "chart.description" . }} - -{{ template "chart.homepageLine" . }} - -{{ template "chart.maintainersSection" . }} - -{{ template "chart.sourcesSection" . }} - -{{ template "chart.requirementsSection" . }} - -# Jenkins -- default build retention 10 builds, 32days -- memory request 1.25GB -- dark theme -- trivy scanner incl. HTML reporting and publisher - -# goCD - -# Gitea - -# Verdaccio - -## Authentication sealed-secret -```htpasswd -n -b -B -C 4 | kubeseal --raw --namespace verdaccio --name verdaccio-htpasswd``` - -## Resources - -### JVM tuning in containers -- https://developers.redhat.com/blog/2017/04/04/openjdk-and-containers?extIdCarryOver=true&sc_cid=701f2000001Css5AAC - -{{ template "chart.valuesSection" . }} diff --git a/charts/kubezero-ci/dashboard-gitea.yaml b/charts/kubezero-ci/dashboard-gitea.yaml deleted file mode 100644 index 41ad30b7..00000000 --- a/charts/kubezero-ci/dashboard-gitea.yaml +++ /dev/null @@ -1,9 +0,0 @@ -configmap: grafana-dashboards -gzip: true -condition: '.Values.gitea.gitea.metrics.enabled' -folder: KubeZero -dashboards: -- name: Gitea - url: https://grafana.com/api/dashboards/13192/revisions/1/download - tags: - - CI diff --git a/charts/kubezero-ci/dashboard-jenkins.yaml b/charts/kubezero-ci/dashboard-jenkins.yaml deleted file mode 100644 index b395f9c4..00000000 --- a/charts/kubezero-ci/dashboard-jenkins.yaml +++ /dev/null @@ -1,9 +0,0 @@ -configmap: grafana-dashboards -gzip: true -condition: '.Values.jenkins.controller.prometheus.enabled' -folder: KubeZero -dashboards: -- name: Jenkins - url: https://grafana.com/api/dashboards/9964/revisions/1/download - tags: - - CI diff --git a/charts/kubezero-ci/templates/gitea/grafana-dashboard.yaml b/charts/kubezero-ci/templates/gitea/grafana-dashboard.yaml deleted file mode 100644 index f008aa86..00000000 --- a/charts/kubezero-ci/templates/gitea/grafana-dashboard.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if .Values.gitea.gitea.metrics.enabled }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ printf "%s-%s" (include "kubezero-lib.fullname" $) "grafana-dashboards" | trunc 63 | trimSuffix "-" }} - namespace: {{ .Release.Namespace }} - labels: - grafana_dashboard: "1" - {{- include "kubezero-lib.labels" . | nindent 4 }} - annotations: - k8s-sidecar-target-directory: KubeZero -binaryData: - Gitea.json.gz: - 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 -{{- end }} diff --git a/charts/kubezero-ci/templates/gitea/istio-authorization-policy.yaml b/charts/kubezero-ci/templates/gitea/istio-authorization-policy.yaml deleted file mode 100644 index 266cddd4..00000000 --- a/charts/kubezero-ci/templates/gitea/istio-authorization-policy.yaml +++ /dev/null @@ -1,26 +0,0 @@ -{{- if and .Values.gitea.enabled .Values.gitea.istio.enabled .Values.gitea.istio.ipBlocks }} -apiVersion: security.istio.io/v1beta1 -kind: AuthorizationPolicy -metadata: - name: {{ .Release.Name }}-deny-not-in-ipblocks - namespace: istio-system - labels: - {{- include "kubezero-lib.labels" $ | nindent 4 }} -spec: - selector: - matchLabels: - app: istio-ingressgateway - action: DENY - rules: - - from: - - source: - notIpBlocks: - {{- toYaml .Values.gitea.istio.ipBlocks | nindent 8 }} - to: - - operation: - hosts: ["{{ .Values.gitea.istio.url }}"] - when: - - key: connection.sni - values: - - '*' -{{- end }} diff --git a/charts/kubezero-ci/templates/gitea/istio-service.yaml b/charts/kubezero-ci/templates/gitea/istio-service.yaml deleted file mode 100644 index 9da1b7a5..00000000 --- a/charts/kubezero-ci/templates/gitea/istio-service.yaml +++ /dev/null @@ -1,24 +0,0 @@ -{{- if and .Values.gitea.enabled .Values.gitea.istio.enabled }} -apiVersion: networking.istio.io/v1beta1 -kind: VirtualService -metadata: - name: gitea - namespace: {{ .Release.Namespace }} - labels: - {{- include "kubezero-lib.labels" $ | nindent 4 }} -spec: - gateways: - - {{ .Values.gitea.istio.gateway }} - hosts: - - {{ .Values.gitea.istio.url }} - http: - - route: - - destination: - host: gitea-http - tcp: - - match: - - port: 22 - route: - - destination: - host: gitea-ssh -{{- end }} diff --git a/charts/kubezero-ci/templates/gitea/secrets.yaml b/charts/kubezero-ci/templates/gitea/secrets.yaml deleted file mode 100644 index 9dff274e..00000000 --- a/charts/kubezero-ci/templates/gitea/secrets.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if and .Values.gitea.enabled .Values.gitea.gitea.demo }} -apiVersion: v1 -kind: Secret -type: Opaque -metadata: - name: gitea-admin-secret - labels: -{{ include "kubezero-lib.labels" . | indent 4 }} -data: - username: {{ "demo" | b64enc | quote }} - password: {{ "secret" | b64enc | quote }} -{{- end }} diff --git a/charts/kubezero-ci/templates/jenkins/grafana-dashboard.yaml b/charts/kubezero-ci/templates/jenkins/grafana-dashboard.yaml deleted file mode 100644 index feff0a64..00000000 --- a/charts/kubezero-ci/templates/jenkins/grafana-dashboard.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if .Values.jenkins.controller.prometheus.enabled }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ printf "%s-%s" (include "kubezero-lib.fullname" $) "grafana-dashboards" | trunc 63 | trimSuffix "-" }} - namespace: {{ .Release.Namespace }} - labels: - grafana_dashboard: "1" - {{- include "kubezero-lib.labels" . | nindent 4 }} - annotations: - k8s-sidecar-target-directory: KubeZero -binaryData: - Jenkins.json.gz: - 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 -{{- end }} diff --git a/charts/kubezero-ci/templates/jenkins/istio-authorization-policy.yaml b/charts/kubezero-ci/templates/jenkins/istio-authorization-policy.yaml deleted file mode 100644 index 7faf6b7d..00000000 --- a/charts/kubezero-ci/templates/jenkins/istio-authorization-policy.yaml +++ /dev/null @@ -1,26 +0,0 @@ -{{- if and .Values.jenkins.enabled .Values.jenkins.istio.enabled .Values.jenkins.istio.ipBlocks }} -apiVersion: security.istio.io/v1beta1 -kind: AuthorizationPolicy -metadata: - name: {{ .Release.Name }}-deny-not-in-ipblocks - namespace: istio-system - labels: - {{- include "kubezero-lib.labels" $ | nindent 4 }} -spec: - selector: - matchLabels: - app: istio-ingressgateway - action: DENY - rules: - - from: - - source: - notIpBlocks: - {{- toYaml .Values.jenkins.istio.ipBlocks | nindent 8 }} - to: - - operation: - hosts: ["{{ .Values.jenkins.istio.url }}"] - when: - - key: connection.sni - values: - - '*' -{{- end }} diff --git a/charts/kubezero-ci/templates/jenkins/istio-service.yaml b/charts/kubezero-ci/templates/jenkins/istio-service.yaml deleted file mode 100644 index 6872d1f7..00000000 --- a/charts/kubezero-ci/templates/jenkins/istio-service.yaml +++ /dev/null @@ -1,68 +0,0 @@ -{{- if and .Values.jenkins.enabled .Values.jenkins.istio.enabled }} -apiVersion: networking.istio.io/v1beta1 -kind: VirtualService -metadata: - name: {{ template "kubezero-lib.fullname" (merge (dict "subchart" "jenkins") .) }} - namespace: {{ template "jenkins.namespace" . }} -spec: - hosts: - - {{ .Values.jenkins.istio.url }} - gateways: - - {{ .Values.jenkins.istio.gateway }} - http: - - route: - - destination: - host: {{ template "kubezero-lib.fullname" (merge (dict "subchart" "jenkins") .) }} - port: - number: 8080 - -{{- if .Values.jenkins.istio.webhook.enabled }} ---- -apiVersion: networking.istio.io/v1beta1 -kind: VirtualService -metadata: - name: {{ template "kubezero-lib.fullname" (merge (dict "subchart" "jenkins") .) }}-webhook - namespace: {{ template "jenkins.namespace" . }} -spec: - hosts: - - {{ .Values.jenkins.istio.webhook.url }} - gateways: - - {{ .Values.jenkins.istio.webhook.gateway }} - http: - - route: - - destination: - host: {{ template "kubezero-lib.fullname" (merge (dict "subchart" "jenkins") .) }} - port: - number: 8080 - match: - - uri: - exact: "/bitbucket-scmsource-hook/notify" - method: - exact: "POST" - - uri: - exact: "/github-webhook/" - method: - exact: "POST" -{{- end }} -{{- if .Values.jenkins.istio.agent.enabled }} ---- -apiVersion: networking.istio.io/v1beta1 -kind: VirtualService -metadata: - name: {{ template "kubezero-lib.fullname" (merge (dict "subchart" "jenkins") .) }}-agent - namespace: {{ template "jenkins.namespace" . }} -spec: - hosts: - - {{ .Values.jenkins.istio.agent.url }} - gateways: - - {{ .Values.jenkins.istio.agent.gateway }} - tcp: - - match: - - port: 50000 - route: - - destination: - host: {{ template "kubezero-lib.fullname" (merge (dict "subchart" "jenkins") .) }}-agent - port: - number: 50000 -{{- end }} -{{- end }} diff --git a/charts/kubezero-ci/update.sh b/charts/kubezero-ci/update.sh deleted file mode 100755 index 0ded8aa9..00000000 --- a/charts/kubezero-ci/update.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -helm dep update - -# Create ZDT dashboard configmap -../kubezero-metrics/sync_grafana_dashboards.py dashboard-jenkins.yaml templates/jenkins/grafana-dashboard.yaml -../kubezero-metrics/sync_grafana_dashboards.py dashboard-gitea.yaml templates/gitea/grafana-dashboard.yaml diff --git a/charts/kubezero-ci/values.yaml b/charts/kubezero-ci/values.yaml deleted file mode 100644 index dca0ca5d..00000000 --- a/charts/kubezero-ci/values.yaml +++ /dev/null @@ -1,249 +0,0 @@ -gitea: - enabled: false - - #image: - #tag: 1.17.4 - #rootless: true - - repliaCount: 1 - - # We use RWO persistence - strategy: - type: "Recreate" - - # Since V9 they default to RWX and deployment, we default to old existing RWO from statefulset - persistence: - enabled: true - mount: true - create: false - #claimName: - size: 4Gi - - securityContext: - allowPrivilegeEscalation: false - capabilities: - drop: - - ALL - add: - - SYS_CHROOT - - resources: - requests: - cpu: "150m" - memory: "320Mi" - limits: - memory: "2048Mi" - - gitea: - admin: - existingSecret: gitea-admin-secret - - # Enable to install demo creds - demo: false - - metrics: - enabled: false - serviceMonitor: - enabled: true - - config: - database: - DB_TYPE: sqlite3 - cache: - ADAPTER: memory - session: - PROVIDER: memory - queue: - TYPE: level - - redis-cluster: - enabled: false - postgresql-ha: - enabled: false - postgresql: - enabled: false - - istio: - enabled: false - gateway: istio-ingress/private-ingressgateway - url: git.example.com - - -jenkins: - enabled: false - - controller: - tag: alpine-jdk17 - #tagLabel: alpine - disableRememberMe: true - prometheus: - enabled: false - testEnabled: false - enableRawHtmlMarkupFormatter: true - javaOpts: "-XX:+UseContainerSupport -XX:+UseStringDeduplication -Dhudson.model.DirectoryBrowserSupport.CSP=\"sandbox allow-popups; default-src 'none'; img-src 'self' cdn.zero-downtime.net; style-src 'unsafe-inline';\"" - jenkinsOpts: "--sessionTimeout=300 --sessionEviction=10800" - - resources: - requests: - cpu: "250m" - memory: "1280Mi" - limits: - #cpu: "2000m" - memory: "4096Mi" - initContainerResources: - requests: - cpu: "50m" - memory: "256Mi" - limits: - #cpu: "1000m" - memory: "1024Mi" - - JCasC: - configScripts: - zdt-settings: | - jenkins: - noUsageStatistics: true - disabledAdministrativeMonitors: - - "jenkins.security.ResourceDomainRecommendation" - unclassified: - buildDiscarders: - configuredBuildDiscarders: - - "jobBuildDiscarder" - - defaultBuildDiscarder: - discarder: - logRotator: - artifactDaysToKeepStr: "32" - artifactNumToKeepStr: "10" - daysToKeepStr: "100" - numToKeepStr: "10" - - installPlugins: - - kubernetes:3985.vd26d77b_2a_48a_ - - kubernetes-credentials-provider:1.225.v14f9e6b_28f53 - - workflow-aggregator:581.v0c46fa_697ffd - - git:5.2.0 - - basic-branch-build-strategies:81.v05e333931c7d - - pipeline-graph-view:183.v9e27732d970f - - pipeline-stage-view:2.33 - - configuration-as-code:1670.v564dc8b_982d0 - - antisamy-markup-formatter:162.v0e6ec0fcfcf6 - - prometheus:2.2.3 - - htmlpublisher:1.32 - - build-discarder:139.v05696a_7fe240 - - dark-theme:336.v02165cd8c2ee - - serviceAccountAgent: - create: true - name: jenkins-podman-aws - - # Preconfigure agents to use zdt podman requires fuse/overlayfs - agent: - image: public.ecr.aws/zero-downtime/jenkins-podman - tag: v0.4.3 - #alwaysPullImage: true - podRetention: "Default" - showRawYaml: false - podName: "podman-aws" - customJenkinsLabels: - - podman-aws-trivy - idleMinutes: 15 - containerCap: 2 - annotations: - container.apparmor.security.beta.kubernetes.io/jnlp: unconfined - resources: - requests: - cpu: "" - memory: "" - limits: - cpu: "" - memory: "" - # envVars: - # - name: AWS_WEB_IDENTITY_TOKEN_FILE - # value: "/var/run/secrets/sts.amazonaws.com/serviceaccount/token" - # - name: AWS_STS_REGIONAL_ENDPOINTS - # value: regional - # - name: AWS_ROLE_ARN - # value: "" - yamlMergeStrategy: "merge" - yamlTemplate: |- - apiVersion: v1 - kind: Pod - spec: - securityContext: - fsGroup: 1000 - serviceAccountName: jenkins-podman-aws - containers: - - name: jnlp - resources: - requests: - cpu: "512m" - memory: "1024Mi" - limits: - cpu: "4" - memory: "6144Mi" - github.com/fuse: 1 - volumeMounts: - - name: aws-token - mountPath: "/var/run/secrets/sts.amazonaws.com/serviceaccount/" - readOnly: true - - name: host-registries-conf - mountPath: "/home/jenkins/.config/containers/registries.conf" - readOnly: true - volumes: - - name: aws-token - projected: - sources: - - serviceAccountToken: - path: token - expirationSeconds: 86400 - audience: "sts.amazonaws.com" - - name: host-registries-conf - hostPath: - path: /etc/containers/registries.conf - type: File - - rbac: - readSecrets: true - - persistence: - size: "4Gi" - - istio: - enabled: false - gateway: istio-ingress/private-ingressgateway - url: jenkins.example.com - - # Dedicated VirtualService for webhooks - webhook: - enabled: false - gateway: istio-ingress/ingressgateway - url: jenkins-webhook.example.com - - # Remote Agents - agent: - enabled: false - gateway: istio-ingress/private-ingressgateway - url: jenkins-agent.example.com - -trivy: - enabled: false - image: - tag: 0.42.0 - persistence: - enabled: true - size: 1Gi - rbac: - create: false - -renovate: - enabled: false - - env: - LOG_FORMAT: json - cronjob: - concurrencyPolicy: Forbid - jobBackoffLimit: 3 - schedule: "0 3 * * *" - successfulJobsHistoryLimit: 1 - securityContext: - fsGroup: 1000 diff --git a/charts/kubezero-istio-gateway/Chart.yaml b/charts/kubezero-istio-gateway/Chart.yaml deleted file mode 100644 index a5d4f3a5..00000000 --- a/charts/kubezero-istio-gateway/Chart.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: v2 -name: kubezero-istio-gateway -description: KubeZero Umbrella Chart for Istio gateways -type: application -version: 0.10.0 -home: https://kubezero.com -icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png -keywords: - - kubezero - - istio - - ingress -maintainers: - - name: Stefan Reimer - email: stefan@zero-downtime.net -dependencies: - - name: kubezero-lib - version: ">= 0.1.6" - repository: https://cdn.zero-downtime.net/charts/ - - name: gateway - version: 1.17.2 - repository: https://istio-release.storage.googleapis.com/charts -kubeVersion: ">= 1.25.0" diff --git a/charts/kubezero-istio-gateway/README.md b/charts/kubezero-istio-gateway/README.md deleted file mode 100644 index 72108273..00000000 --- a/charts/kubezero-istio-gateway/README.md +++ /dev/null @@ -1,49 +0,0 @@ -# kubezero-istio-gateway - -![Version: 0.10.0](https://img.shields.io/badge/Version-0.10.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) - -KubeZero Umbrella Chart for Istio gateways - -Installs Istio Ingress Gateways, requires kubezero-istio to be installed ! - -**Homepage:** - -## Maintainers - -| Name | Email | Url | -| ---- | ------ | --- | -| Stefan Reimer | | | - -## Requirements - -Kubernetes: `>= 1.25.0` - -| Repository | Name | Version | -|------------|------|---------| -| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 | -| https://istio-release.storage.googleapis.com/charts | gateway | 1.17.2 | - -## Values - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| certificates | list | `[]` | | -| gateway.autoscaling.enabled | bool | `false` | | -| gateway.autoscaling.maxReplicas | int | `4` | | -| gateway.autoscaling.minReplicas | int | `1` | | -| gateway.autoscaling.targetCPUUtilizationPercentage | int | `80` | | -| gateway.podAnnotations."proxy.istio.io/config" | string | `"{ \"terminationDrainDuration\": \"20s\" }"` | | -| gateway.replicaCount | int | `1` | | -| gateway.resources.limits.memory | string | `"512Mi"` | | -| gateway.resources.requests.cpu | string | `"50m"` | | -| gateway.resources.requests.memory | string | `"64Mi"` | | -| gateway.service.externalTrafficPolicy | string | `"Local"` | | -| gateway.service.type | string | `"NodePort"` | | -| proxyProtocol | bool | `true` | | -| telemetry.enabled | bool | `false` | | - -## Resources - -- https://istio.io/latest/docs/reference/config/istio.operator.v1alpha1/#IstioOperatorSpec -- https://github.com/istio/istio/blob/master/manifests/profiles/default.yaml -- https://istio.io/latest/docs/setup/install/standalone-operator/ diff --git a/charts/kubezero-istio-gateway/README.md.gotmpl b/charts/kubezero-istio-gateway/README.md.gotmpl deleted file mode 100644 index fcd08643..00000000 --- a/charts/kubezero-istio-gateway/README.md.gotmpl +++ /dev/null @@ -1,24 +0,0 @@ -{{ template "chart.header" . }} -{{ template "chart.deprecationWarning" . }} - -{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }} - -{{ template "chart.description" . }} - -Installs Istio Ingress Gateways, requires kubezero-istio to be installed ! - -{{ template "chart.homepageLine" . }} - -{{ template "chart.maintainersSection" . }} - -{{ template "chart.sourcesSection" . }} - -{{ template "chart.requirementsSection" . }} - -{{ template "chart.valuesSection" . }} - -## Resources - -- https://istio.io/latest/docs/reference/config/istio.operator.v1alpha1/#IstioOperatorSpec -- https://github.com/istio/istio/blob/master/manifests/profiles/default.yaml -- https://istio.io/latest/docs/setup/install/standalone-operator/ diff --git a/charts/kubezero-istio-gateway/charts/gateway/Chart.yaml b/charts/kubezero-istio-gateway/charts/gateway/Chart.yaml deleted file mode 100644 index 800334bb..00000000 --- a/charts/kubezero-istio-gateway/charts/gateway/Chart.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v2 -appVersion: 1.17.2 -description: Helm chart for deploying Istio gateways -icon: https://istio.io/latest/favicons/android-192x192.png -keywords: -- istio -- gateways -name: gateway -sources: -- http://github.com/istio/istio -type: application -version: 1.17.2 diff --git a/charts/kubezero-istio-gateway/charts/gateway/README.md b/charts/kubezero-istio-gateway/charts/gateway/README.md deleted file mode 100644 index 0e58c00f..00000000 --- a/charts/kubezero-istio-gateway/charts/gateway/README.md +++ /dev/null @@ -1,148 +0,0 @@ -# Istio Gateway Helm Chart - -This chart installs an Istio gateway deployment. - -## Setup Repo Info - -```console -helm repo add istio https://istio-release.storage.googleapis.com/charts -helm repo update -``` - -_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._ - -## Installing the Chart - -To install the chart with the release name `istio-ingressgateway`: - -```console -helm install istio-ingressgateway istio/gateway -``` - -## Uninstalling the Chart - -To uninstall/delete the `istio-ingressgateway` deployment: - -```console -helm delete istio-ingressgateway -``` - -## Configuration - -To view support configuration options and documentation, run: - -```console -helm show values istio/gateway -``` - -### `image: auto` Information - -The image used by the chart, `auto`, may be unintuitive. -This exists because the pod spec will be automatically populated at runtime, using the same mechanism as [Sidecar Injection](istio.io/latest/docs/setup/additional-setup/sidecar-injection). -This allows the same configurations and lifecycle to apply to gateways as sidecars. - -Note: this does mean that the namespace the gateway is deployed in must not have the `istio-injection=disabled` label. -See [Controlling the injection policy](https://istio.io/latest/docs/setup/additional-setup/sidecar-injection/#controlling-the-injection-policy) for more info. - -### Examples - -#### Egress Gateway - -Deploying a Gateway to be used as an [Egress Gateway](https://istio.io/latest/docs/tasks/traffic-management/egress/egress-gateway/): - -```yaml -service: - # Egress gateways do not need an external LoadBalancer IP - type: ClusterIP -``` - -#### Multi-network/VM Gateway - -Deploying a Gateway to be used as a [Multi-network Gateway](https://istio.io/latest/docs/setup/install/multicluster/) for network `network-1`: - -```yaml -networkGateway: network-1 -``` - -### Migrating from other installation methods - -Installations from other installation methods (such as istioctl, Istio Operator, other helm charts, etc) can be migrated to use the new Helm charts -following the guidance below. -If you are able to, a clean installation is simpler. However, this often requires an external IP migration which can be challenging. - -WARNING: when installing over an existing deployment, the two deployments will be merged together by Helm, which may lead to unexpected results. - -#### Legacy Gateway Helm charts - -Istio historically offered two different charts - `manifests/charts/gateways/istio-ingress` and `manifests/charts/gateways/istio-egress`. -These are replaced by this chart. -While not required, it is recommended all new users use this chart, and existing users migrate when possible. - -This chart has the following benefits and differences: -* Designed with Helm best practices in mind (standardized values options, values schema, values are not all nested under `gateways.istio-ingressgateway.*`, release name and namespace taken into account, etc). -* Utilizes Gateway injection, simplifying upgrades, allowing gateways to run in any namespace, and avoiding repeating config for sidecars and gateways. -* Published to official Istio Helm repository. -* Single chart for all gateways (Ingress, Egress, East West). - -#### General concerns - -For a smooth migration, the resource names and `Deployment.spec.selector` labels must match. - -If you install with `helm install istio-gateway istio/gateway`, resources will be named `istio-gateway` and the `selector` labels set to: - -```yaml -app: istio-gateway -istio: gateway # the release name with leading istio- prefix stripped -``` - -If your existing installation doesn't follow these names, you can override them. For example, if you have resources named `my-custom-gateway` with `selector` labels -`foo=bar,istio=ingressgateway`: - -```yaml -name: my-custom-gateway # Override the name to match existing resources -labels: - app: "" # Unset default app selector label - istio: ingressgateway # override default istio selector label - foo: bar # Add the existing custom selector label -``` - -#### Migrating an existing Helm release - -An existing helm release can be `helm upgrade`d to this chart by using the same release name. For example, if a previous -installation was done like: - -```console -helm install istio-ingress manifests/charts/gateways/istio-ingress -n istio-system -``` - -It could be upgraded with - -```console -helm upgrade istio-ingress manifests/charts/gateway -n istio-system --set name=istio-ingressgateway --set labels.app=istio-ingressgateway --set labels.istio=ingressgateway -``` - -Note the name and labels are overridden to match the names of the existing installation. - -Warning: the helm charts here default to using port 80 and 443, while the old charts used 8080 and 8443. -If you have AuthorizationPolicies that reference port these ports, you should update them during this process, -or customize the ports to match the old defaults. -See the [security advisory](https://istio.io/latest/news/security/istio-security-2021-002/) for more information. - -#### Other migrations - -If you see errors like `rendered manifests contain a resource that already exists` during installation, you may need to forcibly take ownership. - -The script below can handle this for you. Replace `RELEASE` and `NAMESPACE` with the name and namespace of the release: - -```console -KINDS=(service deployment) -RELEASE=istio-ingressgateway -NAMESPACE=istio-system -for KIND in "${KINDS[@]}"; do - kubectl --namespace $NAMESPACE --overwrite=true annotate $KIND $RELEASE meta.helm.sh/release-name=$RELEASE - kubectl --namespace $NAMESPACE --overwrite=true annotate $KIND $RELEASE meta.helm.sh/release-namespace=$NAMESPACE - kubectl --namespace $NAMESPACE --overwrite=true label $KIND $RELEASE app.kubernetes.io/managed-by=Helm -done -``` - -You may ignore errors about resources not being found. diff --git a/charts/kubezero-istio-gateway/charts/gateway/templates/NOTES.txt b/charts/kubezero-istio-gateway/charts/gateway/templates/NOTES.txt deleted file mode 100644 index 78451d33..00000000 --- a/charts/kubezero-istio-gateway/charts/gateway/templates/NOTES.txt +++ /dev/null @@ -1,9 +0,0 @@ -"{{ include "gateway.name" . }}" successfully installed! - -To learn more about the release, try: - $ helm status {{ .Release.Name }} - $ helm get all {{ .Release.Name }} - -Next steps: - * Deploy an HTTP Gateway: https://istio.io/latest/docs/tasks/traffic-management/ingress/ingress-control/ - * Deploy an HTTPS Gateway: https://istio.io/latest/docs/tasks/traffic-management/ingress/secure-ingress/ diff --git a/charts/kubezero-istio-gateway/charts/gateway/templates/_helpers.tpl b/charts/kubezero-istio-gateway/charts/gateway/templates/_helpers.tpl deleted file mode 100644 index e75d2734..00000000 --- a/charts/kubezero-istio-gateway/charts/gateway/templates/_helpers.tpl +++ /dev/null @@ -1,52 +0,0 @@ -{{- define "gateway.name" -}} -{{- if eq .Release.Name "RELEASE-NAME" -}} - {{- .Values.name | default "istio-ingressgateway" -}} -{{- else -}} - {{- .Values.name | default .Release.Name | default "istio-ingressgateway" -}} -{{- end -}} -{{- end }} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "gateway.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{- define "gateway.labels" -}} -helm.sh/chart: {{ include "gateway.chart" . }} -{{ include "gateway.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -app.kubernetes.io/name: {{ include "gateway.name" . }} -{{- range $key, $val := .Values.labels }} -{{- if not (or (eq $key "app") (eq $key "istio")) }} -{{ $key | quote }}: {{ $val | quote }} -{{- end }} -{{- end }} -{{- end }} - -{{- define "gateway.selectorLabels" -}} -{{- if hasKey .Values.labels "app" }} -{{- with .Values.labels.app }}app: {{.|quote}} -{{- end}} -{{- else }}app: {{ include "gateway.name" . }} -{{- end }} -{{- if hasKey .Values.labels "istio" }} -{{- with .Values.labels.istio }} -istio: {{.|quote}} -{{- end}} -{{- else }} -istio: {{ include "gateway.name" . | trimPrefix "istio-" }} -{{- end }} -{{- end }} - -{{- define "gateway.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- .Values.serviceAccount.name | default (include "gateway.name" .) }} -{{- else }} -{{- .Values.serviceAccount.name | default "default" }} -{{- end }} -{{- end }} diff --git a/charts/kubezero-istio-gateway/charts/gateway/templates/deployment.yaml b/charts/kubezero-istio-gateway/charts/gateway/templates/deployment.yaml deleted file mode 100644 index 550e3818..00000000 --- a/charts/kubezero-istio-gateway/charts/gateway/templates/deployment.yaml +++ /dev/null @@ -1,119 +0,0 @@ -apiVersion: apps/v1 -kind: {{ .Values.kind | default "Deployment" }} -metadata: - name: {{ include "gateway.name" . }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "gateway.labels" . | nindent 4}} - annotations: - {{- .Values.annotations | toYaml | nindent 4 }} -spec: - {{- if not .Values.autoscaling.enabled }} - replicas: {{ .Values.replicaCount }} - {{- end }} - # Give the LB 120s to detect and take into service - # should only be 40s by we are on AWS so ... - minReadySeconds: 120 - selector: - matchLabels: - {{- include "gateway.selectorLabels" . | nindent 6 }} - template: - metadata: - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - sidecar.istio.io/inject: "true" - {{- with .Values.revision }} - istio.io/rev: {{ . }} - {{- end }} - {{- include "gateway.selectorLabels" . | nindent 8 }} - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - terminationGracePeriodSeconds: 120 - serviceAccountName: {{ include "gateway.serviceAccountName" . }} - securityContext: - {{- if .Values.securityContext }} - {{- toYaml .Values.securityContext | nindent 8 }} - {{- else if (semverCompare ">=1.22-0" .Capabilities.KubeVersion.GitVersion) }} - # Safe since 1.22: https://github.com/kubernetes/kubernetes/pull/103326 - sysctls: - - name: net.ipv4.ip_unprivileged_port_start - value: "0" - {{- end }} - containers: - - name: istio-proxy - # "auto" will be populated at runtime by the mutating webhook. See https://istio.io/latest/docs/setup/additional-setup/sidecar-injection/#customizing-injection - image: auto - {{- with .Values.imagePullPolicy }} - imagePullPolicy: {{ . }} - {{- end }} - securityContext: - {{- if .Values.containerSecurityContext }} - {{- toYaml .Values.containerSecurityContext | nindent 12 }} - {{- else if (semverCompare ">=1.22-0" .Capabilities.KubeVersion.GitVersion) }} - # Safe since 1.22: https://github.com/kubernetes/kubernetes/pull/103326 - capabilities: - drop: - - ALL - allowPrivilegeEscalation: false - privileged: false - readOnlyRootFilesystem: true - runAsUser: 1337 - runAsGroup: 1337 - runAsNonRoot: true - {{- else }} - capabilities: - drop: - - ALL - add: - - NET_BIND_SERVICE - runAsUser: 0 - runAsGroup: 1337 - runAsNonRoot: false - allowPrivilegeEscalation: true - readOnlyRootFilesystem: true - {{- end }} - env: - {{- with .Values.networkGateway }} - - name: ISTIO_META_REQUESTED_NETWORK_VIEW - value: "{{.}}" - {{- end }} - {{- range $key, $val := .Values.env }} - - name: {{ $key }} - value: {{ $val | quote }} - {{- end }} - ports: - - containerPort: 15090 - protocol: TCP - name: http-envoy-prom - resources: - {{- toYaml .Values.resources | nindent 12 }} - {{- if .Values.volumeMounts }} - volumeMounts: - {{- toYaml .Values.volumeMounts | nindent 12 }} - {{- end }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.topologySpreadConstraints }} - topologySpreadConstraints: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.volumes }} - volumes: - {{- toYaml . | nindent 8 }} - {{- end }} diff --git a/charts/kubezero-istio-gateway/charts/gateway/templates/hpa.yaml b/charts/kubezero-istio-gateway/charts/gateway/templates/hpa.yaml deleted file mode 100644 index e287406c..00000000 --- a/charts/kubezero-istio-gateway/charts/gateway/templates/hpa.yaml +++ /dev/null @@ -1,31 +0,0 @@ -{{- if and (.Values.autoscaling.enabled) (eq .Values.kind "Deployment") }} -{{- if (semverCompare ">=1.23-0" .Capabilities.KubeVersion.GitVersion)}} -apiVersion: autoscaling/v2 -{{- else }} -apiVersion: autoscaling/v2beta2 -{{- end }} -kind: HorizontalPodAutoscaler -metadata: - name: {{ include "gateway.name" . }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "gateway.labels" . | nindent 4 }} - annotations: - {{- .Values.annotations | toYaml | nindent 4 }} -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: {{ .Values.kind | default "Deployment" }} - name: {{ include "gateway.name" . }} - minReplicas: {{ .Values.autoscaling.minReplicas }} - maxReplicas: {{ .Values.autoscaling.maxReplicas }} - metrics: - {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} - - type: Resource - resource: - name: cpu - target: - averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} - type: Utilization - {{- end }} -{{- end }} diff --git a/charts/kubezero-istio-gateway/charts/gateway/templates/role.yaml b/charts/kubezero-istio-gateway/charts/gateway/templates/role.yaml deleted file mode 100644 index 3febf79b..00000000 --- a/charts/kubezero-istio-gateway/charts/gateway/templates/role.yaml +++ /dev/null @@ -1,25 +0,0 @@ -{{/*Set up roles for Istio Gateway. Not required for gateway-api*/}} -{{- if .Values.rbac.enabled }} -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: {{ include "gateway.serviceAccountName" . }} - namespace: {{ .Release.Namespace }} -rules: -- apiGroups: [""] - resources: ["secrets"] - verbs: ["get", "watch", "list"] ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: {{ include "gateway.serviceAccountName" . }} - namespace: {{ .Release.Namespace }} -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: {{ include "gateway.serviceAccountName" . }} -subjects: -- kind: ServiceAccount - name: {{ include "gateway.serviceAccountName" . }} -{{- end }} diff --git a/charts/kubezero-istio-gateway/charts/gateway/templates/service.yaml b/charts/kubezero-istio-gateway/charts/gateway/templates/service.yaml deleted file mode 100644 index d4fe9e31..00000000 --- a/charts/kubezero-istio-gateway/charts/gateway/templates/service.yaml +++ /dev/null @@ -1,57 +0,0 @@ -{{- if not (eq .Values.service.type "None") }} -apiVersion: v1 -kind: Service -metadata: - name: {{ include "gateway.name" . }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "gateway.labels" . | nindent 4 }} - {{- with .Values.networkGateway }} - topology.istio.io/network: "{{.}}" - {{- end }} - annotations: - {{- merge (deepCopy .Values.service.annotations) .Values.annotations | toYaml | nindent 4 }} -spec: -{{- with .Values.service.loadBalancerIP }} - loadBalancerIP: "{{ . }}" -{{- end }} -{{- with .Values.service.loadBalancerSourceRanges }} - loadBalancerSourceRanges: -{{ toYaml . | indent 4 }} -{{- end }} -{{- with .Values.service.externalTrafficPolicy }} - externalTrafficPolicy: "{{ . }}" -{{- end }} - type: {{ .Values.service.type }} - ports: -{{- if .Values.networkGateway }} - - name: status-port - port: 15021 - targetPort: 15021 - - name: tls - port: 15443 - targetPort: 15443 - - name: tls-istiod - port: 15012 - targetPort: 15012 - - name: tls-webhook - port: 15017 - targetPort: 15017 -{{- else }} - {{- range $key, $val := .Values.service.ports }} - - - {{- range $pkey, $pval := $val }} - {{- if has $pkey (list "name" "nodePort" "port" "targetPort") }} - {{ $pkey}}: {{ $pval }} - {{- end }} - {{- end }} - {{- end }} -{{- end }} -{{- if .Values.service.externalIPs }} - externalIPs: {{- range .Values.service.externalIPs }} - - {{.}} - {{- end }} -{{- end }} - selector: - {{- include "gateway.selectorLabels" . | nindent 4 }} -{{- end }} diff --git a/charts/kubezero-istio-gateway/charts/gateway/templates/serviceaccount.yaml b/charts/kubezero-istio-gateway/charts/gateway/templates/serviceaccount.yaml deleted file mode 100644 index e5b2304d..00000000 --- a/charts/kubezero-istio-gateway/charts/gateway/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ -{{- if .Values.serviceAccount.create }} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "gateway.serviceAccountName" . }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "gateway.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end }} diff --git a/charts/kubezero-istio-gateway/charts/gateway/values.schema.json b/charts/kubezero-istio-gateway/charts/gateway/values.schema.json deleted file mode 100644 index 11aacbff..00000000 --- a/charts/kubezero-istio-gateway/charts/gateway/values.schema.json +++ /dev/null @@ -1,210 +0,0 @@ -{ - "$schema": "http://json-schema.org/schema#", - "type": "object", - "additionalProperties": false, - "properties": { - "global": { - "type": "object" - }, - "affinity": { - "type": "object" - }, - "securityContext": { - "type": ["object", "null"] - }, - "containerSecurityContext": { - "type": ["object", "null"] - }, - "kind":{ - "type": "string", - "enum": ["Deployment", "DaemonSet"] - }, - "annotations": { - "additionalProperties": { - "type": [ - "string", - "integer" - ] - }, - "type": "object" - }, - "autoscaling": { - "type": "object", - "properties": { - "enabled": { - "type": "boolean" - }, - "maxReplicas": { - "type": "integer" - }, - "minReplicas": { - "type": "integer" - }, - "targetCPUUtilizationPercentage": { - "type": "integer" - } - } - }, - "env": { - "type": "object" - }, - "labels": { - "type": "object" - }, - "volumes": { - "type": "array" - }, - "volumeMounts": { - "type": "array" - }, - "name": { - "type": "string" - }, - "nodeSelector": { - "type": "object" - }, - "podAnnotations": { - "type": "object", - "properties": { - "inject.istio.io/templates": { - "type": "string" - }, - "prometheus.io/path": { - "type": "string" - }, - "prometheus.io/port": { - "type": "string" - }, - "prometheus.io/scrape": { - "type": "string" - } - } - }, - "replicaCount": { - "type": "integer" - }, - "resources": { - "type": "object", - "properties": { - "limits": { - "type": "object", - "properties": { - "cpu": { - "type": "string" - }, - "memory": { - "type": "string" - } - } - }, - "requests": { - "type": "object", - "properties": { - "cpu": { - "type": "string" - }, - "memory": { - "type": "string" - } - } - } - } - }, - "revision": { - "type": "string" - }, - "runAsRoot": { - "type": "boolean" - }, - "unprivilegedPort": { - "type": ["string", "boolean"], - "enum": [true, false, "auto"] - }, - "service": { - "type": "object", - "properties": { - "annotations": { - "type": "object" - }, - "externalTrafficPolicy": { - "type": "string" - }, - "loadBalancerIP": { - "type": "string" - }, - "loadBalancerSourceRanges": { - "type": "array" - }, - "ports": { - "type": "array", - "items": { - "type": "object", - "properties": { - "name": { - "type": "string" - }, - "port": { - "type": "integer" - }, - "protocol": { - "type": "string" - }, - "targetPort": { - "type": "integer" - } - } - } - }, - "type": { - "type": "string" - } - } - }, - "serviceAccount": { - "type": "object", - "properties": { - "annotations": { - "type": "object" - }, - "name": { - "type": "string" - }, - "create": { - "type": "boolean" - } - } - }, - "rbac": { - "type": "object", - "properties": { - "enabled": { - "type": "boolean" - } - } - }, - "tolerations": { - "type": "array" - }, - "topologySpreadConstraints": { - "type": "array" - }, - "networkGateway": { - "type": "string" - }, - "imagePullPolicy": { - "type": "string", - "enum": ["", "Always", "IfNotPresent", "Never"] - }, - "imagePullSecrets": { - "type": "array", - "items": { - "type": "object", - "properties": { - "name": { - "type": "string" - } - } - } - } - } -} diff --git a/charts/kubezero-istio-gateway/charts/gateway/values.yaml b/charts/kubezero-istio-gateway/charts/gateway/values.yaml deleted file mode 100644 index b62c3eae..00000000 --- a/charts/kubezero-istio-gateway/charts/gateway/values.yaml +++ /dev/null @@ -1,97 +0,0 @@ -# Name allows overriding the release name. Generally this should not be set -name: "" -# revision declares which revision this gateway is a part of -revision: "" - -replicaCount: 1 - -kind: Deployment - -rbac: - # If enabled, roles will be created to enable accessing certificates from Gateways. This is not needed - # when using http://gateway-api.org/. - enabled: true - -serviceAccount: - # If set, a service account will be created. Otherwise, the default is used - create: true - # Annotations to add to the service account - annotations: {} - # The name of the service account to use. - # If not set, the release name is used - name: "" - -podAnnotations: - prometheus.io/port: "15020" - prometheus.io/scrape: "true" - prometheus.io/path: "/stats/prometheus" - inject.istio.io/templates: "gateway" - sidecar.istio.io/inject: "true" - -# Define the security context for the pod. -# If unset, this will be automatically set to the minimum privileges required to bind to port 80 and 443. -# On Kubernetes 1.22+, this only requires the `net.ipv4.ip_unprivileged_port_start` sysctl. -securityContext: ~ -containerSecurityContext: ~ - -service: - # Type of service. Set to "None" to disable the service entirely - type: LoadBalancer - ports: - - name: status-port - port: 15021 - protocol: TCP - targetPort: 15021 - - name: http2 - port: 80 - protocol: TCP - targetPort: 80 - - name: https - port: 443 - protocol: TCP - targetPort: 443 - annotations: {} - loadBalancerIP: "" - loadBalancerSourceRanges: [] - externalTrafficPolicy: "" - externalIPs: [] - -resources: - requests: - cpu: 100m - memory: 128Mi - limits: - cpu: 2000m - memory: 1024Mi - -autoscaling: - enabled: true - minReplicas: 1 - maxReplicas: 5 - targetCPUUtilizationPercentage: 80 - -# Pod environment variables -env: {} - -# Labels to apply to all resources -labels: {} - -# Annotations to apply to all resources -annotations: {} - -nodeSelector: {} - -tolerations: [] - -topologySpreadConstraints: [] - -affinity: {} - -# If specified, the gateway will act as a network gateway for the given network. -networkGateway: "" - -# Specify image pull policy if default behavior isn't desired. -# Default behavior: latest images will be Always else IfNotPresent -imagePullPolicy: "" - -imagePullSecrets: [] diff --git a/charts/kubezero-istio-gateway/templates/_gateway.tpl b/charts/kubezero-istio-gateway/templates/_gateway.tpl deleted file mode 100644 index ec8e0c6e..00000000 --- a/charts/kubezero-istio-gateway/templates/_gateway.tpl +++ /dev/null @@ -1,53 +0,0 @@ -{{- define "gatewayServers" }} - -{{- range $port := .ports }} -{{- if not $port.noGateway }} - -{{- $eachCert := false }} -{{- if $port.tls }} -{{- if not $port.tls.httpsRedirect }} -{{- $eachCert = true }} -{{- end }} -{{- end }} - -{{- if $eachCert }} -{{- range $cert := $.certificates }} -- port: - number: {{ $port.port }} - name: {{ $port.name }}-{{ $cert.name }} - protocol: {{ default "TCP" $port.gatewayProtocol }} - tls: - credentialName: {{ $cert.name }} - {{- toYaml $port.tls | nindent 4 }} - hosts: - {{- toYaml $cert.dnsNames | nindent 2 }} -{{- end }} -{{- else }} -- port: - number: {{ $port.port }} - name: {{ $port.name }} - protocol: {{ default "TCP" $port.gatewayProtocol }} - {{- with $port.tls }} - tls: - {{- toYaml . | nindent 4 }} - {{- end }} - hosts: - {{- range $cert := $.certificates }} - {{- toYaml $cert.dnsNames | nindent 2 }} - {{- end }} -{{- end }} -{{- end }} - -{{- end }} -{{- end }} - - -{{- define "gatewayName" -}} -{{ .Values.gateway.name | default .Release.Name | default "istio-ingressgateway" }} -{{- end }} - - -{{- define "gatewaySelectorLabels" -}} -app: {{ include "gatewayName" . }} -istio: {{ include "gatewayName" . | trimPrefix "istio-" }} -{{- end }} diff --git a/charts/kubezero-istio-gateway/templates/bootstrap-config.yaml b/charts/kubezero-istio-gateway/templates/bootstrap-config.yaml deleted file mode 100644 index 976e9b61..00000000 --- a/charts/kubezero-istio-gateway/templates/bootstrap-config.yaml +++ /dev/null @@ -1,59 +0,0 @@ -# https://www.envoyproxy.io/docs/envoy/v1.17.1/configuration/best_practices/edge#configuring-envoy-as-an-edge-proxy -# https://github.com/istio/istio/issues/24715 -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "gatewayName" . | trimPrefix "istio-" }}-bootstrap-config - namespace: {{ .Release.Namespace }} - labels: -{{ include "kubezero-lib.labels" . | indent 4 }} -data: - custom_bootstrap.json: | - { - "overload_manager": { - "actions": [ - { - "name": "envoy.overload_actions.shrink_heap", - "triggers": [ - { - "name": "envoy.resource_monitors.fixed_heap", - "threshold": { - "value": 0.9 - } - } - ] - }, - { - "name": "envoy.overload_actions.stop_accepting_requests", - "triggers": [ - { - "name": "envoy.resource_monitors.fixed_heap", - "threshold": { - "value": 0.99 - } - } - ] - } - ], - "refresh_interval": "0.25s", - "resource_monitors": [ - { - "name": "envoy.resource_monitors.fixed_heap", - "typed_config": { - "@type": "type.googleapis.com/envoy.extensions.resource_monitors.fixed_heap.v3.FixedHeapConfig", - "max_heap_size_bytes": 536870912 - } - } - ] - }, - "layeredRuntime": { - "layers": [ - { - "name": "static_layer_0", - "staticLayer": { - "overload.global_downstream_max_connections": 50000 - } - } - ] - } - } diff --git a/charts/kubezero-istio-gateway/templates/envoyfilter-hardening.yaml b/charts/kubezero-istio-gateway/templates/envoyfilter-hardening.yaml deleted file mode 100644 index d97b3637..00000000 --- a/charts/kubezero-istio-gateway/templates/envoyfilter-hardening.yaml +++ /dev/null @@ -1,39 +0,0 @@ -apiVersion: networking.istio.io/v1alpha3 -kind: EnvoyFilter -metadata: - name: {{ include "gatewayName" . | trimPrefix "istio-" }}-hardening - namespace: {{ .Release.Namespace }} - labels: - {{ include "kubezero-lib.labels" . | nindent 4 }} -spec: - workloadSelector: - labels: - {{- include "gatewaySelectorLabels" . | nindent 6 }} - configPatches: - - applyTo: CLUSTER - patch: - operation: MERGE - value: - connect_timeout: 15s - per_connection_buffer_limit_bytes: 32768 # 32 KiB - - applyTo: NETWORK_FILTER - match: - listener: - filterChain: - filter: - name: "envoy.filters.network.http_connection_manager" - patch: - operation: MERGE - value: - name: "envoy.filters.network.http_connection_manager" - typed_config: - "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager" - common_http_protocol_options: - idle_timeout: 3600s # 1 hour - # headers_with_underscores_action: REJECT_REQUEST - http2_protocol_options: - max_concurrent_streams: 500 - initial_stream_window_size: 65536 # 64 KiB - initial_connection_window_size: 1048576 # 1 MiB - #stream_idle_timeout: 300s # 5 mins, must be disabled for long-lived and streaming requests - #request_timeout: 300s # 5 mins, must be disabled for long-lived and streaming requests diff --git a/charts/kubezero-istio-gateway/templates/envoyfilter-keepalive-nlb.yaml b/charts/kubezero-istio-gateway/templates/envoyfilter-keepalive-nlb.yaml deleted file mode 100644 index 3888aa51..00000000 --- a/charts/kubezero-istio-gateway/templates/envoyfilter-keepalive-nlb.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: networking.istio.io/v1alpha3 -kind: EnvoyFilter -metadata: - name: {{ include "gatewayName" . | trimPrefix "istio-" }}-listener-tcp-keepalive - namespace: {{ .Release.Namespace }} - labels: - {{- include "kubezero-lib.labels" . | nindent 4 }} -spec: - workloadSelector: - labels: - {{- include "gatewaySelectorLabels" . | nindent 6 }} - configPatches: - - applyTo: LISTENER - patch: - operation: MERGE - value: - socket_options: - - level: 1 # SOL_SOCKET = 1 - name: 9 # SO_KEEPALIVE = 9 - int_value: 1 - state: STATE_PREBIND - - level: 6 # IPPROTO_TCP = 6 - name: 4 # TCP_KEEPIDLE = 4 - int_value: 120 - state: STATE_PREBIND - - level: 6 # IPPROTO_TCP = 6 - name: 5 # TCP_KEEPINTVL = 5 - int_value: 60 - state: STATE_PREBIND diff --git a/charts/kubezero-istio-gateway/templates/envoyfilter-proxy-protocol.yaml b/charts/kubezero-istio-gateway/templates/envoyfilter-proxy-protocol.yaml deleted file mode 100644 index a1fa22df..00000000 --- a/charts/kubezero-istio-gateway/templates/envoyfilter-proxy-protocol.yaml +++ /dev/null @@ -1,21 +0,0 @@ -{{- if .Values.proxyProtocol }} -apiVersion: networking.istio.io/v1alpha3 -kind: EnvoyFilter -metadata: - name: {{ include "gatewayName" . | trimPrefix "istio-" }}-proxy-protocol - namespace: {{ .Release.Namespace }} - labels: - {{ include "kubezero-lib.labels" . | nindent 4 }} -spec: - workloadSelector: - labels: - {{- include "gatewaySelectorLabels" . | nindent 6 }} - configPatches: - - applyTo: LISTENER - patch: - operation: MERGE - value: - listener_filters: - - name: envoy.filters.listener.proxy_protocol - - name: envoy.filters.listener.tls_inspector -{{- end }} diff --git a/charts/kubezero-istio-gateway/templates/ingress-certificate.yaml b/charts/kubezero-istio-gateway/templates/ingress-certificate.yaml deleted file mode 100644 index 57d6c134..00000000 --- a/charts/kubezero-istio-gateway/templates/ingress-certificate.yaml +++ /dev/null @@ -1,19 +0,0 @@ -{{- range $cert := .Values.certificates }} -{{- if $cert.dnsNames }} -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: {{ $cert.name }} - namespace: {{ $.Release.Namespace }} - labels: -{{ include "kubezero-lib.labels" $ | indent 4 }} -spec: - secretName: {{ $cert.name }} - issuerRef: - name: {{ default "letsencrypt-dns-prod" $cert.issuer }} - kind: ClusterIssuer - dnsNames: -{{ toYaml $cert.dnsNames | indent 4 }} ---- -{{- end }} -{{- end }} diff --git a/charts/kubezero-istio-gateway/templates/ingress-gateway.yaml b/charts/kubezero-istio-gateway/templates/ingress-gateway.yaml deleted file mode 100644 index 1070db55..00000000 --- a/charts/kubezero-istio-gateway/templates/ingress-gateway.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# https://istio.io/latest/docs/tasks/traffic-management/ingress/secure-ingress/#configure-a-tls-ingress-gateway-for-multiple-hosts -{{- if .Values.certificates }} -apiVersion: networking.istio.io/v1beta1 -kind: Gateway -metadata: - name: {{ include "gatewayName" . | trimPrefix "istio-" }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "kubezero-lib.labels" . | nindent 4 }} -spec: - selector: - {{- include "gatewaySelectorLabels" . | nindent 4 }} - servers: - {{- include "gatewayServers" (dict "certificates" .Values.certificates "ports" .Values.gateway.service.ports ) | nindent 2 }} -{{- end }} diff --git a/charts/kubezero-istio-gateway/templates/podmonitor.yaml b/charts/kubezero-istio-gateway/templates/podmonitor.yaml deleted file mode 100644 index 2020c4fe..00000000 --- a/charts/kubezero-istio-gateway/templates/podmonitor.yaml +++ /dev/null @@ -1,37 +0,0 @@ -{{- if .Values.telemetry.enabled }} -apiVersion: monitoring.coreos.com/v1 -kind: PodMonitor -metadata: - name: {{ include "gatewayName" . | trimPrefix "istio-" }}-envoy-stats-monitor - namespace: {{ .Release.Namespace }} - labels: -{{ include "kubezero-lib.labels" . | indent 4 }} -spec: - selector: - matchExpressions: - - {key: istio-prometheus-ignore, operator: DoesNotExist} - matchLabels: - {{- include "gatewaySelectorLabels" . | nindent 6 }} - jobLabel: envoy-stats - podMetricsEndpoints: - - path: /stats/prometheus - relabelings: - - action: keep - sourceLabels: [__meta_kubernetes_pod_container_name] - regex: "istio-proxy" - - action: keep - sourceLabels: [__meta_kubernetes_pod_annotationpresent_prometheus_io_scrape] - - sourceLabels: [__address__, __meta_kubernetes_pod_annotation_prometheus_io_port] - action: replace - regex: ([^:]+)(?::\d+)?;(\d+) - replacement: $1:$2 - targetLabel: __address__ - - action: labeldrop - regex: "__meta_kubernetes_pod_label_(.+)" - - sourceLabels: [__meta_kubernetes_namespace] - action: replace - targetLabel: namespace - - sourceLabels: [__meta_kubernetes_pod_name] - action: replace - targetLabel: pod_name -{{- end }} diff --git a/charts/kubezero-istio-gateway/update.sh b/charts/kubezero-istio-gateway/update.sh deleted file mode 100755 index 6180df35..00000000 --- a/charts/kubezero-istio-gateway/update.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -set -ex - -export ISTIO_VERSION=$(yq eval '.dependencies[] | select(.name=="gateway") | .version' Chart.yaml) - -helm dep update - -# Patch -tar xf charts/gateway-$ISTIO_VERSION.tgz -C charts && rm -f charts/gateway-$ISTIO_VERSION.tgz -#diff -tubr charts/gateway.orig charts/gateway -patch -p0 -i zdt.patch --no-backup-if-mismatch diff --git a/charts/kubezero-istio-gateway/values.yaml b/charts/kubezero-istio-gateway/values.yaml deleted file mode 100644 index 39a37a87..00000000 --- a/charts/kubezero-istio-gateway/values.yaml +++ /dev/null @@ -1,38 +0,0 @@ -gateway: - autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 4 - targetCPUUtilizationPercentage: 80 - - replicaCount: 1 - - resources: - requests: - cpu: 50m - memory: 64Mi - limits: - # cpu: 100m - memory: 512Mi - - service: - type: NodePort - externalTrafficPolicy: Local - # Map port 80/443 to 8080/8443 so we don't need to root - - # ports is extended as follows: - # noGateway: true -> this port does NOT get mapped to a Gateway port - # tls: optional gateway port setting - # gatewayProtocol: Loadbalancer protocol which is NOT the same as Container Procotol ! - - podAnnotations: - proxy.istio.io/config: '{ "terminationDrainDuration": "20s" }' - -certificates: [] -#- name: ingress-cert -# dnsNames: [] - -telemetry: - enabled: false - -proxyProtocol: true diff --git a/charts/kubezero-istio-gateway/zdt.patch b/charts/kubezero-istio-gateway/zdt.patch deleted file mode 100644 index 05468ab2..00000000 --- a/charts/kubezero-istio-gateway/zdt.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -tubr charts/gateway.orig/templates/deployment.yaml charts/gateway/templates/deployment.yaml ---- charts/gateway.orig/templates/deployment.yaml 2022-12-09 14:58:33.000000000 +0000 -+++ charts/gateway/templates/deployment.yaml 2022-12-13 11:43:02.196667885 +0000 -@@ -11,6 +11,9 @@ - {{- if not .Values.autoscaling.enabled }} - replicas: {{ .Values.replicaCount }} - {{- end }} -+ # Give the LB 120s to detect and take into service -+ # should only be 40s by we are on AWS so ... -+ minReadySeconds: 120 - selector: - matchLabels: - {{- include "gateway.selectorLabels" . | nindent 6 }} -@@ -31,6 +34,7 @@ - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} -+ terminationGracePeriodSeconds: 120 - serviceAccountName: {{ include "gateway.serviceAccountName" . }} - securityContext: - {{- if .Values.securityContext }} -@@ -86,6 +90,10 @@ - name: http-envoy-prom - resources: - {{- toYaml .Values.resources | nindent 12 }} -+ {{- if .Values.volumeMounts }} -+ volumeMounts: -+ {{- toYaml .Values.volumeMounts | nindent 12 }} -+ {{- end }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} -@@ -102,3 +110,7 @@ - topologySpreadConstraints: - {{- toYaml . | nindent 8 }} - {{- end }} -+ {{- with .Values.volumes }} -+ volumes: -+ {{- toYaml . | nindent 8 }} -+ {{- end }} -diff -tubr charts/gateway.orig/templates/service.yaml charts/gateway/templates/service.yaml ---- charts/gateway.orig/templates/service.yaml 2022-12-09 14:58:33.000000000 +0000 -+++ charts/gateway/templates/service.yaml 2022-12-12 22:52:27.629670669 +0000 -@@ -38,7 +38,14 @@ - port: 15017 - targetPort: 15017 - {{- else }} --{{ .Values.service.ports | toYaml | indent 4 }} -+ {{- range $key, $val := .Values.service.ports }} -+ - -+ {{- range $pkey, $pval := $val }} -+ {{- if has $pkey (list "name" "nodePort" "port" "targetPort") }} -+ {{ $pkey}}: {{ $pval }} -+ {{- end }} -+ {{- end }} -+ {{- end }} - {{- end }} - {{- if .Values.service.externalIPs }} - externalIPs: {{- range .Values.service.externalIPs }} -diff -tubr charts/gateway.orig/values.schema.json charts/gateway/values.schema.json ---- charts/gateway.orig/values.schema.json 2022-12-09 14:58:33.000000000 +0000 -+++ charts/gateway/values.schema.json 2022-12-12 22:52:27.629670669 +0000 -@@ -51,6 +51,12 @@ - "labels": { - "type": "object" - }, -+ "volumes": { -+ "type": "array" -+ }, -+ "volumeMounts": { -+ "type": "array" -+ }, - "name": { - "type": "string" - }, diff --git a/charts/kubezero-istio/.gitignore b/charts/kubezero-istio/.gitignore deleted file mode 100644 index 07f190b0..00000000 --- a/charts/kubezero-istio/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -istioctl -istio -istio.zdt diff --git a/charts/kubezero-istio/.helmignore b/charts/kubezero-istio/.helmignore deleted file mode 100644 index be6d0cec..00000000 --- a/charts/kubezero-istio/.helmignore +++ /dev/null @@ -1,32 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ - -README.md.gotmpl -*.patch -*.sh -*.py - -istioctl -istio -istio.zdt diff --git a/charts/kubezero-istio/Chart.yaml b/charts/kubezero-istio/Chart.yaml deleted file mode 100644 index 8df274c1..00000000 --- a/charts/kubezero-istio/Chart.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: v2 -name: kubezero-istio -description: KubeZero Umbrella Chart for Istio -type: application -version: 0.10.0 -home: https://kubezero.com -icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png -keywords: - - kubezero - - istio -maintainers: - - name: Stefan Reimer - email: stefan@zero-downtime.net -dependencies: - - name: kubezero-lib - version: ">= 0.1.6" - repository: https://cdn.zero-downtime.net/charts/ - - name: base - version: 1.17.2 - repository: https://istio-release.storage.googleapis.com/charts - - name: istiod - version: 1.17.2 - repository: https://istio-release.storage.googleapis.com/charts - - name: kiali-server - version: "1.66.0" - repository: https://kiali.org/helm-charts - condition: kiali-server.enabled -kubeVersion: ">= 1.25.0" diff --git a/charts/kubezero-istio/README.md b/charts/kubezero-istio/README.md deleted file mode 100644 index 4b429810..00000000 --- a/charts/kubezero-istio/README.md +++ /dev/null @@ -1,79 +0,0 @@ -# kubezero-istio - -![Version: 0.10.0](https://img.shields.io/badge/Version-0.10.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) - -KubeZero Umbrella Chart for Istio - -Installs the Istio control plane - -**Homepage:** - -## Maintainers - -| Name | Email | Url | -| ---- | ------ | --- | -| Stefan Reimer | | | - -## Requirements - -Kubernetes: `>= 1.25.0` - -| Repository | Name | Version | -|------------|------|---------| -| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 | -| https://istio-release.storage.googleapis.com/charts | base | 1.17.2 | -| https://istio-release.storage.googleapis.com/charts | istiod | 1.17.2 | -| https://kiali.org/helm-charts | kiali-server | 1.66.0 | - -## Values - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| global.defaultPodDisruptionBudget.enabled | bool | `false` | | -| global.logAsJson | bool | `true` | | -| global.priorityClassName | string | `"system-cluster-critical"` | | -| global.variant | string | `"distroless"` | | -| istiod.meshConfig.accessLogEncoding | string | `"JSON"` | | -| istiod.meshConfig.accessLogFile | string | `"/dev/stdout"` | | -| istiod.meshConfig.tcpKeepalive.interval | string | `"60s"` | | -| istiod.meshConfig.tcpKeepalive.time | string | `"120s"` | | -| istiod.pilot.autoscaleEnabled | bool | `false` | | -| istiod.pilot.nodeSelector."node-role.kubernetes.io/control-plane" | string | `""` | | -| istiod.pilot.replicaCount | int | `1` | | -| istiod.pilot.resources.requests.cpu | string | `"100m"` | | -| istiod.pilot.resources.requests.memory | string | `"128Mi"` | | -| istiod.pilot.tolerations[0].effect | string | `"NoSchedule"` | | -| istiod.pilot.tolerations[0].key | string | `"node-role.kubernetes.io/control-plane"` | | -| istiod.telemetry.enabled | bool | `false` | | -| kiali-server.auth.strategy | string | `"anonymous"` | | -| kiali-server.deployment.ingress_enabled | bool | `false` | | -| kiali-server.deployment.view_only_mode | bool | `true` | | -| kiali-server.enabled | bool | `false` | | -| kiali-server.external_services.custom_dashboards.enabled | bool | `false` | | -| kiali-server.external_services.prometheus.url | string | `"http://metrics-kube-prometheus-st-prometheus.monitoring:9090"` | | -| kiali-server.istio.enabled | bool | `false` | | -| kiali-server.istio.gateway | string | `"istio-ingress/private-ingressgateway"` | | -| kiali-server.server.metrics_enabled | bool | `false` | | -| rateLimiting.descriptors.ingress[0].key | string | `"remote_address"` | | -| rateLimiting.descriptors.ingress[0].rate_limit.requests_per_unit | int | `10` | | -| rateLimiting.descriptors.ingress[0].rate_limit.unit | string | `"second"` | | -| rateLimiting.descriptors.privateIngress[0].key | string | `"remote_address"` | | -| rateLimiting.descriptors.privateIngress[0].rate_limit.requests_per_unit | int | `10` | | -| rateLimiting.descriptors.privateIngress[0].rate_limit.unit | string | `"second"` | | -| rateLimiting.enabled | bool | `false` | | -| rateLimiting.failureModeDeny | bool | `false` | | -| rateLimiting.localCacheSize | int | `1048576` | | -| rateLimiting.log.format | string | `"json"` | | -| rateLimiting.log.level | string | `"warn"` | | - -## Resources - -- https://istio.io/latest/docs/reference/config/istio.operator.v1alpha1/#IstioOperatorSpec -- https://github.com/istio/istio/blob/master/manifests/profiles/default.yaml -- https://istio.io/latest/docs/setup/install/standalone-operator/ - -### Grafana -- https://grafana.com/grafana/dashboards/7645 -- https://grafana.com/grafana/dashboards/7639 -- https://grafana.com/grafana/dashboards/7636 -- https://grafana.com/grafana/dashboards/7630 diff --git a/charts/kubezero-istio/README.md.gotmpl b/charts/kubezero-istio/README.md.gotmpl deleted file mode 100644 index 3b91ba2e..00000000 --- a/charts/kubezero-istio/README.md.gotmpl +++ /dev/null @@ -1,30 +0,0 @@ -{{ template "chart.header" . }} -{{ template "chart.deprecationWarning" . }} - -{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }} - -{{ template "chart.description" . }} - -Installs the Istio control plane - -{{ template "chart.homepageLine" . }} - -{{ template "chart.maintainersSection" . }} - -{{ template "chart.sourcesSection" . }} - -{{ template "chart.requirementsSection" . }} - -{{ template "chart.valuesSection" . }} - -## Resources - -- https://istio.io/latest/docs/reference/config/istio.operator.v1alpha1/#IstioOperatorSpec -- https://github.com/istio/istio/blob/master/manifests/profiles/default.yaml -- https://istio.io/latest/docs/setup/install/standalone-operator/ - -### Grafana -- https://grafana.com/grafana/dashboards/7645 -- https://grafana.com/grafana/dashboards/7639 -- https://grafana.com/grafana/dashboards/7636 -- https://grafana.com/grafana/dashboards/7630 diff --git a/charts/kubezero-istio/dashboards.yaml b/charts/kubezero-istio/dashboards.yaml deleted file mode 100644 index 92682ff3..00000000 --- a/charts/kubezero-istio/dashboards.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# Revision 162 = 1.17 -configmap: grafana-dashboards -gzip: true -folder: Istio -condition: '.Values.istiod.telemetry.enabled' -dashboards: -- name: istio-control-plane - url: https://grafana.com/api/dashboards/7645/revisions/162/download - tags: - - Istio -- name: istio-mesh - url: https://grafana.com/api/dashboards/7639/revisions/162/download - tags: - - Istio -- name: istio-service - url: https://grafana.com/api/dashboards/7636/revisions/162/download - tags: - - Istio -- name: istio-workload - url: https://grafana.com/api/dashboards/7630/revisions/162/download - tags: - - Istio diff --git a/charts/kubezero-istio/templates/grafana-dashboards.yaml b/charts/kubezero-istio/templates/grafana-dashboards.yaml deleted file mode 100644 index a27aed99..00000000 --- a/charts/kubezero-istio/templates/grafana-dashboards.yaml +++ /dev/null @@ -1,21 +0,0 @@ -{{- if .Values.istiod.telemetry.enabled }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ printf "%s-%s" (include "kubezero-lib.fullname" $) "grafana-dashboards" | trunc 63 | trimSuffix "-" }} - namespace: {{ .Release.Namespace }} - labels: - grafana_dashboard: "1" - {{- include "kubezero-lib.labels" . | nindent 4 }} - annotations: - k8s-sidecar-target-directory: Istio -binaryData: - istio-control-plane.json.gz: - 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 - istio-mesh.json.gz: - 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 - istio-service.json.gz: - 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 - istio-workload.json.gz: - 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 -{{- end }} diff --git a/charts/kubezero-istio/templates/kiali/istio-service.yaml b/charts/kubezero-istio/templates/kiali/istio-service.yaml deleted file mode 100644 index ed5ab2dd..00000000 --- a/charts/kubezero-istio/templates/kiali/istio-service.yaml +++ /dev/null @@ -1,18 +0,0 @@ -{{- if (index .Values "kiali-server" "istio" "enabled") }} -apiVersion: networking.istio.io/v1beta1 -kind: VirtualService -metadata: - name: {{ .Release.Name }}-kiali - namespace: {{ .Release.Namespace }} - labels: -{{ include "kubezero-lib.labels" . | indent 4 }} -spec: - hosts: - - {{ index .Values "kiali-server" "istio" "url" }} - gateways: - - {{ index .Values "kiali-server" "istio" "gateway" }} - http: - - route: - - destination: - host: kiali -{{- end }} diff --git a/charts/kubezero-istio/templates/ratelimit/config-statds-exporter.yaml b/charts/kubezero-istio/templates/ratelimit/config-statds-exporter.yaml deleted file mode 100644 index 07917077..00000000 --- a/charts/kubezero-istio/templates/ratelimit/config-statds-exporter.yaml +++ /dev/null @@ -1,106 +0,0 @@ -{{- if .Values.rateLimiting.enabled }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: ratelimit-statsd-exporter-config - namespace: {{ .Release.Namespace }} - labels: - {{- include "kubezero-lib.labels" . | nindent 4 }} -data: - config.yaml: | - defaults: - ttl: 1m # Resets the metrics every minute - mappings: - - match: - "ratelimit.service.rate_limit.*.*.near_limit" - name: "ratelimit_service_rate_limit_near_limit" - timer_type: "histogram" - labels: - domain: "$1" - key1: "$2" - - match: - "ratelimit.service.rate_limit.*.*.over_limit" - name: "ratelimit_service_rate_limit_over_limit" - timer_type: "histogram" - labels: - domain: "$1" - key1: "$2" - - match: - "ratelimit.service.rate_limit.*.*.total_hits" - name: "ratelimit_service_rate_limit_total_hits" - timer_type: "histogram" - labels: - domain: "$1" - key1: "$2" - - match: - "ratelimit.service.rate_limit.*.*.within_limit" - name: "ratelimit_service_rate_limit_within_limit" - timer_type: "histogram" - labels: - domain: "$1" - key1: "$2" - - match: - "ratelimit.service.rate_limit.*.*.*.near_limit" - name: "ratelimit_service_rate_limit_near_limit" - timer_type: "histogram" - labels: - domain: "$1" - key1: "$2" - key2: "$3" - - match: - "ratelimit.service.rate_limit.*.*.*.over_limit" - name: "ratelimit_service_rate_limit_over_limit" - timer_type: "histogram" - labels: - domain: "$1" - key1: "$2" - key2: "$3" - - match: - "ratelimit.service.rate_limit.*.*.*.total_hits" - name: "ratelimit_service_rate_limit_total_hits" - timer_type: "histogram" - labels: - domain: "$1" - key1: "$2" - key2: "$3" - - match: - "ratelimit.service.rate_limit.*.*.*.within_limit" - name: "ratelimit_service_rate_limit_within_limit" - timer_type: "histogram" - labels: - domain: "$1" - key1: "$2" - key2: "$3" - - match: - "ratelimit.service.call.should_rate_limit.*" - name: "ratelimit_service_should_rate_limit_error" - match_metric_type: counter - labels: - err_type: "$1" - - match: - "ratelimit_server.*.total_requests" - name: "ratelimit_service_total_requests" - match_metric_type: counter - labels: - grpc_method: "$1" - - match: - "ratelimit_server.*.response_time" - name: "ratelimit_service_response_time_seconds" - timer_type: histogram - labels: - grpc_method: "$1" - - match: - "ratelimit.service.config_load_success" - name: "ratelimit_service_config_load_success" - match_metric_type: counter - ttl: 3m - - match: - "ratelimit.service.config_load_error" - name: "ratelimit_service_config_load_error" - match_metric_type: counter - ttl: 3m - - match: "." - match_type: "regex" - action: "drop" - name: "dropped" -{{- end }} diff --git a/charts/kubezero-istio/templates/ratelimit/config.yaml b/charts/kubezero-istio/templates/ratelimit/config.yaml deleted file mode 100644 index e8eff173..00000000 --- a/charts/kubezero-istio/templates/ratelimit/config.yaml +++ /dev/null @@ -1,19 +0,0 @@ -{{- if .Values.rateLimiting.enabled }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: ratelimit-config - namespace: {{ .Release.Namespace }} - labels: - {{- include "kubezero-lib.labels" . | nindent 4 }} -data: - ingress.yaml: | - domain: ingress - descriptors: - {{- toYaml .Values.rateLimiting.descriptors.ingress | nindent 4 }} - - private-ingress.yaml: | - domain: private-ingress - descriptors: - {{- toYaml .Values.rateLimiting.descriptors.privateIngress | nindent 4 }} -{{- end }} diff --git a/charts/kubezero-istio/templates/ratelimit/envoyfilter-cluster.yaml b/charts/kubezero-istio/templates/ratelimit/envoyfilter-cluster.yaml deleted file mode 100644 index 3f74dfc9..00000000 --- a/charts/kubezero-istio/templates/ratelimit/envoyfilter-cluster.yaml +++ /dev/null @@ -1,116 +0,0 @@ -{{- if .Values.rateLimiting.enabled }} -apiVersion: networking.istio.io/v1alpha3 -kind: EnvoyFilter -metadata: - name: ingressgateway-ratelimit - namespace: {{ .Release.Namespace }} - labels: - {{- include "kubezero-lib.labels" . | nindent 4 }} -spec: - workloadSelector: - labels: - istio: ingressgateway - configPatches: - - applyTo: HTTP_FILTER - match: - context: GATEWAY - listener: - filterChain: - filter: - name: "envoy.filters.network.http_connection_manager" - subFilter: - name: "envoy.filters.http.router" - patch: - operation: INSERT_BEFORE - value: - name: envoy.filters.http.ratelimit - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.http.ratelimit.v3.RateLimit - domain: ingress - failure_mode_deny: {{ .Values.rateLimiting.failureModeDeny }} - timeout: 0.5s - rate_limit_service: - grpc_service: - envoy_grpc: - cluster_name: rate_limit_cluster - transport_api_version: V3 - - applyTo: CLUSTER - match: - cluster: - service: ratelimit.default.svc.cluster.local - patch: - operation: ADD - value: - name: rate_limit_cluster - type: STRICT_DNS - connect_timeout: 0.5s - lb_policy: ROUND_ROBIN - http2_protocol_options: {} - load_assignment: - cluster_name: rate_limit_cluster - endpoints: - - lb_endpoints: - - endpoint: - address: - socket_address: - address: ratelimit.istio-system - port_value: 8081 - ---- -apiVersion: networking.istio.io/v1alpha3 -kind: EnvoyFilter -metadata: - name: private-ingressgateway-ratelimit - namespace: {{ .Release.Namespace }} - labels: - {{- include "kubezero-lib.labels" . | nindent 4 }} -spec: - workloadSelector: - labels: - istio: private-ingressgateway - configPatches: - - applyTo: HTTP_FILTER - match: - context: GATEWAY - listener: - filterChain: - filter: - name: "envoy.filters.network.http_connection_manager" - subFilter: - name: "envoy.filters.http.router" - patch: - operation: INSERT_BEFORE - value: - name: envoy.filters.http.ratelimit - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.http.ratelimit.v3.RateLimit - domain: private-ingress - failure_mode_deny: {{ .Values.rateLimiting.failureModeDeny }} - timeout: 0.5s - rate_limit_service: - grpc_service: - envoy_grpc: - cluster_name: rate_limit_cluster - transport_api_version: V3 - - applyTo: CLUSTER - match: - cluster: - service: ratelimit.default.svc.cluster.local - patch: - operation: ADD - value: - name: rate_limit_cluster - type: STRICT_DNS - connect_timeout: 0.5s - lb_policy: ROUND_ROBIN - http2_protocol_options: {} - load_assignment: - cluster_name: rate_limit_cluster - endpoints: - - lb_endpoints: - - endpoint: - address: - socket_address: - address: ratelimit.istio-system - port_value: 8081 -{{- end }} diff --git a/charts/kubezero-istio/templates/ratelimit/rate-limit-service.yaml b/charts/kubezero-istio/templates/ratelimit/rate-limit-service.yaml deleted file mode 100644 index 1c3cc299..00000000 --- a/charts/kubezero-istio/templates/ratelimit/rate-limit-service.yaml +++ /dev/null @@ -1,154 +0,0 @@ -{{- if .Values.rateLimiting.enabled }} -apiVersion: v1 -kind: Service -metadata: - name: ratelimit-redis - namespace: {{ .Release.Namespace }} - labels: - app: ratelimit-redis -spec: - ports: - - name: redis - port: 6379 - selector: - app: ratelimit-redis ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: ratelimit-redis - namespace: {{ .Release.Namespace }} -spec: - replicas: 1 - selector: - matchLabels: - app: ratelimit-redis - template: - metadata: - labels: - app: ratelimit-redis - spec: - containers: - - image: redis:6-alpine - imagePullPolicy: IfNotPresent - name: redis - ports: - - name: redis - containerPort: 6379 - restartPolicy: Always - serviceAccountName: "" ---- -apiVersion: v1 -kind: Service -metadata: - name: ratelimit - namespace: {{ .Release.Namespace }} - labels: - app: ratelimit -spec: - ports: - #- name: http-port - # port: 8080 - # targetPort: 8080 - # protocol: TCP - - name: grpc-port - port: 8081 - targetPort: 8081 - protocol: TCP - #- name: http-debug - # port: 6070 - # targetPort: 6070 - # protocol: TCP - - name: http-monitoring - port: 9102 - targetPort: 9102 - protocol: TCP - selector: - app: ratelimit ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: ratelimit - namespace: {{ .Release.Namespace }} -spec: - replicas: 1 - selector: - matchLabels: - app: ratelimit - strategy: - type: Recreate - template: - metadata: - labels: - app: ratelimit - spec: - containers: - - image: envoyproxy/ratelimit:b42701cb # 2021/08/12 - imagePullPolicy: IfNotPresent - name: ratelimit - command: ["/bin/ratelimit"] - env: - - name: LOG_LEVEL - value: {{ default "WARN" .Values.rateLimiting.log.level }} - - name: LOG_FORMAT - value: {{ default "text" .Values.rateLimiting.log.format }} - - name: REDIS_SOCKET_TYPE - value: tcp - - name: REDIS_URL - value: ratelimit-redis:6379 - - name: USE_STATSD - value: "true" - - name: STATSD_HOST - value: "localhost" - - name: STATSD_PORT - value: "9125" - - name: RUNTIME_ROOT - value: /data - - name: RUNTIME_SUBDIRECTORY - value: ratelimit - - name: RUNTIME_WATCH_ROOT - value: "false" - - name: RUNTIME_IGNOREDOTFILES - value: "true" - - name: LOCAL_CACHE_SIZE_IN_BYTES - value: "{{ default 0 .Values.rateLimiting.localCacheSize | int }}" - ports: - #- containerPort: 8080 - - containerPort: 8081 - #- containerPort: 6070 - volumeMounts: - - name: ratelimit-config - mountPath: /data/ratelimit/config - resources: - requests: - cpu: 50m - memory: 32Mi - limits: - cpu: 1 - memory: 256Mi - - name: statsd-exporter - image: docker.io/prom/statsd-exporter:v0.21.0 - imagePullPolicy: Always - args: ["--statsd.mapping-config=/etc/statsd-exporter/config.yaml"] - ports: - - containerPort: 9125 - # - containerPort: 9102 - resources: - requests: - cpu: 50m - memory: 32Mi - limits: - cpu: 200m - memory: 64Mi - volumeMounts: - - name: statsd-exporter-config - mountPath: /etc/statsd-exporter - volumes: - - name: ratelimit-config - configMap: - name: ratelimit-config - - name: statsd-exporter-config - configMap: - name: ratelimit-statsd-exporter-config -{{- end }} diff --git a/charts/kubezero-istio/templates/ratelimit/servicemonitor.yaml b/charts/kubezero-istio/templates/ratelimit/servicemonitor.yaml deleted file mode 100644 index 0c229371..00000000 --- a/charts/kubezero-istio/templates/ratelimit/servicemonitor.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{- if and .Values.istiod.telemetry.enabled .Values.rateLimiting.enabled }} -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: istio-rate-limiting - namespace: {{ .Release.Namespace }} - labels: - {{- include "kubezero-lib.labels" . | nindent 4 }} -spec: - jobLabel: istio - targetLabels: [app] - selector: - matchExpressions: - - {key: app, operator: In, values: [ratelimit]} - endpoints: - - port: http-monitoring -{{- end }} diff --git a/charts/kubezero-istio/templates/servicemonitor.yaml b/charts/kubezero-istio/templates/servicemonitor.yaml deleted file mode 100644 index ade8d157..00000000 --- a/charts/kubezero-istio/templates/servicemonitor.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{- if .Values.istiod.telemetry.enabled }} -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: istio-component-monitor - namespace: {{ .Release.Namespace }} - labels: - {{- include "kubezero-lib.labels" . | nindent 4 }} -spec: - jobLabel: istio - targetLabels: [app] - selector: - matchExpressions: - - {key: istio, operator: In, values: [pilot]} - endpoints: - - port: http-monitoring -{{- end }} diff --git a/charts/kubezero-istio/update.sh b/charts/kubezero-istio/update.sh deleted file mode 100755 index fb380f0c..00000000 --- a/charts/kubezero-istio/update.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -set -ex - -export ISTIO_VERSION=$(yq eval '.dependencies[] | select(.name=="base") | .version' Chart.yaml) -export KIALI_VERSION=$(yq eval '.dependencies[] | select(.name=="kiali-server") | .version' Chart.yaml) - -helm dep update - -# Get matching istioctl -# [ -x istioctl ] && [ "$(./istioctl version --remote=false)" == $ISTIO_VERSION ] || { curl -sL https://github.com/istio/istio/releases/download/${ISTIO_VERSION}/istioctl-${ISTIO_VERSION}-linux-amd64.tar.gz | tar xz; chmod +x istioctl; } - -# Fetch dashboards from Grafana.com and update ZDT CM -../kubezero-metrics/sync_grafana_dashboards.py dashboards.yaml templates/grafana-dashboards.yaml diff --git a/charts/kubezero-istio/values.yaml b/charts/kubezero-istio/values.yaml deleted file mode 100644 index bc0716fb..00000000 --- a/charts/kubezero-istio/values.yaml +++ /dev/null @@ -1,92 +0,0 @@ -global: - variant: distroless - - logAsJson: true - - defaultPodDisruptionBudget: - enabled: false - - priorityClassName: "system-cluster-critical" - -istiod: - pilot: - autoscaleEnabled: false - replicaCount: 1 - - nodeSelector: - node-role.kubernetes.io/control-plane: "" - tolerations: - - key: node-role.kubernetes.io/control-plane - effect: NoSchedule - - resources: - requests: - cpu: 100m - memory: 128Mi -# env: -# PILOT_ENABLE_MYSQL_FILTER: true -# PILOT_ENABLE_REDIS_FILTER: true -# PILOT_HTTP10: true - - telemetry: - enabled: false - - meshConfig: - accessLogFile: /dev/stdout - accessLogEncoding: 'JSON' - tcpKeepalive: - interval: 60s - time: 120s - -kiali-server: - enabled: false - - auth: - strategy: anonymous - - deployment: - ingress_enabled: false - view_only_mode: true - - server: - metrics_enabled: false - - external_services: - custom_dashboards: - enabled: false - - prometheus: - url: "http://metrics-kube-prometheus-st-prometheus.monitoring:9090" - - istio: - enabled: false - gateway: istio-ingress/private-ingressgateway - #url: "kiali.example.com" - - -rateLimiting: - enabled: false - - log: - level: warn - format: json - - # 1MB local cache for already reached limits to reduce calls to Redis - localCacheSize: 1048576 - - # Wether to block requests if ratelimiting is down - failureModeDeny: false - - # rate limit descriptors for each domain, examples 10 req/s per sourceIP - descriptors: - ingress: - - key: remote_address - rate_limit: - unit: second - requests_per_unit: 10 - - privateIngress: - - key: remote_address - rate_limit: - unit: second - requests_per_unit: 10 diff --git a/charts/kubezero-lib/.helmignore b/charts/kubezero-lib/.helmignore deleted file mode 100644 index 0e8a0eb3..00000000 --- a/charts/kubezero-lib/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/charts/kubezero-lib/Chart.yaml b/charts/kubezero-lib/Chart.yaml deleted file mode 100644 index dd0afd4d..00000000 --- a/charts/kubezero-lib/Chart.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v2 -name: kubezero-lib -description: KubeZero helm library - common helm functions and blocks -type: library -version: 0.1.6 -home: https://kubezero.com -icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png -keywords: - - kubezero -maintainers: - - name: Stefan Reimer - email: stefan@zero-downtime.net -kubeVersion: ">= 1.20.0" diff --git a/charts/kubezero-lib/README.md b/charts/kubezero-lib/README.md deleted file mode 100644 index 479c2594..00000000 --- a/charts/kubezero-lib/README.md +++ /dev/null @@ -1,11 +0,0 @@ -kubezero-lib -============ -KubeZero helm library - common helm functions and blocks - -Current chart version is `0.1.0` - -Source code can be found [here](https://kubezero.com) - - - - diff --git a/charts/kubezero-lib/templates/_helpers.tpl b/charts/kubezero-lib/templates/_helpers.tpl deleted file mode 100644 index 7aeae2b8..00000000 --- a/charts/kubezero-lib/templates/_helpers.tpl +++ /dev/null @@ -1,45 +0,0 @@ -{{- /* -Common naming functions -*/ -}} -{{- define "kubezero-lib.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{- define "kubezero-lib.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if .subchart }} -{{- $name = default .subchart .Values.nameOverride -}} -{{- end -}} -{{- if or (contains $name .Release.Name) (contains $name (printf "%s-%s" "kubezero" .Release.Name)) -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} -{{- end -}} - -{{- define "kubezero-lib.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Selector labels -*/}} -{{- define "kubezero-lib.selectorLabels" -}} -app.kubernetes.io/name: {{ include "kubezero-lib.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end -}} - -{{- /* -Common set of labels -*/ -}} -{{- define "kubezero-lib.labels" -}} -helm.sh/chart: {{ include "kubezero-lib.chart" . }} -{{ include "kubezero-lib.selectorLabels" . }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -app.kubernetes.io/part-of: kubezero -{{- end -}} - diff --git a/charts/kubezero-logging/.helmignore b/charts/kubezero-logging/.helmignore deleted file mode 100644 index 0e8a0eb3..00000000 --- a/charts/kubezero-logging/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/charts/kubezero-logging/Chart.yaml b/charts/kubezero-logging/Chart.yaml deleted file mode 100644 index f82e9577..00000000 --- a/charts/kubezero-logging/Chart.yaml +++ /dev/null @@ -1,32 +0,0 @@ -apiVersion: v2 -name: kubezero-logging -description: KubeZero Umbrella Chart for complete EFK stack -type: application -version: 0.8.6 -appVersion: 1.6.0 -home: https://kubezero.com -icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png -keywords: - - kubezero - - elasticsearch - - kibana - - fluentd - - fluent-bit -maintainers: - - name: Stefan Reimer - email: stefan@zero-downtime.net -dependencies: - - name: kubezero-lib - version: ">= 0.1.6" - repository: https://cdn.zero-downtime.net/charts/ - - name: eck-operator - version: 2.4.0 - # repository: https://helm.elastic.co - condition: eck-operator.enabled - - name: fluentd - version: 0.3.9 - condition: fluentd.enabled - - name: fluent-bit - version: 0.24.0 - condition: fluent-bit.enabled -kubeVersion: ">= 1.24.0" diff --git a/charts/kubezero-logging/README.md b/charts/kubezero-logging/README.md deleted file mode 100644 index 79697ca6..00000000 --- a/charts/kubezero-logging/README.md +++ /dev/null @@ -1,151 +0,0 @@ -# kubezero-logging - -![Version: 0.8.6](https://img.shields.io/badge/Version-0.8.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.0](https://img.shields.io/badge/AppVersion-1.6.0-informational?style=flat-square) - -KubeZero Umbrella Chart for complete EFK stack - -**Homepage:** - -## Maintainers - -| Name | Email | Url | -| ---- | ------ | --- | -| Stefan Reimer | | | - -## Requirements - -Kubernetes: `>= 1.24.0` - -| Repository | Name | Version | -|------------|------|---------| -| | eck-operator | 2.4.0 | -| | fluent-bit | 0.24.0 | -| | fluentd | 0.3.9 | -| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 | - -## Changes from upstream -### ECK -- Operator mapped to controller nodes - -### ES - -- SSL disabled ( Todo: provide cluster certs and setup Kibana/Fluentd to use https incl. client certs ) - -- Installed Plugins: - - repository-s3 - - elasticsearch-prometheus-exporter - -- [Cross AZ Zone awareness](https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-advanced-node-scheduling.html#k8s-availability-zone-awareness) is implemented via nodeSets - -### Kibana - -- increased timeout to ES to 3 minutes - -### FluentD - -### Fluent-bit -- support for dedot Lua filter to replace "." with "_" for all annotations and labels -- support for api audit log - -## Manual tasks ATM - -- install index template -- setup Kibana -- create `logstash-*` Index Pattern - -## Values - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| eck-operator.enabled | bool | `false` | | -| eck-operator.installCRDs | bool | `false` | | -| eck-operator.nodeSelector."node-role.kubernetes.io/control-plane" | string | `""` | | -| eck-operator.tolerations[0].effect | string | `"NoSchedule"` | | -| eck-operator.tolerations[0].key | string | `"node-role.kubernetes.io/control-plane"` | | -| elastic_password | string | `""` | | -| es.nodeSets | list | `[]` | | -| es.prometheus | bool | `false` | | -| es.s3Snapshot.enabled | bool | `false` | | -| es.s3Snapshot.iamrole | string | `""` | | -| fluent-bit.config.customParsers | string | `"[PARSER]\n Name cri-log\n Format regex\n Regex ^(?