License updates.

CONTRIBUTING.md

@@ -0,0 +1,9 @@
+## Contributor License Agreement (CLA)
+
+By submitting a pull request, patch, or other contribution to this project, you agree to the following terms:
+
+- You license your contribution under the GNU Affero General Public License v3 or (at your option) any later version.
+- You grant [CSTF](https://civilsociety.dev) and its maintainers the perpetual, non-exclusive right to:
+  - Use, copy, distribute, and modify your contributions as part of the project.
+  - Relicense your contributions under any FSF-approved free software license in the future.
+- You affirm that your contribution is your own original work and that you have the right to submit it.

LICENSE

@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ 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.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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 <https://www.gnu.org/licenses/>.
+
+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
+<https://www.gnu.org/licenses/>.

README.md

@@ -34,4 +34,6 @@ Contributions are welcome! Please feel free to submit a Pull Request.
 
 ## License
 
-TBD
+This project is licensed under the terms of the [GNU General Public License version 3](./LICENSE) or (at your option) any later version.
+
+⚠️ By contributing to this project, you agree to the Contributor License Agreement described in [CONTRIBUTING.md](./CONTRIBUTING.md).

apps/gitea/README.md

@@ -0,0 +1,85 @@
+# Gitea Configuration
+
+This Gitea deployment uses a hybrid configuration approach combining environment variables with Gitea's self-managed configuration file.
+
+## Configuration Architecture
+
+### Environment Variables (gitea.env)
+Non-secret configuration is stored in `gitea.env` and automatically loaded via kustomize's `configMapGenerator`. This includes:
+- Server settings (domain, URLs, ports)
+- Database connection details (except password)
+- SMTP settings (except password)
+- Service settings (registration, notifications)
+- Repository and storage paths
+
+### Kubernetes Secrets (gitea-secrets)
+Sensitive configuration is stored in the `gitea-secrets` secret and managed by the wild-cloud deployment system:
+- `adminPassword` - Gitea admin user password
+- `secretKey` - Application secret key
+- `jwtSecret` - JWT signing secret
+- `dbPassword` - Database password
+- `smtpPassword` - SMTP authentication password
+
+Secrets are defined in `secrets.yaml` and listed in `manifest.yaml` under `requiredSecrets`. The `wild-app-deploy` command automatically ensures all required secrets exist in the `gitea-secrets` secret before deployment.
+
+### Persistent Configuration (app.ini)
+Gitea manages its own `app.ini` file on persistent storage for:
+- Generated security tokens
+- Runtime configuration changes made via web UI
+- Database migration state
+- User-modified settings
+
+## How It Works
+
+1. **Startup**: Kustomize generates a ConfigMap from `gitea.env`
+2. **Environment Loading**: Pod loads non-secret config from ConfigMap via `envFrom`
+3. **Secret Loading**: Pod loads sensitive config from Kubernetes secrets via `env`
+4. **Configuration Merge**: Gitea's environment-to-ini process merges environment variables into `app.ini`
+5. **Persistence**: Gitea writes the merged configuration plus generated tokens to persistent storage
+
+## Making Configuration Changes
+
+### Non-Secret Settings
+1. Edit `gitea.env` with your changes
+2. Run `wild-app-deploy gitea` to apply changes
+3. Pod will restart and pick up new configuration
+
+### Secret Settings
+1. Edit `secrets.yaml` with your secret values
+2. Ensure the secret key is listed in `manifest.yaml` under `requiredSecrets`
+3. Run `wild-app-deploy gitea` - this will automatically update the `gitea-secrets` secret and restart the pod
+
+### Web UI Changes
+Configuration changes made through Gitea's admin web interface are automatically persisted to the `app.ini` file on persistent storage and will survive pod restarts.
+
+## Configuration Precedence
+
+1. **Kubernetes Secrets** (highest priority)
+2. **Environment Variables** (from gitea.env)
+3. **Persistent app.ini** (lowest priority)
+
+Environment variables override file settings, and secrets override everything.
+
+## Troubleshooting
+
+### Check Current Configuration
+```bash
+# View environment variables
+kubectl describe pod -n gitea -l app=gitea | grep -A 20 "Environment"
+
+# View current app.ini
+kubectl exec -it deployment/gitea -n gitea -- cat /data/gitea/conf/app.ini
+```
+
+### Configuration Not Applied
+- Verify the ConfigMap was generated: `kubectl get configmap -n gitea`
+- Check pod restart: `kubectl get pods -n gitea`
+- Review startup logs: `kubectl logs -n gitea -l app=gitea`
+
+
+## External Dependencies
+
+- **Database**: PostgreSQL instance in `postgres` namespace
+- **Storage**: Longhorn distributed storage
+- **Ingress**: Traefik with Let's Encrypt certificates
+- **DNS**: External-DNS with Cloudflare integration

apps/gitea/db-init-job.yaml

@@ -0,0 +1,51 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: gitea-db-init
+  labels:
+    component: db-init
+spec:
+  template:
+    metadata:
+      labels:
+        component: db-init
+    spec:
+      containers:
+        - name: db-init
+          image: {{ .apps.postgres.image }}
+          command: ["/bin/bash", "-c"]
+          args:
+            - |
+              PGPASSWORD=${POSTGRES_ADMIN_PASSWORD} psql -h ${DB_HOSTNAME} -U postgres <<EOF
+              DO \$\$
+              BEGIN
+                IF NOT EXISTS (SELECT FROM pg_catalog.pg_roles WHERE rolname = '${DB_USERNAME}') THEN
+                  CREATE USER ${DB_USERNAME} WITH ENCRYPTED PASSWORD '${DB_PASSWORD}';
+                ELSE
+                  ALTER USER ${DB_USERNAME} WITH ENCRYPTED PASSWORD '${DB_PASSWORD}';
+                END IF;
+              END
+              \$\$;
+
+              SELECT 'CREATE DATABASE ${DB_DATABASE_NAME}' WHERE NOT EXISTS (SELECT FROM pg_database WHERE datname = '${DB_DATABASE_NAME}')\gexec
+              ALTER DATABASE ${DB_DATABASE_NAME} OWNER TO ${DB_USERNAME};
+              GRANT ALL PRIVILEGES ON DATABASE ${DB_DATABASE_NAME} TO ${DB_USERNAME};
+              EOF
+          env:
+            - name: POSTGRES_ADMIN_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: postgres-secrets
+                  key: password
+            - name: DB_HOSTNAME
+              value: "{{ .apps.gitea.dbHost }}"
+            - name: DB_DATABASE_NAME
+              value: "{{ .apps.gitea.dbName }}"
+            - name: DB_USERNAME
+              value: "{{ .apps.gitea.dbUser }}"
+            - name: DB_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: gitea-secrets
+                  key: dbPassword
+      restartPolicy: OnFailure

apps/gitea/deployment.yaml

@@ -0,0 +1,92 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: gitea
+  namespace: gitea
+spec:
+  replicas: 1
+  strategy:
+    type: Recreate
+  selector:
+    matchLabels:
+      component: web
+  template:
+    metadata:
+      labels:
+        app: gitea
+        component: web
+        managedBy: kustomize
+        partOf: wild-cloud
+    spec:
+      securityContext:
+        fsGroup: 1000
+      terminationGracePeriodSeconds: 60
+      containers:
+        - name: gitea
+          image: "{{ .apps.gitea.image }}"
+          imagePullPolicy: IfNotPresent
+          envFrom:
+            - configMapRef:
+                name: gitea-env
+          env:
+            - name: GITEA_ADMIN_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: gitea-secrets
+                  key: adminPassword
+            - name: GITEA__security__SECRET_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: gitea-secrets
+                  key: secretKey
+            - name: GITEA__security__INTERNAL_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: gitea-secrets
+                  key: jwtSecret
+            - name: GITEA__database__PASSWD
+              valueFrom:
+                secretKeyRef:
+                  name: gitea-secrets
+                  key: dbPassword
+            - name: GITEA__mailer__PASSWD
+              valueFrom:
+                secretKeyRef:
+                  name: gitea-secrets
+                  key: smtpPassword
+          ports:
+            - name: ssh
+              containerPort: 2222
+            - name: http
+              containerPort: 3000
+          livenessProbe:
+            failureThreshold: 10
+            initialDelaySeconds: 200
+            periodSeconds: 10
+            successThreshold: 1
+            tcpSocket:
+              port: http
+            timeoutSeconds: 1
+          readinessProbe:
+            failureThreshold: 3
+            initialDelaySeconds: 5
+            periodSeconds: 10
+            successThreshold: 1
+            tcpSocket:
+              port: http
+            timeoutSeconds: 1
+          resources:
+            {}
+          securityContext:
+            {}
+          volumeMounts:
+            - name: temp
+              mountPath: /tmp
+            - name: data
+              mountPath: /data
+      volumes:
+        - name: temp
+          emptyDir: {}
+        - name: data
+          persistentVolumeClaim:
+            claimName: gitea-data

apps/gitea/gitea.env

@@ -0,0 +1,64 @@
+SSH_LISTEN_PORT=2222
+SSH_PORT=22
+GITEA_APP_INI=/data/gitea/conf/app.ini
+GITEA_CUSTOM=/data/gitea
+GITEA_WORK_DIR=/data
+GITEA_TEMP=/tmp/gitea
+TMPDIR=/tmp/gitea
+HOME=/data/gitea/git
+GITEA_ADMIN_USERNAME={{ .apps.gitea.adminUser }}
+GITEA_ADMIN_PASSWORD_MODE=keepUpdated
+
+# Core app settings
+APP_NAME={{ .apps.gitea.appName }}
+RUN_MODE={{ .apps.gitea.runMode }}  
+RUN_USER=git
+WORK_PATH=/data
+
+# Security settings
+GITEA__security__INSTALL_LOCK=true
+GITEA__security__PASSWORD_HASH_ALGO=pbkdf2
+
+# Database settings (except password which comes from secret)
+GITEA__database__DB_TYPE=postgres
+GITEA__database__HOST={{ .apps.gitea.dbHost }}:{{ .apps.gitea.dbPort }}
+GITEA__database__NAME={{ .apps.gitea.dbName }}
+GITEA__database__USER={{ .apps.gitea.dbUser }}
+GITEA__database__SSL_MODE=disable
+GITEA__database__LOG_SQL=false
+
+# Server settings
+GITEA__server__DOMAIN={{ .apps.gitea.domain }}
+GITEA__server__HTTP_PORT={{ .apps.gitea.port }}
+GITEA__server__ROOT_URL=https://{{ .apps.gitea.domain }}/
+GITEA__server__DISABLE_SSH=false
+GITEA__server__SSH_DOMAIN={{ .apps.gitea.domain }}
+GITEA__server__SSH_PORT={{ .apps.gitea.sshPort }}
+GITEA__server__SSH_LISTEN_PORT=2222
+GITEA__server__LFS_START_SERVER=true
+GITEA__server__OFFLINE_MODE=true
+
+# Service settings
+GITEA__service__REGISTER_EMAIL_CONFIRM=true
+GITEA__service__DISABLE_REGISTRATION=false
+GITEA__service__ALLOW_ONLY_EXTERNAL_REGISTRATION=false
+GITEA__service__ENABLE_NOTIFY_MAIL=true
+GITEA__service__ENABLE_BASIC_AUTHENTICATION=false
+GITEA__service__ENABLE_REVERSE_PROXY_AUTHENTICATION=false
+GITEA__service__ENABLE_CAPTCHA=false
+GITEA__service__REQUIRE_SIGNIN_VIEW=false
+GITEA__service__DEFAULT_KEEP_EMAIL_PRIVATE=false
+GITEA__service__DEFAULT_ALLOW_CREATE_ORGANIZATION=true
+GITEA__service__DEFAULT_ENABLE_TIMETRACKING=true
+GITEA__service__NO_REPLY_ADDRESS=noreply.localhost
+
+# Webhook settings
+GITEA__webhook__ALLOWED_HOST_LIST=*
+
+# Mailer settings (enabled via env vars, password from secret)
+GITEA__mailer__ENABLED=true
+GITEA__mailer__SMTP_ADDR={{ .apps.gitea.smtp.host }}
+GITEA__mailer__SMTP_PORT={{ .apps.gitea.smtp.port }}
+GITEA__mailer__FROM={{ .apps.gitea.smtp.from }}
+GITEA__mailer__USER={{ .apps.gitea.smtp.user }}
+

apps/gitea/ingress.yaml

@@ -0,0 +1,25 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: gitea-public
+  namespace: gitea
+  annotations:
+    external-dns.alpha.kubernetes.io/cloudflare-proxied: "false"
+    external-dns.alpha.kubernetes.io/target: "{{ .apps.gitea.domain }}"
+    external-dns.alpha.kubernetes.io/target: "{{ .cluster.externalDns.target}}"
+spec:
+  rules:
+    - host: "{{ .apps.gitea.domain }}"
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: gitea-http
+                port:
+                  number: 3000
+  tls:
+    - secretName: "{{ .apps.gitea.tlsSecretName }}"
+      hosts:
+        - "{{ .apps.gitea.domain }}"

apps/gitea/kustomization.yaml

@@ -0,0 +1,20 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: gitea
+labels:
+  - includeSelectors: true
+    pairs:
+      app: gitea
+      managedBy: kustomize
+      partOf: wild-cloud
+resources:
+  - namespace.yaml
+  - deployment.yaml
+  - service.yaml
+  - ingress.yaml
+  - pvc.yaml
+  - db-init-job.yaml
+configMapGenerator:
+  - name: gitea-env
+    envs:
+      - gitea.env

apps/gitea/manifest.yaml

@@ -0,0 +1,33 @@
+name: gitea
+description: Gitea is a painless self-hosted Git service written in Go
+version: 1.24.3
+icon: https://github.com/go-gitea/gitea/raw/main/assets/logo.png
+requires:
+  - name: postgres
+defaultConfig:
+  image: gitea/gitea:1.24.3
+  appName: Gitea
+  domain: gitea.{{ .cloud.domain }}
+  tlsSecretName: wildcard-wild-cloud-tls
+  port: 3000
+  sshPort: 22
+  storage: 10Gi
+  dbName: gitea
+  dbUser: gitea
+  dbHost: postgres.postgres.svc.cluster.local
+  adminUser: admin
+  adminEmail: "admin@{{ .cloud.domain }}"
+  dbPort: 5432
+  timezone: UTC
+  runMode: prod
+  smtp:
+    host: TBD
+    port: 465
+    from: no-reply@{{ .cloud.domain }}
+    user: TBD
+requiredSecrets:
+  - apps.gitea.adminPassword
+  - apps.gitea.dbPassword
+  - apps.gitea.secretKey
+  - apps.gitea.jwtSecret
+  - apps.gitea.smtpPassword

apps/gitea/namespace.yaml

@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: gitea

apps/gitea/pvc.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: gitea-data
+  namespace: gitea
+spec:
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: longhorn
+  resources:
+    requests:
+      storage: "{{ .apps.gitea.storage }}"

apps/gitea/service.yaml

@@ -0,0 +1,28 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: gitea-http
+  namespace: gitea
+spec:
+  type: ClusterIP
+  ports:
+  - name: http
+    port: 3000
+    targetPort: {{ .apps.gitea.port }}
+  selector:
+    component: web
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: gitea-ssh
+  namespace: gitea
+spec:
+  type: LoadBalancer
+  ports:
+  - name: ssh
+    port: {{ .apps.gitea.sshPort }}
+    targetPort: 2222
+    protocol: TCP
+  selector:
+    component: web

bin/wild-app-add

@@ -193,10 +193,9 @@ if yq eval '.requiredSecrets' "${DEST_APP_DIR}/manifest.yaml" | grep -q -v '^nul
         current_value=$(yq eval ".${secret_path} // \"null\"" "${SECRETS_FILE}")
         
         if [ "${current_value}" = "null" ]; then
-            echo "Adding dummy secret: ${secret_path}"
+            echo "Adding random secret: ${secret_path}"
-            # Extract just the key name for the dummy value
+            random_secret=$(tr -dc 'a-zA-Z0-9' < /dev/urandom | head -c 6)
-            secret_key=$(basename "${secret_path}")
+            yq eval ".${secret_path} = \"${random_secret}\"" -i "${SECRETS_FILE}"
-            yq eval ".${secret_path} = \"CHANGE_ME_${secret_key^^}\"" -i "${SECRETS_FILE}"
         fi
     done
     

bin/wild-cluster-config-generate

@@ -60,15 +60,16 @@ print_header "Talos Cluster Configuration Generation"
 
 # Ensure required directories exist
 NODE_SETUP_DIR="${WC_HOME}/setup/cluster-nodes"
-mkdir -p "${NODE_SETUP_DIR}/generated"
 
-# Generate cluster secrets
+# Check if generated directory already exists and has content
-
+if [ -d "${NODE_SETUP_DIR}/generated" ] && [ "$(ls -A "${NODE_SETUP_DIR}/generated" 2>/dev/null)" ] && [ "$FORCE" = false ]; then
-if [ -f "${NODE_SETUP_DIR}/generated/secrets.yaml" ] && [ "$FORCE" = false ]; then
+    print_success "Cluster configuration already exists in ${NODE_SETUP_DIR}/generated/"
-    print_success "Cluster secrets already exists in ${NODE_SETUP_DIR}/generated/"
+    print_info "Skipping cluster configuration generation"
     exit 0
 fi
 
+mkdir -p "${NODE_SETUP_DIR}/generated"
+
 # Prepare directory for generated secrets
 print_info "Generating new cluster secrets..."
 if [ -d "${NODE_SETUP_DIR}/generated" ]; then

bin/wild-cluster-node-ip

@@ -0,0 +1,180 @@
+#!/bin/bash
+
+set -e
+set -o pipefail
+
+# Usage function
+usage() {
+    echo "Usage: wild-cluster-node-ip <node-name> [options]"
+    echo ""
+    echo "Get the current IP address of a cluster node by name."
+    echo ""
+    echo "Arguments:"
+    echo "  node-name           Name of the node to get IP for"
+    echo ""
+    echo "Options:"
+    echo "  --from-config       Get IP from local config.yaml"
+    echo "  --from-talosctl     Get IP from Talos API"
+    echo "                      Default: Query Kubernetes API (kubectl)"
+    echo "  -h, --help          Show this help message"
+    echo ""
+    echo "Examples:"
+    echo "  wild-cluster-node-ip control-1"
+    echo "  wild-cluster-node-ip worker-1"
+    echo "  wild-cluster-node-ip control-2 --from-config"
+    echo "  wild-cluster-node-ip worker-2 --from-talosctl"
+    echo ""
+    echo "This script will:"
+    echo "  - Query the specified source for the node's IP address"
+    echo "  - Return only the internal IP address or exit with error if not found"
+    echo ""
+    echo "Requirements:"
+    echo "  - Must be run from a Wild Cloud directory"
+    echo "  - kubectl and/or talosctl must be configured for cluster access"
+}
+
+# Parse arguments
+NODE_NAME=""
+SOURCE="kubectl"
+
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        --from-config)
+            SOURCE="config"
+            shift
+            ;;
+        --from-talosctl)
+            SOURCE="talosctl"
+            shift
+            ;;
+        -h|--help)
+            usage
+            exit 0
+            ;;
+        -*)
+            echo "Unknown option $1"
+            usage
+            exit 1
+            ;;
+        *)
+            if [ -z "$NODE_NAME" ]; then
+                NODE_NAME="$1"
+            else
+                echo "Unexpected argument: $1"
+                usage
+                exit 1
+            fi
+            shift
+            ;;
+    esac
+done
+
+# Check if node name was provided
+if [ -z "$NODE_NAME" ]; then
+    echo "Error: Node name is required"
+    usage
+    exit 1
+fi
+
+# Initialize Wild Cloud environment
+if [ -z "${WC_ROOT}" ]; then
+    echo "Error: WC_ROOT is not set" >&2
+    exit 1
+else
+    source "${WC_ROOT}/scripts/common.sh"
+    init_wild_env
+fi
+
+# Function to get IP from config.yaml
+get_ip_from_config() {
+    local node_name="$1"
+    local ip
+    
+    ip=$(yq eval ".cluster.nodes.active.\"${node_name}\".currentIp" "${WC_HOME}/config.yaml" 2>/dev/null || echo "")
+    
+    if [ -n "$ip" ] && [ "$ip" != "null" ]; then
+        echo "$ip"
+        return 0
+    else
+        return 1
+    fi
+}
+
+# Function to get IP from kubectl
+get_ip_from_kubectl() {
+    local node_name="$1"
+    local ip
+    
+    # Check if kubectl is available and configured
+    if ! command -v kubectl >/dev/null 2>&1; then
+        return 1
+    fi
+    
+    # Try to get node info from kubectl
+    if ! kubectl get nodes "$node_name" >/dev/null 2>&1; then
+        return 1
+    fi
+    
+    # Get internal IP address
+    ip=$(kubectl get node "$node_name" -o jsonpath='{.status.addresses[?(@.type=="InternalIP")].address}' 2>/dev/null || echo "")
+    
+    if [ -n "$ip" ]; then
+        echo "$ip"
+        return 0
+    else
+        return 1
+    fi
+}
+
+# Function to get IP from talosctl
+get_ip_from_talosctl() {
+    local node_name="$1"
+    local ip
+    
+    # Check if talosctl is available and configured
+    if ! command -v talosctl >/dev/null 2>&1; then
+        return 1
+    fi
+    
+    # Try to get node info from talosctl
+    if talosctl get members >/dev/null 2>&1; then
+        # Find the specific node and get its first IP address
+        ip=$(talosctl get members -o json 2>/dev/null | jq -r --arg hostname "$node_name" 'select(.spec.hostname == $hostname) | .spec.addresses[0]' 2>/dev/null | grep -v "null" | head -n1 || echo "")
+        
+        if [ -n "$ip" ]; then
+            echo "$ip"
+            return 0
+        fi
+    fi
+    
+    return 1
+}
+
+
+# Main logic
+case $SOURCE in
+    config)
+        if ip=$(get_ip_from_config "$NODE_NAME"); then
+            echo "$ip"
+        else
+            echo "Error: Node $NODE_NAME not found in config.yaml or no currentIp set" >&2
+            exit 1
+        fi
+        ;;
+    kubectl)
+        if ip=$(get_ip_from_kubectl "$NODE_NAME"); then
+            echo "$ip"
+        else
+            echo "Error: Could not get IP for node $NODE_NAME via kubectl" >&2
+            exit 1
+        fi
+        ;;
+    talosctl)
+        if ip=$(get_ip_from_talosctl "$NODE_NAME"); then
+            echo "$ip"
+        else
+            echo "Error: Could not get IP for node $NODE_NAME via talosctl" >&2
+            exit 1
+        fi
+        ;;
+esac

bin/wild-cluster-node-patch-generate

@@ -5,19 +5,19 @@ set -o pipefail
 
 # Usage function
 usage() {
-    echo "Usage: wild-cluster-node-patch-generate <node-ip>"
+    echo "Usage: wild-cluster-node-patch-generate <node-name>"
     echo ""
     echo "Generate Talos machine configuration patches for a specific registered node."
     echo ""
     echo "Arguments:"
-    echo "  node-ip             IP address of the registered node"
+    echo "  node-name           Name of the registered node"
     echo ""
     echo "Options:"
     echo "  -h, --help          Show this help message"
     echo ""
     echo "Examples:"
-    echo "  wild-cluster-node-patch-generate 192.168.1.91"
+    echo "  wild-cluster-node-patch-generate control-1"
-    echo "  wild-cluster-node-patch-generate 192.168.1.100"
+    echo "  wild-cluster-node-patch-generate worker-1"
     echo ""
     echo "This script will:"
     echo "  - Compile patch templates for the specified node"
@@ -32,7 +32,7 @@ usage() {
 }
 
 # Parse arguments
-NODE_IP=""
+NODE_NAME=""
 while [[ $# -gt 0 ]]; do
     case $1 in
         -h|--help)
@@ -45,8 +45,8 @@ while [[ $# -gt 0 ]]; do
             exit 1
             ;;
         *)
-            if [ -z "$NODE_IP" ]; then
+            if [ -z "$NODE_NAME" ]; then
-                NODE_IP="$1"
+                NODE_NAME="$1"
             else
                 echo "Unexpected argument: $1"
                 usage
@@ -57,9 +57,9 @@ while [[ $# -gt 0 ]]; do
     esac
 done
 
-# Check if node IP was provided
+# Check if node name was provided
-if [ -z "$NODE_IP" ]; then
+if [ -z "$NODE_NAME" ]; then
-    echo "Error: Node IP address is required"
+    echo "Error: Node name is required"
     usage
     exit 1
 fi
@@ -104,38 +104,46 @@ fi
 # Get cluster configuration from config.yaml
 CLUSTER_NAME=$(wild-config cluster.name)
 
-print_info "Generating patch for node: $NODE_IP"
+print_info "Generating patch for node: $NODE_NAME"
 print_info "Cluster: $CLUSTER_NAME"
 
 # Check if the specified node is registered
-NODE_INTERFACE=$(yq eval ".cluster.nodes.active.\"${NODE_IP}\".interface" "${WC_HOME}/config.yaml" 2>/dev/null)
+NODE_INTERFACE=$(yq eval ".cluster.nodes.active.\"${NODE_NAME}\".interface" "${WC_HOME}/config.yaml" 2>/dev/null)
-NODE_DISK=$(yq eval ".cluster.nodes.active.\"${NODE_IP}\".disk" "${WC_HOME}/config.yaml" 2>/dev/null)
+NODE_DISK=$(yq eval ".cluster.nodes.active.\"${NODE_NAME}\".disk" "${WC_HOME}/config.yaml" 2>/dev/null)
-IS_CONTROL=$(yq eval ".cluster.nodes.active.\"${NODE_IP}\".control" "${WC_HOME}/config.yaml" 2>/dev/null)
+NODE_ROLE=$(yq eval ".cluster.nodes.active.\"${NODE_NAME}\".role" "${WC_HOME}/config.yaml" 2>/dev/null)
+NODE_CURRENT_IP=$(yq eval ".cluster.nodes.active.\"${NODE_NAME}\".currentIp" "${WC_HOME}/config.yaml" 2>/dev/null)
 
 if [ -z "$NODE_INTERFACE" ] || [ "$NODE_INTERFACE" = "null" ]; then
-    print_error "Node $NODE_IP is not registered in config.yaml"
+    print_error "Node $NODE_NAME is not registered in config.yaml"
-    print_info "Please register the node first by running node hardware detection:"
+    print_info "Please register the node first by running node hardware detection"
-    print_info "  wild-node-detect $NODE_IP"
+    print_info "Or run 'wild-setup-cluster' to register nodes interactively"
-    print_info "Or run 'wild-setup' to register nodes interactively"
+    exit 1
+fi
+
+# Get current IP for the node
+if [ -z "$NODE_CURRENT_IP" ] || [ "$NODE_CURRENT_IP" = "null" ]; then
+    print_error "Node $NODE_NAME has no current IP address set"
     exit 1
 fi
 
 # Determine node type
-if [ "$IS_CONTROL" = "true" ]; then
+if [ "$NODE_ROLE" = "controlplane" ]; then
     NODE_TYPE="control"
-    print_success "Registered control plane node: $NODE_IP"
+    print_success "Registered control plane node: $NODE_NAME"
 else
     NODE_TYPE="worker" 
-    print_success "Registered worker node: $NODE_IP"
+    print_success "Registered worker node: $NODE_NAME"
 fi
 
 print_info "Node details:"
+print_info "  - Name: $NODE_NAME"
+print_info "  - Current IP: $NODE_CURRENT_IP"
 print_info "  - Interface: $NODE_INTERFACE"
 print_info "  - Disk: $NODE_DISK"
 print_info "  - Type: $NODE_TYPE"
 
 # Compile patch template for the specified node
-print_info "Compiling patch template for $NODE_TYPE node $NODE_IP..."
+print_info "Compiling patch template for $NODE_TYPE node $NODE_NAME..."
 
 if [ "$NODE_TYPE" = "control" ]; then
     TEMPLATE_FILE="${TEMPLATE_SOURCE_DIR}/patch.templates/controlplane.yaml"
@@ -143,12 +151,12 @@ else
     TEMPLATE_FILE="${TEMPLATE_SOURCE_DIR}/patch.templates/worker.yaml" 
 fi
 
-# Use IP as the patch name
+# Use node name as the patch name
-PATCH_FILE="${NODE_SETUP_DIR}/patch/${NODE_IP}.yaml"
+PATCH_FILE="${NODE_SETUP_DIR}/patch/${NODE_NAME}.yaml"
 
-# Create a temporary template with the node IP for gomplate processing
+# Create a temporary template with the node name and IP for gomplate processing
-TEMP_TEMPLATE="/tmp/${NODE_IP//\//_}-$(date +%s).yaml"
+TEMP_TEMPLATE="/tmp/${NODE_NAME//\//_}-$(date +%s).yaml"
-sed "s/{{NODE_IP}}/${NODE_IP}/g" "$TEMPLATE_FILE" > "$TEMP_TEMPLATE"
+sed -e "s/{{NODE_NAME}}/${NODE_NAME}/g" -e "s/{{NODE_IP}}/${NODE_CURRENT_IP}/g" "$TEMPLATE_FILE" > "$TEMP_TEMPLATE"
 cat "$TEMP_TEMPLATE" | wild-compile-template > "$PATCH_FILE"
 rm -f "$TEMP_TEMPLATE"
 

bin/wild-cluster-node-up

@@ -5,24 +5,25 @@ set -o pipefail
 
 # Usage function
 usage() {
-    echo "Usage: wild-cluster-node-up <node-ip> [options]"
+    echo "Usage: wild-cluster-node-up <node-name> [options]"
     echo ""
     echo "Apply Talos machine configuration to a registered node."
     echo ""
     echo "Arguments:"
-    echo "  node-ip             IP address of the registered node"
+    echo "  node-name           Name of the registered node"
     echo ""
     echo "Options:"
     echo "  -i, --insecure      Apply configuration in insecure mode (for maintenance mode nodes)"
-    echo "  --skip-patch        Skip automatic patch generation and use existing final config"
+    echo "  --force             Force regeneration of final config even if it exists"
     echo "  --dry-run           Show the command that would be executed without running it"
     echo "  -h, --help          Show this help message"
     echo ""
     echo "Examples:"
-    echo "  wild-cluster-node-up 192.168.1.91"
+    echo "  wild-cluster-node-up control-1"
-    echo "  wild-cluster-node-up 192.168.1.100 --insecure"
+    echo "  wild-cluster-node-up worker-1 --insecure"
-    echo "  wild-cluster-node-up 192.168.1.100 --skip-patch"
+    echo "  wild-cluster-node-up worker-2 --skip-patch"
-    echo "  wild-cluster-node-up 192.168.1.100 --dry-run"
+    echo "  wild-cluster-node-up control-2 --force"
+    echo "  wild-cluster-node-up control-1 --dry-run"
     echo ""
     echo "This script will:"
     echo "  - Verify the node is registered in config.yaml"
@@ -37,10 +38,11 @@ usage() {
 }
 
 # Parse arguments
-NODE_IP=""
+NODE_NAME=""
 INSECURE_MODE=false
 DRY_RUN=false
 SKIP_PATCH=false
+FORCE_REGENERATE=false
 
 while [[ $# -gt 0 ]]; do
     case $1 in
@@ -48,8 +50,8 @@ while [[ $# -gt 0 ]]; do
             INSECURE_MODE=true
             shift
             ;;
-        --skip-patch)
+        --force)
-            SKIP_PATCH=true
+            FORCE_REGENERATE=true
             shift
             ;;
         --dry-run)
@@ -66,8 +68,8 @@ while [[ $# -gt 0 ]]; do
             exit 1
             ;;
         *)
-            if [ -z "$NODE_IP" ]; then
+            if [ -z "$NODE_NAME" ]; then
-                NODE_IP="$1"
+                NODE_NAME="$1"
             else
                 echo "Unexpected argument: $1"
                 usage
@@ -78,9 +80,9 @@ while [[ $# -gt 0 ]]; do
     esac
 done
 
-# Check if node IP was provided
+# Check if node name was provided
-if [ -z "$NODE_IP" ]; then
+if [ -z "$NODE_NAME" ]; then
-    echo "Error: Node IP address is required"
+    echo "Error: Node name is required"
     usage
     exit 1
 fi
@@ -94,31 +96,30 @@ else
     init_wild_env
 fi
 
-# Check required configuration  
-if [ -z "$(get_current_config "cluster.name")" ]; then
-    print_error "Basic cluster configuration is missing"
-    print_info "Run 'wild-setup' or 'wild-init' first to configure your cluster"
-    exit 1
-fi
-
 print_header "Talos Node Configuration Application"
 
 # Check if the specified node is registered
-NODE_INTERFACE=$(yq eval ".cluster.nodes.active.\"${NODE_IP}\".interface" "${WC_HOME}/config.yaml" 2>/dev/null)
+NODE_INTERFACE=$(yq eval ".cluster.nodes.active.\"${NODE_NAME}\".interface" "${WC_HOME}/config.yaml" 2>/dev/null)
-NODE_DISK=$(yq eval ".cluster.nodes.active.\"${NODE_IP}\".disk" "${WC_HOME}/config.yaml" 2>/dev/null)
+NODE_DISK=$(yq eval ".cluster.nodes.active.\"${NODE_NAME}\".disk" "${WC_HOME}/config.yaml" 2>/dev/null)
-IS_CONTROL=$(yq eval ".cluster.nodes.active.\"${NODE_IP}\".control" "${WC_HOME}/config.yaml" 2>/dev/null)
+NODE_ROLE=$(yq eval ".cluster.nodes.active.\"${NODE_NAME}\".role" "${WC_HOME}/config.yaml" 2>/dev/null)
-MAINTENANCE_IP=$(yq eval ".cluster.nodes.active.\"${NODE_IP}\".maintenanceIp" "${WC_HOME}/config.yaml" 2>/dev/null)
+NODE_CURRENT_IP=$(yq eval ".cluster.nodes.active.\"${NODE_NAME}\".currentIp" "${WC_HOME}/config.yaml" 2>/dev/null)
+MAINTENANCE_IP=$(yq eval ".cluster.nodes.active.\"${NODE_NAME}\".maintenanceIp" "${WC_HOME}/config.yaml" 2>/dev/null)
 
 if [ -z "$NODE_INTERFACE" ] || [ "$NODE_INTERFACE" = "null" ]; then
-    print_error "Node $NODE_IP is not registered in config.yaml"
+    print_error "Node $NODE_NAME is not registered in config.yaml"
     print_info "Please register the node first by running:"
-    print_info "  wild-node-detect $NODE_IP"
+    print_info "Or run 'wild-setup-cluster' to register nodes interactively"
-    print_info "Or run 'wild-setup' to register nodes interactively"
+    exit 1
+fi
+
+# Get current IP for the node
+if [ -z "$NODE_CURRENT_IP" ] || [ "$NODE_CURRENT_IP" = "null" ]; then
+    print_error "Node $NODE_NAME has no current IP address set"
     exit 1
 fi
 
 # Determine node type
-if [ "$IS_CONTROL" = "true" ]; then
+if [ "$NODE_ROLE" = "controlplane" ]; then
     NODE_TYPE="control plane"
 else
     NODE_TYPE="worker"
@@ -127,18 +128,20 @@ fi
 # Determine the target IP for applying configuration
 if [ -n "$MAINTENANCE_IP" ] && [ "$MAINTENANCE_IP" != "null" ]; then
     TARGET_IP="$MAINTENANCE_IP"
-    print_info "Applying configuration to $NODE_TYPE node: $NODE_IP (via maintenance IP: $MAINTENANCE_IP)"
+    print_info "Applying configuration to $NODE_TYPE node: $NODE_NAME ($NODE_CURRENT_IP) via maintenance IP: $MAINTENANCE_IP"
     # Auto-enable insecure mode when using maintenance IP (unless explicitly overridden)
     if [ "$INSECURE_MODE" = false ]; then
         INSECURE_MODE=true
         print_info "Auto-enabling insecure mode for maintenance IP"
     fi
 else
-    TARGET_IP="$NODE_IP"
+    TARGET_IP="$NODE_CURRENT_IP"
-    print_info "Applying configuration to $NODE_TYPE node: $NODE_IP"
+    print_info "Applying configuration to $NODE_TYPE node: $NODE_NAME ($NODE_CURRENT_IP)"
 fi
 
 print_info "Node details:"
+print_info "  - Name: $NODE_NAME"
+print_info "  - Current IP: $NODE_CURRENT_IP"
 print_info "  - Interface: $NODE_INTERFACE"
 print_info "  - Disk: $NODE_DISK"
 print_info "  - Type: $NODE_TYPE"
@@ -148,42 +151,40 @@ fi
 
 # Check if machine config exists, generate if needed
 NODE_SETUP_DIR="${WC_HOME}/setup/cluster-nodes"
-CONFIG_FILE="${NODE_SETUP_DIR}/final/${NODE_IP}.yaml"
+CONFIG_FILE="${NODE_SETUP_DIR}/final/${NODE_NAME}.yaml"
-PATCH_FILE="${NODE_SETUP_DIR}/patch/${NODE_IP}.yaml"
+PATCH_FILE="${NODE_SETUP_DIR}/patch/${NODE_NAME}.yaml"
 
-if [ ! -f "$CONFIG_FILE" ]; then
+# Check if patch file exists
-    if [ "$SKIP_PATCH" = true ]; then
+if [ ! -f "$PATCH_FILE" ]; then
-        print_error "Machine configuration not found: $CONFIG_FILE"
+    print_error "Patch file not found: $PATCH_FILE"
-        print_info "--skip-patch was specified but no existing config found"
+    print_info "Generate the patch file first:"
-        print_info "Either generate the configuration first or remove --skip-patch:"
+    print_info "  wild-cluster-node-patch-generate $NODE_NAME"
-        print_info "  wild-cluster-node-machine-config-generate $NODE_IP"
+    exit 1
-        exit 1
+fi
-    fi
 
-    print_info "Machine configuration not found: $CONFIG_FILE"
+# Determine base config file
-    print_info "Generating final machine configuration..."
+if [ "$NODE_ROLE" = "controlplane" ]; then
+    BASE_CONFIG="${NODE_SETUP_DIR}/generated/controlplane.yaml"
+else
+    BASE_CONFIG="${NODE_SETUP_DIR}/generated/worker.yaml"
+fi
 
-    # Check if patch file exists
+# Check if base config exists
-    if [ ! -f "$PATCH_FILE" ]; then
+if [ ! -f "$BASE_CONFIG" ]; then
-        print_error "Patch file not found: $PATCH_FILE"
+    print_error "Base configuration not found: $BASE_CONFIG"
-        print_info "Generate the patch file first:"
+    print_info "Generate base cluster configuration first:"
-        print_info "  wild-cluster-node-patch-generate $NODE_IP"
+    print_info "  wild-cluster-config-generate"
-        exit 1
+    exit 1
-    fi
+fi
 
-    # Determine base config file
+# Check if we should skip regeneration
-    if [ "$IS_CONTROL" = "true" ]; then
+if [ ! -f "$CONFIG_FILE" ] || [ "$FORCE_REGENERATE" = true ]; then
-        BASE_CONFIG="${NODE_SETUP_DIR}/generated/controlplane.yaml"
+    # Need to generate/regenerate the final config
+    if [ "$FORCE_REGENERATE" = true ]; then
+        print_info "Force regeneration requested: regenerating machine configuration..."
     else
-        BASE_CONFIG="${NODE_SETUP_DIR}/generated/worker.yaml"
+        print_info "Machine configuration not found: $CONFIG_FILE"
-    fi
+        print_info "Generating final machine configuration..."
-    
-    # Check if base config exists
-    if [ ! -f "$BASE_CONFIG" ]; then
-        print_error "Base configuration not found: $BASE_CONFIG"
-        print_info "Generate base cluster configuration first:"
-        print_info "  wild-cluster-config-generate"
-        exit 1
     fi
         
     # Create final config directory if it doesn't exist
@@ -195,9 +196,6 @@ if [ ! -f "$CONFIG_FILE" ]; then
     print_success "Generated machine configuration: $CONFIG_FILE"
 else
     print_success "Found existing machine configuration: $CONFIG_FILE"
-    if [ "$SKIP_PATCH" = true ]; then
-        print_info "--skip-patch specified: using existing configuration without regeneration"
-    fi
 fi
 
 # Build talosctl command
@@ -230,15 +228,15 @@ if eval "$TALOSCTL_CMD"; then
     
     # Update talosctl context to this node
     print_info "Updating talosctl context..."
-    talosctl config node "$NODE_IP"
+    talosctl config node "$NODE_CURRENT_IP"
-    print_success "Updated talosctl context to node $NODE_IP"
+    print_success "Updated talosctl context to node $NODE_NAME ($NODE_CURRENT_IP)"
     echo ""
     
-    if [ "$IS_CONTROL" = "true" ]; then
+    if [ "$NODE_ROLE" = "controlplane" ]; then
         print_info "Next steps for control plane node:"
         echo "  1. Wait for the node to reboot and come up with the new configuration"
         echo "  2. If this is your first control plane node, bootstrap it:"
-        echo "     talosctl bootstrap --nodes $NODE_IP"
+        echo "     talosctl bootstrap --nodes $NODE_CURRENT_IP"
         echo "  3. Get kubeconfig when cluster is ready:"
         echo "     talosctl kubeconfig"
     else
@@ -251,8 +249,8 @@ if eval "$TALOSCTL_CMD"; then
     
     echo ""
     print_info "Monitor node status with:"
-    echo "  talosctl --nodes $NODE_IP dmesg"
+    echo "  talosctl --nodes $NODE_CURRENT_IP dmesg"
-    echo "  talosctl --nodes $NODE_IP get members"
+    echo "  talosctl --nodes $NODE_CURRENT_IP get members"
     
 else
     print_error "Failed to apply machine configuration"
@@ -261,7 +259,7 @@ else
     if [ -n "$MAINTENANCE_IP" ] && [ "$MAINTENANCE_IP" != "null" ]; then
         echo "  - Ensure the node is accessible at maintenance IP $MAINTENANCE_IP"
     else
-        echo "  - Ensure the node is accessible at $NODE_IP"
+        echo "  - Ensure the node is accessible at $NODE_CURRENT_IP"
     fi
     echo "  - For nodes in maintenance mode, use --insecure flag"
     echo "  - Check network connectivity and firewall settings"

bin/wild-config-set

@@ -19,6 +19,7 @@ usage() {
 }
 
 # Parse arguments
+VALUE_PROVIDED=false
 while [[ $# -gt 0 ]]; do
     case $1 in
         -h|--help)
@@ -33,8 +34,9 @@ while [[ $# -gt 0 ]]; do
         *)
             if [ -z "${KEY_PATH}" ]; then
                 KEY_PATH="$1"
-            elif [ -z "${VALUE}" ]; then
+            elif [ "$VALUE_PROVIDED" = false ]; then
                 VALUE="$1"
+                VALUE_PROVIDED=true
             else
                 echo "Too many arguments"
                 usage
@@ -51,7 +53,8 @@ if [ -z "${KEY_PATH}" ]; then
     exit 1
 fi
 
-if [ -z "${VALUE}" ]; then
+# Check if VALUE was provided (even if empty)
+if [ "$VALUE_PROVIDED" = false ]; then
     echo "Error: Value is required"
     usage
     exit 1

bin/wild-setup-cluster

@@ -7,7 +7,6 @@ set -o pipefail
 
 SKIP_INSTALLER=false
 SKIP_HARDWARE=false
-SKIP_CONFIGS=false
 
 while [[ $# -gt 0 ]]; do
     case $1 in
@@ -19,10 +18,6 @@ while [[ $# -gt 0 ]]; do
             SKIP_HARDWARE=true
             shift
             ;;
-        --skip-configs)
-            SKIP_CONFIGS=true
-            shift
-            ;;
         -h|--help)
             echo "Usage: $0 [phase-options]"
             echo ""
@@ -72,16 +67,20 @@ echo ""
 
 # Generate initial cluster configuration
 
-wild-cluster-config-generate
+if ! wild-cluster-config-generate; then
+    print_error "Failed to generate cluster configuration"
+    exit 1
+fi
 
 # Configure Talos cli with our new cluster context
 
-HAS_CONTEXT=$(talos config get | grep -c "<cluster.name>")
+CLUSTER_NAME=$(wild-config "cluster.name")
+HAS_CONTEXT=$(talosctl config contexts | grep -c "$CLUSTER_NAME" || true)
 if [ "$HAS_CONTEXT" -eq 0 ]; then
-    print_info "No Talos context found for cluster <cluster.name>, creating..."
+    print_info "No Talos context found for cluster $CLUSTER_NAME, creating..."
-    talos config merge ${WC_HOME}/setup/cluster-nodes/generated/talosconfig
+    talosctl config merge ${WC_HOME}/setup/cluster-nodes/generated/talosconfig
-    talos config use <cluster.name>
+    talosctl config use "$CLUSTER_NAME"
-    print_success "Talos context for <cluster.name> created and set as current"
+    print_success "Talos context for $CLUSTER_NAME created and set as current"
 fi
 
 # Talos asset download
@@ -102,7 +101,11 @@ fi
 # Configuration
 # =============================================================================
 
-prompt_if_unset_config "owner.email" "Owner email address"
+prompt_if_unset_config "operator.email" "Operator email address"
+
+# Configure hostname prefix for unique node names on LAN
+prompt_if_unset_config "cluster.hostnamePrefix" "Hostname prefix (optional, e.g. 'test-' for unique names on LAN)" ""
+HOSTNAME_PREFIX=$(wild-config "cluster.hostnamePrefix")
 
 # Configure network settings
 CURRENT_IP=$(ip route get 8.8.8.8 | awk '{print $7; exit}' 2>/dev/null || echo "192.168.1.100")
@@ -177,33 +180,36 @@ if [ "${SKIP_HARDWARE}" = false ]; then
     # Detect and register control plane nodes
     print_header "Control Plane Node Registration"
     
-    # Process each control plane node IP
+    # Process each control plane node
     for i in 1 2 3; do
+        NODE_NAME="${HOSTNAME_PREFIX}control-${i}"
         TARGET_IP="${vip_prefix}.$(( vip_last_octet + i ))"
         echo ""
-        print_info "Registering control plane node: $TARGET_IP"
+        print_info "Registering control plane node: $NODE_NAME (IP: $TARGET_IP)"
 
         # Initialize the node in cluster.nodes.active if not already present
-        if [ -z "$(get_current_config "cluster.nodes.active.\"${TARGET_IP}\".control")" ]; then
+        if [ -z "$(get_current_config "cluster.nodes.active.\"${NODE_NAME}\".role")" ]; then
-            wild-config-set "cluster.nodes.active.\"${TARGET_IP}\".control" "true"
+            wild-config-set "cluster.nodes.active.\"${NODE_NAME}\".role" "controlplane"
+            wild-config-set "cluster.nodes.active.\"${NODE_NAME}\".targetIp" "$TARGET_IP"
+            wild-config-set "cluster.nodes.active.\"${NODE_NAME}\".currentIp" "$TARGET_IP"
         fi
 
         # Check if node is already configured
-        existing_interface=$(get_current_config "cluster.nodes.active.\"${TARGET_IP}\".interface")
+        existing_interface=$(get_current_config "cluster.nodes.active.\"${NODE_NAME}\".interface")
         if [ -n "$existing_interface" ] && [ "$existing_interface" != "null" ]; then
-            print_success "Node $TARGET_IP already configured"
+            print_success "Node $NODE_NAME already configured"
             print_info "  - Interface: $existing_interface"
-            print_info "  - Disk: $(get_current_config "cluster.nodes.active.\"${TARGET_IP}\".disk")"
+            print_info "  - Disk: $(get_current_config "cluster.nodes.active.\"${NODE_NAME}\".disk")"
             
             # Generate machine config patch for this node if necessary.
             NODE_SETUP_DIR="${WC_HOME}/setup/cluster-nodes"
-            CONFIG_FILE="${NODE_SETUP_DIR}/patch/${TARGET_IP}.yaml"
+            CONFIG_FILE="${NODE_SETUP_DIR}/patch/${NODE_NAME}.yaml"
             if [ ! -f "$CONFIG_FILE" ]; then
-                print_info "Generating missing machine configuration patch for $TARGET_IP..."
+                print_info "Generating missing machine configuration patch for $NODE_NAME..."
-                if wild-cluster-node-patch-generate "$TARGET_IP"; then
+                if wild-cluster-node-patch-generate "$NODE_NAME"; then
-                    print_success "Machine configuration patch generated for $TARGET_IP"
+                    print_success "Machine configuration patch generated for $NODE_NAME"
                 else
-                    print_warning "Failed to generate machine configuration patch for $TARGET_IP"
+                    print_warning "Failed to generate machine configuration patch for $NODE_NAME"
                 fi
             else
                 print_info "  ✓ Machine configuration patch exists: $CONFIG_FILE"
@@ -211,9 +217,9 @@ if [ "${SKIP_HARDWARE}" = false ]; then
             continue
         fi
 
-        read -p "Do you want to bring up control plane node $TARGET_IP now? (y/N): " -r register_node
+        read -p "Do you want to bring up control plane node $NODE_NAME ($TARGET_IP) now? (y/N): " -r register_node
         if [[ ! $register_node =~ ^[Yy]$ ]]; then
-            print_info "Skipping bringing up node $TARGET_IP registration"
+            print_info "Skipping bringing up node $NODE_NAME registration"
             continue
         fi
         
@@ -232,7 +238,7 @@ if [ "${SKIP_HARDWARE}" = false ]; then
             read -p "Enter maintenance IP for this node: " -r MAINTENANCE_IP
             
             if [ -z "$MAINTENANCE_IP" ]; then
-                print_warning "Skipping node $TARGET_IP registration"
+                print_warning "Skipping node $NODE_NAME registration"
                 continue
             fi
             
@@ -242,7 +248,7 @@ if [ "${SKIP_HARDWARE}" = false ]; then
                 DETECTION_IP="$MAINTENANCE_IP"
                 
                 # Store maintenance IP for reference
-                wild-config-set "cluster.nodes.active.\"${TARGET_IP}\".maintenanceIp" "$MAINTENANCE_IP"
+                wild-config-set "cluster.nodes.active.\"${NODE_NAME}\".maintenanceIp" "$MAINTENANCE_IP"
                 print_success "Node detected at maintenance IP $MAINTENANCE_IP"
             else
                 print_error "Failed to detect node at $MAINTENANCE_IP"
@@ -277,31 +283,31 @@ if [ "${SKIP_HARDWARE}" = false ]; then
             fi
             
             # Update config.yaml with hardware info.
-            print_info "Updating configuration for $TARGET_IP..."
+            print_info "Updating configuration for $NODE_NAME..."
-            wild-config-set "cluster.nodes.active.\"${TARGET_IP}\".interface" "$INTERFACE"
+            wild-config-set "cluster.nodes.active.\"${NODE_NAME}\".interface" "$INTERFACE"
-            wild-config-set "cluster.nodes.active.\"${TARGET_IP}\".disk" "$SELECTED_DISK"
+            wild-config-set "cluster.nodes.active.\"${NODE_NAME}\".disk" "$SELECTED_DISK"
             
             # Copy current Talos version and schematic ID to this node
             current_talos_version=$(get_current_config "cluster.nodes.talos.version")
             current_schematic_id=$(get_current_config "cluster.nodes.talos.schematicId")
             if [ -n "$current_talos_version" ] && [ "$current_talos_version" != "null" ]; then
-                wild-config-set "cluster.nodes.active.\"${TARGET_IP}\".version" "$current_talos_version"
+                wild-config-set "cluster.nodes.active.\"${NODE_NAME}\".version" "$current_talos_version"
             fi
             if [ -n "$current_schematic_id" ] && [ "$current_schematic_id" != "null" ]; then
-                wild-config-set "cluster.nodes.active.\"${TARGET_IP}\".schematicId" "$current_schematic_id"
+                wild-config-set "cluster.nodes.active.\"${NODE_NAME}\".schematicId" "$current_schematic_id"
             fi
   
             echo ""
-            read -p "Bring node $TARGET_IP up now? (y/N): " -r apply_config
+            read -p "Bring node $NODE_NAME ($TARGET_IP) up now? (y/N): " -r apply_config
             if [[ $apply_config =~ ^[Yy]$ ]]; then
                 if [ "$DETECTION_IP" != "$TARGET_IP" ]; then
                     # Node is in maintenance mode, use insecure flag
                     print_info "Applying configuration in insecure mode (maintenance mode)..."
-                    wild-cluster-node-up "$TARGET_IP" --insecure
+                    wild-cluster-node-up "$NODE_NAME" --insecure
                 else
                     # Node is already configured, use secure mode
                     print_info "Applying configuration..."
-                    wild-cluster-node-up "$TARGET_IP"
+                    wild-cluster-node-up "$NODE_NAME"
                 fi
 
                 # Bootstrap the cluster after the first node is up.
@@ -338,7 +344,7 @@ if [ "${SKIP_HARDWARE}" = false ]; then
 
             else
                 print_info "Configuration not applied. You can apply it later with:"
-                print_info "  wild-cluster-node-up $TARGET_IP --insecure"
+                print_info "  wild-cluster-node-up $NODE_NAME --insecure"
             fi
             
         fi
@@ -347,28 +353,30 @@ if [ "${SKIP_HARDWARE}" = false ]; then
     # Register worker nodes
     echo ""
     print_info "Configure worker nodes (optional):"
+    WORKER_COUNT=1
     while true; do
         echo ""
         read -p "Do you want to register a worker node? (y/N): " -r register_worker
         
         if [[ $register_worker =~ ^[Yy]$ ]]; then
-            read -p "Enter maintenance IP for worker node: " -r WORKER_IP
+            NODE_NAME="${HOSTNAME_PREFIX}worker-${WORKER_COUNT}"
+            read -p "Enter current IP for worker node $NODE_NAME: " -r WORKER_IP
             
             if [ -z "$WORKER_IP" ]; then
                 print_warning "No IP provided, skipping worker node"
                 continue
             fi
             
-            print_info "Running wild-node-detect for worker node $WORKER_IP..."
+            print_info "Running wild-node-detect for worker node $NODE_NAME ($WORKER_IP)..."
             # Run detection and capture both output and stderr for debugging
             DETECTION_OUTPUT=$(mktemp)
             DETECTION_ERROR=$(mktemp)
             if wild-node-detect "$WORKER_IP" >"$DETECTION_OUTPUT" 2>"$DETECTION_ERROR"; then
                 WORKER_INFO=$(cat "$DETECTION_OUTPUT")
-                print_success "Worker node detected at IP $WORKER_IP"
+                print_success "Worker node $NODE_NAME detected at IP $WORKER_IP"
                 rm -f "$DETECTION_OUTPUT" "$DETECTION_ERROR"
             else
-                print_error "Failed to detect hardware for worker node $WORKER_IP"
+                print_error "Failed to detect hardware for worker node $NODE_NAME ($WORKER_IP)"
                 print_info "Detection error output:"
                 cat "$DETECTION_ERROR" >&2
                 print_info "Make sure the node is running in maintenance mode and accessible"
@@ -382,7 +390,7 @@ if [ "${SKIP_HARDWARE}" = false ]; then
                 SELECTED_DISK=$(echo "$WORKER_INFO" | jq -r '.selected_disk')
                 AVAILABLE_DISKS=$(echo "$WORKER_INFO" | jq -r '.disks | join(", ")')
                 
-                print_success "Hardware detected for worker node $WORKER_IP:"
+                print_success "Hardware detected for worker node $NODE_NAME:"
                 print_info "  - Interface: $INTERFACE"
                 print_info "  - Available disks: $AVAILABLE_DISKS"
                 print_info "  - Selected disk: $SELECTED_DISK"
@@ -403,51 +411,55 @@ if [ "${SKIP_HARDWARE}" = false ]; then
                 fi
                 
                 # Update config.yaml with worker hardware info
-                print_info "Updating config.yaml for worker node $WORKER_IP..."
+                print_info "Updating config.yaml for worker node $NODE_NAME..."
                 
-                # Store under unified cluster.nodes.active.<ip-address>
+                # Store under unified cluster.nodes.active.<node-name>
-                wild-config-set "cluster.nodes.active.\"${WORKER_IP}\".interface" "$INTERFACE"
+                wild-config-set "cluster.nodes.active.\"${NODE_NAME}\".role" "worker"
-                wild-config-set "cluster.nodes.active.\"${WORKER_IP}\".disk" "$SELECTED_DISK"
+                wild-config-set "cluster.nodes.active.\"${NODE_NAME}\".currentIp" "$WORKER_IP"
-                wild-config-set "cluster.nodes.active.\"${WORKER_IP}\".control" "false"
+                wild-config-set "cluster.nodes.active.\"${NODE_NAME}\".interface" "$INTERFACE"
+                wild-config-set "cluster.nodes.active.\"${NODE_NAME}\".disk" "$SELECTED_DISK"
                 
                 # Copy current Talos version and schematic ID to this node
                 current_talos_version=$(get_current_config "cluster.nodes.talos.version")
                 current_schematic_id=$(get_current_config "cluster.nodes.talos.schematicId")
                 if [ -n "$current_talos_version" ] && [ "$current_talos_version" != "null" ]; then
-                    wild-config-set "cluster.nodes.active.\"${WORKER_IP}\".version" "$current_talos_version"
+                    wild-config-set "cluster.nodes.active.\"${NODE_NAME}\".version" "$current_talos_version"
                 fi
                 if [ -n "$current_schematic_id" ] && [ "$current_schematic_id" != "null" ]; then
-                    wild-config-set "cluster.nodes.active.\"${WORKER_IP}\".schematicId" "$current_schematic_id"
+                    wild-config-set "cluster.nodes.active.\"${NODE_NAME}\".schematicId" "$current_schematic_id"
                 fi
                 
-                print_success "Worker node $WORKER_IP registered successfully:"
+                print_success "Worker node $NODE_NAME registered successfully:"
+                print_info "  - Name: $NODE_NAME"
                 print_info "  - IP: $WORKER_IP"
                 print_info "  - Interface: $INTERFACE"
                 print_info "  - Disk: $SELECTED_DISK"
                 
                 # Generate machine config immediately
-                print_info "Generating machine configuration for $WORKER_IP..."
+                print_info "Generating machine configuration for $NODE_NAME..."
-                if wild-cluster-node-machine-config-generate "$WORKER_IP"; then
+                if wild-cluster-node-patch-generate "$NODE_NAME"; then
-                    print_success "Machine configuration generated for $WORKER_IP"
+                    print_success "Machine configuration generated for $NODE_NAME"
                     
                     # Ask if user wants to apply the configuration now
                     echo ""
-                    read -p "Apply configuration to worker node $WORKER_IP now? (y/N): " -r apply_config
+                    read -p "Apply configuration to worker node $NODE_NAME now? (y/N): " -r apply_config
                     if [[ $apply_config =~ ^[Yy]$ ]]; then
                         # Worker nodes are typically in maintenance mode during setup
                         print_info "Applying configuration in insecure mode (maintenance mode)..."
-                        wild-cluster-node-up "$WORKER_IP" --insecure
+                        wild-cluster-node-up "$NODE_NAME" --insecure
                     else
                         print_info "Configuration not applied. You can apply it later with:"
-                        print_info "  wild-cluster-node-up $WORKER_IP --insecure"
+                        print_info "  wild-cluster-node-up $NODE_NAME --insecure"
                     fi
                 else
-                    print_warning "Failed to generate machine configuration for $WORKER_IP"
+                    print_warning "Failed to generate machine configuration for $NODE_NAME"
                 fi
             else
-                print_error "Failed to detect hardware for worker node $WORKER_IP"
+                print_error "Failed to detect hardware for worker node $NODE_NAME"
                 continue
             fi
+            
+            WORKER_COUNT=$((WORKER_COUNT + 1))
         else
             break
         fi

scripts/common.sh

@@ -103,13 +103,19 @@ prompt_with_default() {
         if [ -z "${result}" ]; then
             result="${current_value}"
         fi
-    elif [ -n "${default}" ]; then
+    elif [ $# -ge 2 ]; then
-        printf "%s [default: %s]: " "${prompt}" "${default}" >&2
+        # Default was provided (even if empty)
+        if [ -n "${default}" ]; then
+            printf "%s [default: %s]: " "${prompt}" "${default}" >&2
+        else
+            printf "%s [default: empty]: " "${prompt}" >&2
+        fi
         read -r result
         if [ -z "${result}" ]; then
             result="${default}"
         fi
     else
+        # No default provided - value is required
         printf "%s: " "${prompt}" >&2
         read -r result
         while [ -z "${result}" ]; do

setup/cluster-nodes/patch.templates/controlplane.yaml

@@ -1,10 +1,11 @@
 machine:
   install:
-    disk: {{ index .cluster.nodes.active "{{NODE_IP}}" "disk" }}
+    disk: {{ index .cluster.nodes.active "{{NODE_NAME}}" "disk" }}
     image: factory.talos.dev/metal-installer/{{ .cluster.nodes.talos.schematicId}}:{{ .cluster.nodes.talos.version}}
   network:
+    hostname: "{{NODE_NAME}}"
     interfaces:
-      - interface: {{ index .cluster.nodes.active "{{NODE_IP}}" "interface" }}
+      - interface: {{ index .cluster.nodes.active "{{NODE_NAME}}" "interface" }}
         dhcp: false
         addresses:
           - "{{NODE_IP}}/24"

setup/cluster-nodes/patch.templates/worker.yaml

@@ -1,7 +1,17 @@
 machine:
   install:
-    disk: {{ index .cluster.nodes.active "{{NODE_IP}}" "disk" }}
+    disk: {{ index .cluster.nodes.active "{{NODE_NAME}}" "disk" }}
     image: factory.talos.dev/metal-installer/{{ .cluster.nodes.talos.schematicId}}:{{ .cluster.nodes.talos.version}}
+  network:
+    hostname: "{{NODE_NAME}}"
+    interfaces:
+      - interface: {{ index .cluster.nodes.active "{{NODE_NAME}}" "interface" }}
+        dhcp: true
+        addresses:
+          - "{{NODE_IP}}/24"
+        routes:
+          - network: 0.0.0.0/0
+            gateway: {{ .cloud.router.ip }}
   kubelet:
     extraMounts:
       - destination: /var/lib/longhorn

setup/cluster-services/longhorn/kustomize.template/ingress.yaml

@@ -0,0 +1,21 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: longhorn-ingress
+  namespace: longhorn-system
+spec:
+  rules:
+    - host: "longhorn.{{ .cloud.internalDomain }}"
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: longhorn-frontend
+                port:
+                  number: 80
+  tls:
+    - secretName: wildcard-internal-wild-cloud-tls
+      hosts:
+        - "longhorn.{{ .cloud.internalDomain }}"

setup/cluster-services/longhorn/kustomize.template/kustomization.yaml

@@ -3,3 +3,4 @@ kind: Kustomization
 
 resources:
   - longhorn.yaml
+  - ingress.yaml