creating services inside the argo manifest

updated deployment requirement
Merge branch 'main' of https://cloud.o-forge.io/core/oc-monitord into services_demo
2024-12-23 16:05:25 +01:00 · 2024-09-06 14:24:20 +02:00 · 2024-09-05 11:45:08 +02:00 · 2024-09-04 17:12:54 +02:00 · 2024-09-03 18:11:37 +02:00
20 changed files with 851 additions and 1319 deletions
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@ -0,0 +1,18 @@
 {
    // Use IntelliSense to learn about possible attributes.
    // Hover to view descriptions of existing attributes.
    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
    "version": "0.2.0",
    "configurations": [
        {
            "name": "Launch Package",
            "type": "go",
            "request": "launch",
            "mode": "auto",
            "program": "${fileDirname}",
            "args": ["-e","e3b7772e-dc9f-4bc1-9f5d-533e23e6cd57" ,"-u","http://127.0.0.1:3100","-m" ,"mongodb://127.0.0.1:27017","-d","DC_myDC"],
            "env": {"OCMONITOR_LOKIURL":"http://127.0.0.1:3100","OCMONITOR_WORKFLOW":"8d0f1814-b5ca-436c-ba3f-116d99198fd2","KUBERNETES_SERVICE_HOST":"","OCMONITOR_MONGOURL":"mongodb://127.0.0.1:27017","OCMONITOR_DATABASE":"DC_myDC","test_service":"true"}
        }
    ]
 }
--- a/LICENSE.md
+++ b/LICENSE.md
@ -1,660 +0,0 @@
 # 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/>.
--- a/README.md
+++ b/README.md
@ -47,6 +47,76 @@ In rules add a new entry :
 This command **must return "yes"**
 ## Allow services to be joined with reverse proxy
 Since the development has been realised in a K3S environment, we will use the lightweight solution provided by **traefik**. 
 We need to install **metallb** to expose our cluster to the exterior and allow packets to reach traefik.
 ### Deploy traefik and metallb
 - Make sure that helm is installed, else visit : https://helm.sh/docs/intro/install/ 
 - Add the repositories for traefik and metallb
 > helm repo add metallb https://metallb.github.io/metallb 
 > helm repo add traefik https://helm.traefik.io/traefik
 >helm repo update
 - Create the namespaces for each
 > kubectl create ns traefik-ingress
 > kubectl create ns metallb-system 
 - Configure the deployment 
 ```
 cat > traefik-values.yaml <<EOF
 globalArguments:
 deployment:
  kind: DaemonSet
 providers:
  kubernetesCRD:
    enabled: true
 service:
  type: LoadBalancer
 ingressRoute:
  dashboard:
    enabled: false
 EOF
 ```
 - Launch the installs
 > helm upgrade --install metallb metallb/metallb --namespace metallb-system
 > helm install --namespace=traefik-ingress traefik traefik/traefik --values=./traefik-values.yaml
 ### Configure metallb
 ```
 cat << 'EOF' | kubectl apply -f -
 apiVersion: metallb.io/v1beta1
 kind: IPAddressPool
 metadata:
  name: default-pool
  namespace: metallb-system
 spec:
  addresses:
  - 192.168.0.200-192.168.0.250
 ---
 apiVersion: metallb.io/v1beta1
 kind: L2Advertisement
 metadata:
  name: default
  namespace: metallb-system
 spec:
  ipAddressPools:
  - default-pool
 EOF
 ```
 - Check that the services created in traefik-ingress have an external IP
 > kubectl get service -n traefik-ingress -o wide
 ## TODO
--- a/demo_nginx/nginx.conf
+++ b/demo_nginx/nginx.conf
@ -0,0 +1,30 @@
 # nginx.conf
 user  nginx;
 worker_processes  auto;
 error_log  /var/log/nginx/error.log warn;
 pid        /var/run/nginx.pid;
 events {
  worker_connections  1024;
 }
 http {
  include       /etc/nginx/mime.types;
  default_type  application/octet-stream;
  log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
  '$status $body_bytes_sent "$http_referer" '
  '"$http_user_agent" "$http_x_forwarded_for"';
  access_log  /var/log/nginx/access.log  main;
  sendfile        on;
  #tcp_nopush     on;
  keepalive_timeout  65;
  #gzip  on;
  #include /etc/nginx/conf.d/*.conf;
 server {
  listen 80;
  location / {
    root   /usr/share/nginx/html;
    index  index.html index.htm;
    try_files $uri $uri/ /index.html;
  }
 }
 }
--- a/demo_nginx/workflow_nginx_services.json
+++ b/demo_nginx/workflow_nginx_services.json
@ -5,7 +5,7 @@
 		"7c71a15b-bdbc-46d7-9dab-67e369804136",
 		"0d565c87-50ae-4a73-843d-f8b2d4047772"
 	],
-	"computes": [
+	"datacenters": [
 		"7b989e97-c3e7-49d2-a3a7-f959da4870b5"
 	],
 	"graph": {
@ -183,7 +183,7 @@
 					"y": 0
 				},
 				"itemresource": {
-					"compute": {
+					"datacenter": {
 						"cpus": [
 							{
 								"architecture": "x86",
@ -214,16 +214,16 @@
 						"abstractresource": {
 							"abstractobject": {
 								"id": "7b989e97-c3e7-49d2-a3a7-f959da4870b5",
-								"name": "Mundi compute"
+								"name": "Mundi datacenter"
 							},
 							"short_description": "Mundi Opencloud Instance",
 							"description": "A very long description of what this data is",
-							"logo": "https://cloud.o-forge.io/core/deperecated-oc-catalog/src/branch/main/scripts/local_imgs/Mundi compute.png",
+							"logo": "https://cloud.o-forge.io/core/deperecated-oc-catalog/src/branch/main/scripts/local_imgs/Mundi datacenter.png",
 							"owner": "IRT",
 							"source_url": "http://www.google.com",
 							"resource_model": {
 								"id": "c3983010-1990-4ac0-8533-5389867e4424",
-								"resource_type": "compute_resource"
+								"resource_type": "datacenter_resource"
 							}
 						}
 					}
--- a/exemple.yml
+++ b/exemple.yml
@ -1,32 +0,0 @@
 # This template demonstrates a steps template and how to control sequential vs. parallel steps.
 # In this example, the hello1 completes before the hello2a, and hello2b steps, which run in parallel.
 apiVersion: argoproj.io/v1alpha1
 kind: Workflow
 metadata:
  generateName: steps-
 spec:
  entrypoint: hello-hello-hello
  templates:
  - name: hello-hello-hello
    steps:
    - - name: hello1
        template: print-message
        arguments:
          parameters: [{name: message, value: "hello1"}]
    - - name: hello2a
        template: print-message
        arguments:
          parameters: [{name: message, value: "hello2a"}]
      - name: hello2b
        template: print-message
        arguments:
          parameters: [{name: message, value: "hello2b"}]
  - name: print-message
    inputs:
      parameters:
      - name: message
    container:
      image: busybox
      command: [echo]
      args: ["{{inputs.parameters.message}}"]
--- a/go.mod
+++ b/go.mod
@ -3,7 +3,7 @@ module oc-monitord
 go 1.22.0
 require (
-	cloud.o-forge.io/core/oc-lib v0.0.0-20241121074503-15ca06aba883
+	cloud.o-forge.io/core/oc-lib v0.0.0-20240904135449-4f0ab6a3760f
 	github.com/akamensky/argparse v1.4.0
 	github.com/goraz/onion v0.1.3
 	github.com/nats-io/nats-server/v2 v2.10.18
@ -14,32 +14,21 @@ require (
 )
 require (
 	github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
 	github.com/beego/beego/v2 v2.3.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.5 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.22.1 // indirect
+	github.com/go-playground/validator/v10 v10.22.0 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/hashicorp/golang-lru v0.5.4 // indirect
+	github.com/klauspost/compress v1.17.9 // indirect
 	github.com/klauspost/compress v1.17.10 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/montanaflynn/stats v0.7.1 // indirect
 	github.com/nats-io/nats.go v1.37.0 // indirect
 	github.com/nats-io/nkeys v0.4.7 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
 	github.com/prometheus/client_golang v1.19.0 // indirect
 	github.com/prometheus/client_model v0.5.0 // indirect
 	github.com/prometheus/common v0.48.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/robfig/cron/v3 v3.0.1 // indirect
 	github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 // indirect
 	github.com/smartystreets/goconvey v1.6.4 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
@ -49,11 +38,10 @@ require (
 	github.com/xdg-go/scram v1.1.2 // indirect
 	github.com/xdg-go/stringprep v1.0.4 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
-	go.mongodb.org/mongo-driver v1.17.1 // indirect
+	go.mongodb.org/mongo-driver v1.16.1 // indirect
-	golang.org/x/crypto v0.28.0 // indirect
+	golang.org/x/crypto v0.26.0 // indirect
-	golang.org/x/net v0.30.0 // indirect
+	golang.org/x/net v0.28.0 // indirect
 	golang.org/x/sync v0.8.0 // indirect
-	golang.org/x/sys v0.26.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
-	golang.org/x/text v0.19.0 // indirect
+	golang.org/x/text v0.18.0 // indirect
 	google.golang.org/protobuf v1.35.1 // indirect
 )
--- a/go.sum
+++ b/go.sum
@ -40,77 +40,12 @@ cloud.o-forge.io/core/oc-lib v0.0.0-20240826085916-d0e1474f8f34 h1:40XQgwR9HxXSn
 cloud.o-forge.io/core/oc-lib v0.0.0-20240826085916-d0e1474f8f34/go.mod h1:1hhYh5QWAbYw9cKplQ0ZD9PMgU8t6gPqiYF8sldv1HU=
 cloud.o-forge.io/core/oc-lib v0.0.0-20240828135227-14d6a5f11c4e h1:/KWO/gIcP5f7T4r00715fNz0Y/Hil6Bj3J1ycuES1Zw=
 cloud.o-forge.io/core/oc-lib v0.0.0-20240828135227-14d6a5f11c4e/go.mod h1:FIJD0taWLJ5pjQLJ6sfE2KlTkvbmk5SMcyrxdjsaVz0=
-cloud.o-forge.io/core/oc-lib v0.0.0-20240830071403-db78c70dc349 h1:bEIY1lCsA78/mJqFE0gV6likAv5ZifH3RMnLJxiSk3o=
+cloud.o-forge.io/core/oc-lib v0.0.0-20240904135449-4f0ab6a3760f h1:v9mw3uNg/DJswOvHooMu8/BMedA+vIXbma+8iUwsjUI=
-cloud.o-forge.io/core/oc-lib v0.0.0-20240830071403-db78c70dc349/go.mod h1:FIJD0taWLJ5pjQLJ6sfE2KlTkvbmk5SMcyrxdjsaVz0=
+cloud.o-forge.io/core/oc-lib v0.0.0-20240904135449-4f0ab6a3760f/go.mod h1:FIJD0taWLJ5pjQLJ6sfE2KlTkvbmk5SMcyrxdjsaVz0=
 cloud.o-forge.io/core/oc-lib v0.0.0-20240830131445-af18dba5563c h1:4ZoM9ONJiaeLHSi0s8gsCe4lHuRHXkfK+eDSnTCspa0=
 cloud.o-forge.io/core/oc-lib v0.0.0-20240830131445-af18dba5563c/go.mod h1:FIJD0taWLJ5pjQLJ6sfE2KlTkvbmk5SMcyrxdjsaVz0=
 cloud.o-forge.io/core/oc-lib v0.0.0-20240924075418-021b461b0a7d h1:f8cT/NunF+eoZLU5B9gmiT4ky99zPmnQBbj4tj23KuA=
 cloud.o-forge.io/core/oc-lib v0.0.0-20240924075418-021b461b0a7d/go.mod h1:FIJD0taWLJ5pjQLJ6sfE2KlTkvbmk5SMcyrxdjsaVz0=
 cloud.o-forge.io/core/oc-lib v0.0.0-20240927112324-cdf513c2c454 h1:F5/oBMypnb6Mdvcf6N8y8v/DgfglPQ6VsQUY7hjC2zA=
 cloud.o-forge.io/core/oc-lib v0.0.0-20240927112324-cdf513c2c454/go.mod h1:FIJD0taWLJ5pjQLJ6sfE2KlTkvbmk5SMcyrxdjsaVz0=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241001074325-aaef5334ce54 h1:0Wt94PIda2IOnZec9yGBfpSBgsT+kYefm904r0jPmkg=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241001074325-aaef5334ce54/go.mod h1:FIJD0taWLJ5pjQLJ6sfE2KlTkvbmk5SMcyrxdjsaVz0=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241001081722-4ec32bafa7b6 h1:skTKCsFU5UlSSrc+AWgc4wsXMoZktZK/23eAjVFBEvo=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241001081722-4ec32bafa7b6/go.mod h1:FIJD0taWLJ5pjQLJ6sfE2KlTkvbmk5SMcyrxdjsaVz0=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241002102322-c309d9762350 h1:ybK3Qz1inr9xgrJwbHjSOTNaFIyX+AVINyzqcsvpATY=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241002102322-c309d9762350/go.mod h1:FIJD0taWLJ5pjQLJ6sfE2KlTkvbmk5SMcyrxdjsaVz0=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241002120813-a09a04e1a71e h1:77QHk5JSf0q13B/Ai3xjcsGSS7nX+9AfxcsYz5oDo/A=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241002120813-a09a04e1a71e/go.mod h1:t+zpCTVKVdHH/BImwtMYY2QIWLMXKgY4n/JhFm3Vpu8=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241002141646-2797d97537f8 h1:3PFzsoP3GFFAT1sBb8ljselfAEssFpds2HVPrUnIGec=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241002141646-2797d97537f8/go.mod h1:t+zpCTVKVdHH/BImwtMYY2QIWLMXKgY4n/JhFm3Vpu8=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241002144524-de0b910e0953 h1:vu+6FyhLFbYDlC75IHhN+5wQl1oI8GpuEsS3g5LkWqw=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241002144524-de0b910e0953/go.mod h1:t+zpCTVKVdHH/BImwtMYY2QIWLMXKgY4n/JhFm3Vpu8=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241003074627-1a061f2d1fa4 h1:ZEFtSzUhtHm1jQ2KdS9WcX3R38zFht+LbzpAX2SgD5Q=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241003074627-1a061f2d1fa4/go.mod h1:t+zpCTVKVdHH/BImwtMYY2QIWLMXKgY4n/JhFm3Vpu8=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241003152554-3388fcc6f354 h1:/2HhRinnZTnuS/vT8TpCvkQYRJM+3aCoTxwe3JjoZG0=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241003152554-3388fcc6f354/go.mod h1:t+zpCTVKVdHH/BImwtMYY2QIWLMXKgY4n/JhFm3Vpu8=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241004084230-c083ce748cb2 h1:SMMnV8jKaJ4RPi5E4EHX8FX4+bfvu0KvBRgiB8OBuEw=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241004084230-c083ce748cb2/go.mod h1:t+zpCTVKVdHH/BImwtMYY2QIWLMXKgY4n/JhFm3Vpu8=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241009111931-84024a143e67 h1:0CMdmukFqTrGv8smRCBYG2pVAFdZj4AEcyBhltyyqYM=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241009111931-84024a143e67/go.mod h1:t+zpCTVKVdHH/BImwtMYY2QIWLMXKgY4n/JhFm3Vpu8=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241010065522-17749c6c0bd1 h1:tgzkJK/lJ7JBwNTvstiltGdgJwfbBrCPiXnQKkUYW1U=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241010065522-17749c6c0bd1/go.mod h1:t+zpCTVKVdHH/BImwtMYY2QIWLMXKgY4n/JhFm3Vpu8=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241010074019-69fe3f8d76f4 h1:8TC9Ahg2ZlqhfoYulCB/z9CzNc5zbkP2jQ0ul4AUUzo=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241010074019-69fe3f8d76f4/go.mod h1:t+zpCTVKVdHH/BImwtMYY2QIWLMXKgY4n/JhFm3Vpu8=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241107103631-2d249f38ffac h1:iaPZ3BQEmJm4JqaRuITC1EQtxCKIH4qfx2Wl6hGVy1c=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241107103631-2d249f38ffac/go.mod h1:ya7Q+zHhaKM+XF6sAJ+avqHEVzaMnFJQih2X3TlTlGo=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241107113928-e6ca520a88a2 h1:Gj6IqM0clxbJNZAu3C6KkgVq1KW2fBqMAa5Un6SgbGY=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241107113928-e6ca520a88a2/go.mod h1:ya7Q+zHhaKM+XF6sAJ+avqHEVzaMnFJQih2X3TlTlGo=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241107114600-4c0c75be9161 h1:so5V7C6kiJ9tpuxtgK/KcgjXQC2ythInAH8X2gohuaM=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241107114600-4c0c75be9161/go.mod h1:ya7Q+zHhaKM+XF6sAJ+avqHEVzaMnFJQih2X3TlTlGo=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241107122526-f3df1e42b9ba h1:MGd8N7bY1LWXMhAp7gibDNwMS2hsatLQ3rfayvy5rGs=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241107122526-f3df1e42b9ba/go.mod h1:ya7Q+zHhaKM+XF6sAJ+avqHEVzaMnFJQih2X3TlTlGo=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241108104423-7fd44a55cb28 h1:jekSPkD/b59kJ9Bp/trBWnahkdd1FkX4csQOcSaZa8I=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241108104423-7fd44a55cb28/go.mod h1:ya7Q+zHhaKM+XF6sAJ+avqHEVzaMnFJQih2X3TlTlGo=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241120085309-08e9ee67fe96 h1:1f2m8148/bOY19urpgtgShmGPDMnnjRqcEczrkVDJBA=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241120085309-08e9ee67fe96/go.mod h1:ya7Q+zHhaKM+XF6sAJ+avqHEVzaMnFJQih2X3TlTlGo=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241120093920-b49685aa8223 h1:LX04VfuXWxi+Q0lKhBBd7tfyLO3R4y8um3srRVlMbSY=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241120093920-b49685aa8223/go.mod h1:ya7Q+zHhaKM+XF6sAJ+avqHEVzaMnFJQih2X3TlTlGo=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241120150854-57f18b224443 h1:cqlL4/EsqYlQ6luPBC4+6+gWNwQqWVV8DPD8O7F6yM8=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241120150854-57f18b224443/go.mod h1:ya7Q+zHhaKM+XF6sAJ+avqHEVzaMnFJQih2X3TlTlGo=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241120153807-3b77c0da8352 h1:xNYjEiB/nrvXLbLcjSDfNZEPSR38/LKcsQKP/oWg5HI=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241120153807-3b77c0da8352/go.mod h1:ya7Q+zHhaKM+XF6sAJ+avqHEVzaMnFJQih2X3TlTlGo=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241120160521-ac49d3324d7b h1:5prB7K0iM284VmYdoRaBMZIOEXq5S0YgTrSp4+SnZyo=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241120160521-ac49d3324d7b/go.mod h1:ya7Q+zHhaKM+XF6sAJ+avqHEVzaMnFJQih2X3TlTlGo=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241121065159-d8fac883d260 h1:DSumHyw9XJQ/r+LjWa5GDkjS0ri/lFkU7oPr5vv8mws=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241121065159-d8fac883d260/go.mod h1:ya7Q+zHhaKM+XF6sAJ+avqHEVzaMnFJQih2X3TlTlGo=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241121071546-e9b3a65a0ec6 h1:AdUkzaX63VF3fdloWyyWT1jLM4M1pkDLErAdHyVbsKU=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241121071546-e9b3a65a0ec6/go.mod h1:ya7Q+zHhaKM+XF6sAJ+avqHEVzaMnFJQih2X3TlTlGo=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241121074503-15ca06aba883 h1:JdHJT8vuup4pJCC7rjiOe0/qD7at6400ml5zZHjEeUo=
 cloud.o-forge.io/core/oc-lib v0.0.0-20241121074503-15ca06aba883/go.mod h1:ya7Q+zHhaKM+XF6sAJ+avqHEVzaMnFJQih2X3TlTlGo=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8=
 github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo=
 github.com/akamensky/argparse v1.4.0 h1:YGzvsTqCvbEZhL8zZu2AiA5nq805NZh75JNj4ajn1xc=
 github.com/akamensky/argparse v1.4.0/go.mod h1:S5kwC7IuDcEr5VeXtGPRVZ5o/FdhcMlQz4IZQuw64xA=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/beego/beego/v2 v2.3.1 h1:7MUKMpJYzOXtCUsTEoXOxsDV/UcHw6CPbaWMlthVNsc=
 github.com/beego/beego/v2 v2.3.1/go.mod h1:5cqHsOHJIxkq44tBpRvtDe59GuVRVv/9/tyVDxd5ce4=
 github.com/beego/beego/v2 v2.3.2/go.mod h1:5cqHsOHJIxkq44tBpRvtDe59GuVRVv/9/tyVDxd5ce4=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/etcd v3.3.17+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
@ -132,8 +67,6 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
 github.com/go-playground/validator/v10 v10.22.0 h1:k6HsTZ0sTnROkhS//R0O+55JgM8C4Bx7ia+JlgcnOao=
 github.com/go-playground/validator/v10 v10.22.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
 github.com/go-playground/validator/v10 v10.22.1 h1:40JcKH+bBNGFczGuoBYgX4I6m/i27HYW8P9FDk5PbgA=
 github.com/go-playground/validator/v10 v10.22.1/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
@ -144,8 +77,6 @@ github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGa
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/goraz/onion v0.1.3 h1:KhyvbDA2b70gcz/d5izfwTiOH8SmrvV43AsVzpng3n0=
 github.com/goraz/onion v0.1.3/go.mod h1:XEmz1XoBz+wxTgWB8NwuvRm4RAu3vKxvrmYtzK+XCuQ=
 github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
 github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
@ -154,8 +85,6 @@ github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
 github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
 github.com/klauspost/compress v1.17.10 h1:oXAz+Vh0PMUvJczoi+flxpnBEPxoER1IaAnU/NMPtT0=
 github.com/klauspost/compress v1.17.10/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
 github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
 github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
@ -168,8 +97,6 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
@ -191,22 +118,12 @@ github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/9
 github.com/pelletier/go-toml v1.6.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU=
 github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k=
 github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
 github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI=
 github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE=
 github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc=
 github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
 github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
 github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 h1:DAYUYH5869yV94zvCES9F51oYtN5oGlwjxJJz7ZCnik=
 github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18/go.mod h1:nkxAfR/5quYxwPZhyDxgasBMnRtBZd0FCEpawpjMUFg=
 github.com/skarademir/naturalsort v0.0.0-20150715044055-69a5d87bef62/go.mod h1:oIdVclZaltY1Nf7OQUkg1/2jImBJ+ZfKZuDIRSwk3p0=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
@ -250,10 +167,6 @@ go.mongodb.org/mongo-driver v1.16.0 h1:tpRsfBJMROVHKpdGyc1BBEzzjDUWjItxbVSZ8Ls4B
 go.mongodb.org/mongo-driver v1.16.0/go.mod h1:oB6AhJQvFQL4LEHyXi6aJzQJtBiTQHiAd83l0GdFaiw=
 go.mongodb.org/mongo-driver v1.16.1 h1:rIVLL3q0IHM39dvE+z2ulZLp9ENZKThVfuvN/IiN4l8=
 go.mongodb.org/mongo-driver v1.16.1/go.mod h1:oB6AhJQvFQL4LEHyXi6aJzQJtBiTQHiAd83l0GdFaiw=
 go.mongodb.org/mongo-driver v1.17.0 h1:Hp4q2MCjvY19ViwimTs00wHi7G4yzxh4/2+nTx8r40k=
 go.mongodb.org/mongo-driver v1.17.0/go.mod h1:wwWm/+BuOddhcq3n68LKRmgk2wXzmF6s0SFOa0GINL4=
 go.mongodb.org/mongo-driver v1.17.1 h1:Wic5cJIwJgSpBhe3lx3+/RybR5PiYRMpVFgO7cOHyIM=
 go.mongodb.org/mongo-driver v1.17.1/go.mod h1:wwWm/+BuOddhcq3n68LKRmgk2wXzmF6s0SFOa0GINL4=
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191112222119-e1110fd1c708/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@ -262,10 +175,6 @@ golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
 golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
 golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
 golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
 golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
 golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
 golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
 golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@ -276,10 +185,6 @@ golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
 golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
 golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
 golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
 golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
 golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
 golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
 golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
@ -305,8 +210,6 @@ golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
 golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
 golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
 golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@ -319,17 +222,11 @@ golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
 golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
 golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
 golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
 google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
 google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
 google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
--- a/main.go
+++ b/main.go
@ -19,7 +19,6 @@ import (
 	oclib "cloud.o-forge.io/core/oc-lib"
 	"cloud.o-forge.io/core/oc-lib/logs"
 	"cloud.o-forge.io/core/oc-lib/models/utils"
 	"cloud.o-forge.io/core/oc-lib/models/workflow_execution"
 	"github.com/akamensky/argparse"
@ -37,6 +36,7 @@ import (
 var logger zerolog.Logger
 var wf_logger zerolog.Logger
 var pods_logger zerolog.Logger
 var parser argparse.Parser
 var monitorLocal bool
 var workflowName string
@ -46,8 +46,6 @@ const localConfigFile = "./conf/local_ocmonitord_conf.json"
 func main() {
 	os.Setenv("test_service", "true") // Only for service demo, delete before merging on main
 	monitorLocal = false
 	// Test if monitor is launched outside (with parameters) or in a k8s environment (env variables sets)
 	if os.Getenv("KUBERNETES_SERVICE_HOST") == "" {
@ -61,7 +59,11 @@ func main() {
 		monitorLocal = true
 		loadConfig(true, nil)
 	}
-	oclib.InitDaemon("oc-monitord")
+
 	logger = logs.CreateLogger("oc-monitord")
 	logger.Debug().Msg("Loki URL : " + conf.GetConfig().LokiURL)
 	logger.Debug().Msg("Workflow executed : " + conf.GetConfig().ExecutionID)
 	oclib.SetConfig(
 		conf.GetConfig().MongoURL,
@ -70,11 +72,7 @@ func main() {
 		conf.GetConfig().LokiURL,
 		conf.GetConfig().Logs,
 	)
-
+	oclib.Init("oc-monitord")
 	logger = logs.CreateLogger("oc-monitord")
 	logger.Debug().Msg("Loki URL : " + conf.GetConfig().LokiURL)
 	logger.Debug().Msg("Workflow executed : " + conf.GetConfig().ExecutionID)
 	wf_id := getWorkflowId(conf.GetConfig().ExecutionID)
 	conf.GetConfig().WorkflowID = wf_id
@ -94,7 +92,7 @@ func main() {
 		logger.Error().Msg("Could not retrieve workflow " + conf.GetConfig().WorkflowID + " from oc-catalog API")
 	}
-	argo_file_path, stepMax, err := new_wf.ExportToArgo(conf.GetConfig().Timeout)
+	argo_file_path, err := new_wf.ExportToArgo(conf.GetConfig().Timeout)
 	if err != nil {
 		logger.Error().Msg("Could not create the Argo file for " + conf.GetConfig().WorkflowID)
 		logger.Error().Msg(err.Error())
@ -106,17 +104,20 @@ func main() {
 	wf_logger = logger.With().Str("argo_name", workflowName).Str("workflow_id", conf.GetConfig().WorkflowID).Str("workflow_execution_id", conf.GetConfig().ExecutionID).Logger()
 	wf_logger.Debug().Msg("Testing argo name")
-	executeWorkflow(argo_file_path, stepMax)
+	executeWorkflow(argo_file_path)
 }
 // Return the Workflow ID associated to a workflow execution object
 func getWorkflowId(exec_id string) string {
 	res := oclib.LoadOne(oclib.LibDataEnum(oclib.WORKFLOW_EXECUTION), exec_id)
 	if res.Code != 200 {
 		logger.Error().Msg("Could not retrieve workflow ID from execution ID " + exec_id)
 		return ""
 	}
 	wf_exec := res.ToWorkflowExecution()
 	return wf_exec.WorkflowID
@ -124,22 +125,29 @@ func getWorkflowId(exec_id string) string {
 // So far we only log the output from 
-func executeWorkflow(argo_file_path string, stepMax int) {
+func executeWorkflow(argo_file_path string) {
 	// var stdout, stderr, stdout_logs, stderr_logs 	io.ReadCloser
 	var stdout, stderr io.ReadCloser
 	// var stderr 	io.ReadCloser
 	var err error
-	cmd := exec.Command("argo", "submit", "--log", "./argo_workflows/"+argo_file_path, "--serviceaccount=argo", "-n", "argo")
+	cmd := exec.Command("argo", "submit", "--watch", "./argo_workflows/"+argo_file_path, "--serviceaccount=argo", "-n", "argo")
 	fmt.Println(cmd)
 	if stdout, err = cmd.StdoutPipe(); err != nil {
 		wf_logger.Error().Msg("Could not retrieve stdoutpipe " + err.Error())
 		return
 	}
 	if stderr, err = cmd.StderrPipe(); err != nil {
 		wf_logger.Error().Msg("Could not retrieve stderrpipe " + err.Error())
 		return
 	}
 	if err := cmd.Start(); err != nil {
 		panic(err)
 	}
 	var wg sync.WaitGroup
-	go logWorkflow(argo_file_path, stepMax, stdout, &wg)
+	go logWorkflow(stdout, &wg)
 	if err := cmd.Wait(); err != nil {
 		wf_logger.Error().Msg("Could not execute argo submit")
@ -152,40 +160,44 @@ func executeWorkflow(argo_file_path string, stepMax int) {
 // We could improve this function by creating an object with the same attribute as the output
 // and only send a new log if the current object has different values than the previous
-func logWorkflow(argo_file_path string, stepMax int, pipe io.ReadCloser, wg *sync.WaitGroup) {
+func logWorkflow(pipe io.ReadCloser, wg *sync.WaitGroup) {
-	var current_watch, previous_watch *models.ArgoWatch
+	var current_watch, previous_watch models.ArgoWatch
 	split := strings.Split(argo_file_path, "_")
 	argoLogs := models.NewArgoLogs(split[0], "argo", stepMax)
 	watch_output := make([]string, 0)
 	scanner := bufio.NewScanner(pipe)
 	for scanner.Scan() {
 		log := scanner.Text()
 		watch_output = append(watch_output, log)
-		if strings.Contains(log, "Progress:") {
+
-			current_watch = argoLogs.StopStepRecording(watch_output)
+		if strings.HasPrefix(log, "Progress:") {
-			watch_output = []string{}
+
-		} else if strings.Contains(log, "sub-process exited") {
+			current_watch = *models.NewArgoLogs(watch_output)
-			current_watch = argoLogs.StopStepRecording(watch_output)
+			workflowName = current_watch.Name
-		}
+			if !current_watch.Equals(previous_watch) {
 		if current_watch != nil && !current_watch.Equals(previous_watch) && current_watch.Name != "" {
 				wg.Add(1)
-			checkStatus(current_watch, previous_watch)
+				checkStatus(current_watch.Status, previous_watch.Status)
 				jsonified, err := json.Marshal(current_watch)
 				if err != nil {
 					logger.Error().Msg("Could not create watch log")
 				}
 			if current_watch.Status == "Failed" {
 				wf_logger.Error().Msg(string(jsonified))
 			} else {
 				wf_logger.Info().Msg(string(jsonified))
 			}
 				previous_watch = current_watch
-			current_watch = &models.ArgoWatch{}
+				current_watch = models.ArgoWatch{}
 			watch_output = []string{}
 				wg.Done()
 			}
 		}
 	}
 }
 // Debug, no logs sent
 func logPods(pipe io.ReadCloser, name string) {
 	pods_logger = wf_logger.With().Str("pod_name", name).Logger()
 	scanner := bufio.NewScanner(pipe)
 	for scanner.Scan() {
 		log := scanner.Text()
 		pods_logger.Info().Msg(log)
 	}
 }
 func loadConfig(is_k8s bool, parser *argparse.Parser) {
@ -241,6 +253,7 @@ func setConf(is_k8s bool, o *onion.Onion, parser *argparse.Parser) {
 }
 func initOnion(o *onion.Onion) *onion.Onion {
 	logger = logs.CreateLogger("oc-monitord")
 	configFile := ""
@ -283,23 +296,24 @@ func getContainerName(argo_file string) string {
 }
 // Uses the ArgoWatch object to update status of the workflow execution object
-func checkStatus(current *models.ArgoWatch, previous *models.ArgoWatch) {
+func checkStatus(current string, previous string) {
-	if previous != nil && current.Status != previous.Status {
+	if current != previous {
-		updateStatus(current.Status)
+		updateStatus(current)
 	}
 }
 func updateStatus(status string) {
 	exec_id := conf.GetConfig().ExecutionID
-	wf_exec := &workflow_execution.WorkflowExecution{AbstractObject: utils.AbstractObject{UUID: conf.GetConfig().ExecutionID}}
+	wf_exec := &workflow_execution.WorkflowExecution{}
 	wf_exec.ArgoStatusToState(status)
 	serialized := wf_exec.Serialize()
 	res := oclib.UpdateOne(oclib.LibDataEnum(oclib.WORKFLOW_EXECUTION), serialized, exec_id)
 	if res.Code != 200 {
 		logger.Error().Msg("Could not update status for workflow execution " + exec_id)
 	}
 	fmt.Printf("status argo : %s  /nstatus db : %s", status, serialized["state"])
 }
--- a/models/argo_logs.go
+++ b/models/argo_logs.go
@ -1,12 +1,7 @@
 package models
 import (
 	"fmt"
 	"strconv"
 	"strings"
 	"time"
 	"github.com/acarl005/stripansi"
 )
 type ArgoWatch struct {
@ -18,7 +13,6 @@ type ArgoWatch struct {
 	Started  string
 	Duration string
 	Progress string
 	Logs     []string
 }
 type Conditions struct {
@ -26,103 +20,53 @@ type Conditions struct {
 	Completed  bool
 }
-func (a *ArgoWatch) Equals(arg *ArgoWatch) bool {
+func (a *ArgoWatch) Equals(arg ArgoWatch) bool {
 	if arg == nil {
 		return false
 	}
 	return a.Status == arg.Status && a.Progress == arg.Progress && a.Conditions.PodRunning == arg.Conditions.PodRunning && a.Conditions.Completed == arg.Conditions.Completed
 }
-func NewArgoLogs(name string, namespace string, stepMax int) *ArgoLogs {
+// Take the slice of string that make up one round of stderr outputs from the --watch option in argo submit
-	return &ArgoLogs{
+func NewArgoLogs(inputs []string) *ArgoWatch {
-		Name:        "oc-monitor-" + name,
+	var workflow ArgoWatch
 		Namespace:   namespace,
 		CreatedDate: time.Now().Format("2006-01-02 15:04:05"),
 		StepCount:   0,
 		StepMax:     stepMax,
 		stop:        false,
 	}
 }
 type ArgoLogs struct {
 	Name        string
 	Namespace   string
 	CreatedDate string
 	StepCount   int
 	StepMax     int
 	stop        bool
 	Started     time.Time
 }
 func (a *ArgoLogs) StartStepRecording() {
 	a.StepCount += 1
 	a.Started = time.Now()
 }
 func (a *ArgoLogs) StopStepRecording(inputs []string) *ArgoWatch {
 	fn := strings.Split(a.Name, "_")
 	logs := []string{}
 	err := false
 	end := ""
 	for _, input := range inputs {
 		line := strings.TrimSpace(input)
-		if line == "" || !strings.Contains(line, fn[0]) || !strings.Contains(line, ":") {
+		if line == "" {
 			continue
 		}
-		step := strings.Split(line, ":")
+		switch {
-		if strings.Contains(line, "sub-process exited") {
+		case strings.HasPrefix(line, "Name:"):
-			b := strings.Split(line, "time=\"")
+			workflow.Name = parseValue(line)
-			if len(b) > 1 {
+		case strings.HasPrefix(line, "Namespace:"):
-				end = b[1][:19]
+			workflow.Namespace = parseValue(line)
 		case strings.HasPrefix(line, "Status:"):
 			workflow.Status = parseValue(line)
 		case strings.HasPrefix(line, "PodRunning"):
 			workflow.PodRunning = parseBoolValue(line)
 		case strings.HasPrefix(line, "Completed"):
 			workflow.Completed = parseBoolValue(line)
 		case strings.HasPrefix(line, "Created:"):
 			workflow.Created = parseValue(line)
 		case strings.HasPrefix(line, "Started:"):
 			workflow.Started = parseValue(line)
 		case strings.HasPrefix(line, "Duration:"):
 			workflow.Duration = parseValue(line)
 		case strings.HasPrefix(line, "Progress:"):
 			workflow.Progress = parseValue(line)
 		}
 	}
 		if len(step) < 2 || strings.Contains(line, "time=") || strings.TrimSpace(strings.Join(step[1:], " : ")) == "" || strings.TrimSpace(strings.Join(step[1:], " : ")) == a.Name {
 			continue
 		}
 		log := stripansi.Strip(strings.TrimSpace(strings.Join(step[1:], " : ")))
 		t, e := strconv.Unquote(log)
 		if e == nil {
 			logs = append(logs, t)
 		} else {
 			logs = append(logs, strings.ReplaceAll(log, "\"", "`"))
 		}
-		if strings.Contains(logs[len(logs)-1], "Error") {
+	return &workflow
-			err = true
+}
-		}
+
-	}
+func parseValue(line string) string {
-	status := "Pending"
+	parts := strings.SplitN(line, ":", 2)
-	if a.StepCount > 0 {
+	if len(parts) < 2 {
-		status = "Running"
+		return ""
-	}
+	}
-	if a.StepCount == a.StepMax {
+	return strings.TrimSpace(parts[1])
-		if err {
+}
-			status = "Failed"
+
-		} else {
+func parseBoolValue(line string) bool {
-			status = "Succeeded"
+	value := parseValue(line)
-		}
+	return value == "True"
 	}
 	duration := float64(0)
 	if end != "" {
 		timeE, _ := time.Parse("2006-01-02T15:04:05", end)
 		duration = timeE.Sub(a.Started).Seconds()
 	}
 	argo := &ArgoWatch{
 		Name:      a.Name,
 		Namespace: a.Namespace,
 		Status:    status,
 		Created:   a.CreatedDate,
 		Started:   a.Started.Format("2006-01-02 15:04:05"),
 		Conditions: Conditions{
 			PodRunning: a.StepCount > 0 && a.StepCount < a.StepMax,
 			Completed:  a.StepCount == a.StepMax,
 		},
 		Progress: fmt.Sprintf("%v/%v", a.StepCount, a.StepMax),
 		Duration: fmt.Sprintf("%v", fmt.Sprintf("%.2f", duration)+"s"),
 		Logs:     logs,
 	}
 	if !argo.Completed {
 		a.StartStepRecording()
 	}
 	return argo
 }
--- a/models/ingress.go
+++ b/models/ingress.go
@ -0,0 +1,101 @@
 package models
 import "strconv"
 // apiVersion: networking.k8s.io/v1
 // kind: Ingress
 // metadata:
 //   name: example-ingress
 //   namespace: argo
 //   annotations:
 //     traefik.ingress.kubernetes.io/router.entrypoints: web  # Utilisation de l'entrypoint HTTP standard
 // spec:
 //   rules:
 //   - http:
 //       paths:
 //       - path: /dtf
 //         pathType: Prefix
 //         backend:
 //           service:
 //             name: workflow-service-qtjk2
 //             port:
 //               number: 80
 var ingress_manifest = &Manifest{
 	ApiVersion: "networking.k8s.io/v1",
 	Kind: "Ingress",
 	Metadata: Metadata{
 		GenerateName: "ingress-argo-",
 	},
 }
 type Ingress struct {
 	ApiVersion string      `yaml:"apiVersion,omitempty"`
 	Kind       string      `yaml:"kind,omitempty"`
 	Metadata   Metadata    `yaml:"metadata,omitempty"`
 	Spec       IngressSpec `yaml:"spec,omitempty"`
 }
 type IngressSpec struct {
 	Rules []Rule `yaml:"rules,omitempty"`
 }
 type Rule struct {
 	HTTP HTTP `yaml:"http,omitempty"`
 }
 type HTTP struct {
 	Paths []Path `yaml:"paths,omitempty"`
 }
 type Path struct {
 	Path     string  `yaml:"path,omitempty"`
 	PathType string  `yaml:"pathType,omitempty"`
 	Backend  Backend `yaml:"backend,omitempty"`
 }
 type Backend struct {
 	ServiceName string `yaml:"serviceName,omitempty"`
 	ServicePort int64  `yaml:"servicePort,omitempty"`
 }
 func NewIngress(contract map[string]map[string]string, serviceName string) Ingress {
 	new_ingr := Ingress{
 		ApiVersion: "networking.k8s.io/v1",
 		Kind:       "Ingress",
 		Metadata: Metadata{
 			GenerateName: "ingress-argo-",
 		},
 		Spec: IngressSpec{
 			Rules: []Rule{
 				{
 					HTTP: HTTP{
 						Paths: []Path{},
 						},
 					},
 				},
 			},
 		}
 	for port_to_reverse_str, translations := range contract{
 		port, _ := strconv.ParseInt(port_to_reverse_str,10,64)
 		port_reverse := Path{
 			Path:     translations["reverse"],
 			PathType: "Prefix",
 			Backend: Backend{
 				ServiceName: serviceName,
 				ServicePort:port,
 			},
 		}
 		new_ingr.Spec.Rules[0].HTTP.Paths = append(new_ingr.Spec.Rules[0].HTTP.Paths, port_reverse)
 	}
 	return new_ingr
 }
--- a/models/k8s_manifest.go
+++ b/models/k8s_manifest.go
@ -0,0 +1,12 @@
 package models
 type Manifest struct {
 	ApiVersion string   `yaml:"apiVersion,omitempty"`
 	Kind       string   `yaml:"kind"`
 	Metadata   Metadata `yaml:"metadata,omitempty"`
 }
 type Metadata struct {
    Name      		string	`yaml:"name"`
    GenerateName	string	`yaml:"generateName"`
 }
--- a/models/services.go
+++ b/models/services.go
@ -1,5 +1,6 @@
 package models
 type ServiceResource struct {
 	Action            string `yaml:"action,omitempty"`
    SuccessCondition  string `yaml:"successCondition,omitempty"`
@ -9,15 +10,11 @@ type ServiceResource struct {
 }
 type Service struct {
-	APIVersion string      `yaml:"apiVersion"`
+    Manifest
 	Kind       string      `yaml:"kind"`
 	Metadata   Metadata    `yaml:"metadata"`
    Spec       ServiceSpec       `yaml:"spec"`
 }
-type Metadata struct {
+
 	Name string `yaml:"name"`
 }
 // ServiceSpec is the specification of the Kubernetes Service
 type ServiceSpec struct {
@ -30,7 +27,9 @@ type ServiceSpec struct {
 // ServicePort defines a port for a Kubernetes Service
 type ServicePort struct {
    Name       string `yaml:"name"`                 // Even if empty need to be in the yaml
    Protocol   string `yaml:"protocol,omitempty"`
-	Port       int    `yaml:"port"`
+    Port       int64  `yaml:"port"`
-	TargetPort int    `yaml:"targetPort,omitempty"`
+    TargetPort int64  `yaml:"targetPort,omitempty"`
    NodePort   int64  `yaml:"nodePort,omitempty"`
 }
--- a/models/template.go
+++ b/models/template.go
@ -1,12 +1,5 @@
 package models
 import (
 	"strings"
 	"cloud.o-forge.io/core/oc-lib/models/resources/processing"
 	"cloud.o-forge.io/core/oc-lib/models/resources/storage"
 )
 type Parameter struct {
 	Name  string `yaml:"name,omitempty"`
 	Value string `yaml:"value,omitempty"`
@ -19,28 +12,9 @@ type Container struct {
 	VolumeMounts []VolumeMount `yaml:"volumeMounts,omitempty"`
 }
 func (c *Container) AddVolumeMount(volumeMount VolumeMount, volumes []VolumeMount) []VolumeMount {
 	for _, vm := range c.VolumeMounts {
 		if vm.Name == volumeMount.Name {
 			return volumes
 		}
 	}
 	c.VolumeMounts = append(c.VolumeMounts, volumeMount)
 	for _, vm := range c.VolumeMounts {
 		for _, v := range volumes {
 			if vm.Name == v.Name {
 				return volumes
 			}
 		}
 	}
 	volumes = append(volumes, volumeMount)
 	return volumes
 }
 type VolumeMount struct {
 	Name      string `yaml:"name"`
 	MountPath string `yaml:"mountPath"`
 	Storage   *storage.StorageResource `yaml:"-"`
 }
 type Task struct {
@ -66,46 +40,7 @@ type Template struct {
 		Parameters []Parameter `yaml:"parameters"`
 	} `yaml:"inputs,omitempty"`
 	Container Container `yaml:"container,omitempty"`
-	Dag       *Dag             `yaml:"dag,omitempty"`
+	Dag       Dag       `yaml:"dag,omitempty"`
 	Metadata  TemplateMetadata `yaml:"metadata,omitempty"`
 	Resource  ServiceResource `yaml:"resource,omitempty"`
 }
 func (template *Template) CreateContainer(processing *processing.ProcessingResource, dag *Dag) {
 	container := Container{Image: processing.Container.Image}
 	if container.Image == "" {
 		return
 	}
 	container.Command = []string{"sh", "-c"} // all is bash
 	for name := range processing.Container.Env {
 		template.Inputs.Parameters = append(template.Inputs.Parameters, Parameter{Name: name})
 	}
 	for _, a := range strings.Split(processing.Container.Args, " ") {
 		container.Args = append(container.Args, template.replacePerEnv(a, processing.Container.Env, dag))
 	}
 	cmd := strings.ReplaceAll(processing.Container.Command, container.Image, "")
 	container.Args = []string{cmd + " " + strings.Join(container.Args, " ")}
 	template.Container = container
 }
 func (template *Template) replacePerEnv(arg string, envs map[string]string, dag *Dag) string {
 	for k, v := range envs {
 		if strings.Contains(arg, k) {
 			value := v
 			for _, task := range dag.Tasks {
 				if task.Name == template.Name {
 					for _, p := range task.Arguments.Parameters {
 						if p.Name == k {
 							value = p.Value
 							break
 						}
 					}
 				}
 			}
 			arg = strings.ReplaceAll(arg, "$"+k, value)
 			arg = strings.ReplaceAll(arg, "${"+k+"}", value)
 			arg = strings.ReplaceAll(arg, k, value)
 		}
 	}
 	return arg
 }
--- a/BIN
+++ b/BIN
--- a/test-logs-workflow.json
+++ b/test-logs-workflow.json
@ -4,7 +4,7 @@
    "0d565c87-50ae-4a73-843d-f8b2d4047772",
    "2ce0323f-a85d-4b8b-a783-5280f48d634a"
  ],
-  "computes": [
+  "datacenters": [
    "7b989e97-c3e7-49d2-a3a7-f959da4870b5"
  ],
  "graph": {
@ -79,17 +79,17 @@
        "id": "6a7e8860-7c26-4b70-9b3a-1bd27adcdfe1",
        "width": 0,
        "height": 0,
-        "compute" : {
+        "datacenter" : {
          "id": "7b989e97-c3e7-49d2-a3a7-f959da4870b5",
-          "name": "Mundi compute",
+          "name": "Mundi datacenter",
          "short_description": "Mundi Opencloud Instance",
          "description": "A very long description of what this data is",
-          "logo": "https://cloud.o-forge.io/core/deperecated-oc-catalog/src/branch/main/scripts/local_imgs/Mundi compute.png",
+          "logo": "https://cloud.o-forge.io/core/deperecated-oc-catalog/src/branch/main/scripts/local_imgs/Mundi datacenter.png",
          "owner": "IRT",
          "source_url": "http://www.google.com",
          "resource_model": {
            "id": "c3983010-1990-4ac0-8533-5389867e4424",
-            "resource_type": "compute_resource"
+            "resource_type": "datacenter_resource"
          },
          "cpus": [
            {
--- a/traefik-values.yaml
+++ b/traefik-values.yaml
@ -0,0 +1,11 @@
 globalArguments:
 deployment:
  kind: DaemonSet
 providers:
  kubernetesCRD:
    enabled: true
 service:
  type: LoadBalancer
 ingressRoute:
  dashboard:
    enabled: false
--- a/workflow_builder/argo_builder.go
+++ b/workflow_builder/argo_builder.go
@ -5,14 +5,16 @@
 package workflow_builder
 import (
-	"fmt"
+	"oc-monitord/models"
 	. "oc-monitord/models"
 	"os"
-	"regexp"
+	"slices"
 	"strconv"
 	"strings"
 	"time"
 	oclib "cloud.o-forge.io/core/oc-lib"
 	"cloud.o-forge.io/core/oc-lib/models/resource_model"
 	"cloud.o-forge.io/core/oc-lib/models/resources/processing"
 	"cloud.o-forge.io/core/oc-lib/models/resources/workflow/graph"
 	w "cloud.o-forge.io/core/oc-lib/models/workflow"
@ -23,41 +25,26 @@ import (
 var logger zerolog.Logger
 type ServiceExposure int 
 const (
 	PAT 	ServiceExposure = iota
 	Reverse
 	Both
 )
 type ArgoBuilder struct {
-	OriginWorkflow *w.Workflow
+	OriginWorkflow 	w.Workflow
 	Workflow       	Workflow
-	Services       []*Service
+	Services		[]Service
 	Timeout        	int
 }
 type Workflow struct {
-	ApiVersion string `yaml:"apiVersion"`
+	Manifest
-	Kind       string `yaml:"kind"`
+	Spec ArgoSpec `yaml:"spec,omitempty"`
 	Metadata   struct {
 		Name string `yaml:"name"`
 	} `yaml:"metadata"`
 	Spec Spec `yaml:"spec,omitempty"`
 }
-func (b *Workflow) setDag(dag *Dag) {
+type ArgoSpec struct {
 	for _, t := range b.Spec.Templates {
 		if t.Name == "dag" {
 			t.Dag = dag
 		}
 	}
 }
 func (b *Workflow) getDag() *Dag {
 	for _, t := range b.Spec.Templates {
 		if t.Name == "dag" {
 			return t.Dag
 		}
 	}
 	b.Spec.Templates = append(b.Spec.Templates, Template{Name: "dag", Dag: &Dag{}})
 	return b.Spec.Templates[len(b.Spec.Templates)-1].Dag
 }
 type Spec struct {
 	Entrypoint string                `yaml:"entrypoint"`
 	Arguments  []Parameter           `yaml:"arguments,omitempty"`
 	Volumes    []VolumeClaimTemplate `yaml:"volumeClaimTemplates,omitempty"`
@ -65,29 +52,32 @@ type Spec struct {
 	Timeout    int                   `yaml:"activeDeadlineSeconds,omitempty"`
 }
-func (b *ArgoBuilder) CreateDAG(write bool) (string, int, []string, []string, error) {
+
 func (b *ArgoBuilder) CreateDAG() (string, error) {
 	// handle services by checking if there is only one processing with hostname and port
-	firstItems, lastItems, volumes := b.createTemplates()
+		
-	b.createVolumes(volumes)
+	b.createTemplates()
 	b.createDAGstep()
 	b.createVolumes()
 	if b.Timeout > 0 {
 		b.Workflow.Spec.Timeout = b.Timeout
 	}
 	b.Workflow.Spec.Entrypoint = "dag"
-	b.Workflow.ApiVersion = "argoproj.io/v1alpha1"
+	b.Workflow.Manifest.ApiVersion = "argoproj.io/v1alpha1"
 	b.Workflow.Kind = "Workflow"
-	if !write {
+	random_name := generateWfName()
 		return "", len(b.Workflow.getDag().Tasks), firstItems, lastItems, nil
 	}
 	random_name := fakelish.GenerateFakeWord(5, 8) + "-" + fakelish.GenerateFakeWord(5, 8)
 	b.Workflow.Metadata.Name = "oc-monitor-" + random_name
 	logger = oclib.GetLogger()
 	yamlified, err := yaml.Marshal(b.Workflow)
 	if err != nil {
 		logger.Error().Msg("Could not transform object to yaml file")
-		return "", 0, firstItems, lastItems, err
+		return "", err
 	}
 	// Give a unique name to each argo file with its timestamp DD:MM:YYYY_hhmmss
 	current_timestamp := time.Now().Format("02_01_2006_150405")
 	file_name := random_name + "_" + current_timestamp + ".yml"
@ -95,206 +85,197 @@ func (b *ArgoBuilder) CreateDAG(write bool) (string, int, []string, []string, er
 	err = os.WriteFile(workflows_dir+file_name, []byte(yamlified), 0660)
 	if err != nil {
 		logger.Error().Msg("Could not write the yaml file")
-		return "", 0, firstItems, lastItems, err
+		return "", err
 	}
-	return file_name, len(b.Workflow.getDag().Tasks), firstItems, lastItems, nil
+
 	return file_name, nil
 }
-func (b *ArgoBuilder) createTemplates() ([]string, []string, []VolumeMount) {
+func (b *ArgoBuilder) createTemplates() {
-	volumes := []VolumeMount{}
+	for _, comp := range b.getProcessings() {
-	firstItems := []string{}
+		var command string
-	lastItems := []string{}
+		var args string
-	for _, comp := range b.OriginWorkflow.GetProcessings() {
+		var env string
-		if comp.Processing.Container != nil {
+		var serv models.Service
-			volumes, firstItems, lastItems = b.createArgoTemplates(
+
-				comp.ID, comp.Processing, volumes, firstItems, lastItems)
+		comp_res := comp.Processing
-		} else {
+
-			logger.Error().Msg("Not enough configuration setup, template can't be created : " + comp.Processing.GetName())
+		command = getStringValue(comp_res.AbstractResource, "command")
-			return firstItems, lastItems, volumes
+		args = getStringValue(comp_res.AbstractResource, "args")
 		env = getStringValue(comp_res.AbstractResource, "env")
 		image_name := strings.Split(command, " ")[0]   // TODO : decide where to store the image name, GUI or models.computing.Image
 		temp_container := Container{Image: image_name} // TODO : decide where to store the image name, GUI or models.computing.Image
 		temp_container.Command = getComputingCommands(command)
 		temp_container.Args = getComputingArgs(args, command)
 		// Only for dev purpose,
 		input_names := getComputingEnvironmentName(strings.Split(env, " "))
 		var inputs_container []Parameter
 		for _, name := range input_names {
 			inputs_container = append(inputs_container, Parameter{Name: name})
 		}
 		argo_name := getArgoName(comp_res.GetName(), comp.ID)
 		new_temp := Template{Name: argo_name, Container: temp_container}
 		new_temp.Inputs.Parameters = inputs_container
 		new_temp.Container.VolumeMounts = append(new_temp.Container.VolumeMounts, VolumeMount{Name: "workdir", MountPath: "/mnt/vol"}) // TODO : replace this with a search of the storage / data source name
 		if (b.isService(comp.ID)){
 			serv_type := getServiceExposure(*comp.Processing)
 			if serv_type == PAT || serv_type == Both{
 				serv = b.CreateKubeService(comp, NodePort)
 				b.addKubeServiceToWorkflow(serv, argo_name, comp.ID)
 				new_temp.Metadata.Labels = make(map[string]string)
 				new_temp.Metadata.Labels["app"] = serv.Spec.Selector["app"]		// Construct the template for the k8s service and add a link in graph between k8s service and processing
 				b.addServiceToArgo(serv)
 				ingress := b.CreateIngress(comp,serv)
 				b.addIngressToWorfklow(ingress, argo_name, comp.ID)
 			}
-	firstWfTasks := map[string][]string{}
+			if serv_type == Reverse || serv_type == Both{
-	latestWfTasks := map[string][]string{}
+				serv = b.CreateKubeService(comp, ClusterIP)
-	relatedWfTasks := map[string][]string{}
+				// create ingress by passing the service and the processing (or reverse)
-	for _, wf := range b.OriginWorkflow.GetWorkflows() {
+				b.addKubeServiceToWorkflow(serv, argo_name, comp.ID)
-		realWorkflow, code, err := w.New().LoadOne(wf.Workflow.WorkflowID)
+				new_temp.Metadata.Labels = make(map[string]string)
-		if code != 200 {
+				new_temp.Metadata.Labels["app"] = serv.Spec.Selector["app"]		// Construct the template for the k8s service and add a link in graph between k8s service and processing
-			logger.Error().Msg("Error loading the workflow : " + err.Error())
+				b.addServiceToArgo(serv)
 			continue
 			}
-		subBuilder := ArgoBuilder{OriginWorkflow: realWorkflow.(*w.Workflow), Timeout: b.Timeout}
+
-		_, _, fi, li, err := subBuilder.CreateDAG(false)
+			
-		if err != nil {
+			// if err != nil {
-			logger.Error().Msg("Error creating the subworkflow : " + err.Error())
+			// 	// TODO
-			continue
+			// }
 		}
-		firstWfTasks[wf.ID] = fi
+		
-		if ok, depsOfIds := subBuilder.isArgoDependancy(wf.ID); ok { // IS BEFORE
+		b.Workflow.Spec.Templates = append(b.Workflow.Spec.Templates, new_temp)
-			latestWfTasks[wf.ID] = li
+
 			relatedWfTasks[wf.ID] = depsOfIds
 	}
-		subDag := subBuilder.Workflow.getDag()
+
-		d := b.Workflow.getDag()
+
 		d.Tasks = append(d.Tasks, subDag.Tasks...) // add the tasks of the subworkflow to the main workflow
 		b.Workflow.Spec.Templates = append(b.Workflow.Spec.Templates, subBuilder.Workflow.Spec.Templates...)
 		b.Workflow.Spec.Volumes = append(b.Workflow.Spec.Volumes, subBuilder.Workflow.Spec.Volumes...)
 		b.Workflow.Spec.Arguments = append(b.Workflow.Spec.Arguments, subBuilder.Workflow.Spec.Arguments...)
 		b.Services = append(b.Services, subBuilder.Services...)
 	}
 	for wfID, depsOfIds := range relatedWfTasks {
 		for _, dep := range depsOfIds {
 			for _, task := range b.Workflow.getDag().Tasks {
 				if strings.Contains(task.Name, dep) {
 					index := -1
 					for i, depp := range task.Dependencies {
 						if strings.Contains(depp, wfID) {
 							index = i
 							break
 						}
 					}
 					if index != -1 {
 						task.Dependencies = append(task.Dependencies[:index], task.Dependencies[index+1:]...)
 					}
 					task.Dependencies = append(task.Dependencies, latestWfTasks[wfID]...)
 				}
 			}
 		}
 	}
 	for wfID, fi := range firstWfTasks {
 		deps := b.getArgoDependencies(wfID)
 		if len(deps) > 0 {
 			for _, dep := range fi {
 				for _, task := range b.Workflow.getDag().Tasks {
 					if strings.Contains(task.Name, dep) {
 						task.Dependencies = append(task.Dependencies, deps...)
 					}
 				}
 			}
 		}
 	}
 	if b.Services != nil {
 		dag := b.Workflow.getDag()
 		dag.Tasks = append(dag.Tasks, Task{Name: "workflow-service-pod", Template: "workflow-service-pod"})
 		b.addServiceToArgo()
 	}
 	return firstItems, lastItems, volumes
 }
-func (b *ArgoBuilder) createArgoTemplates(id string,
+func (b *ArgoBuilder) createDAGstep() {
-	processing *processing.ProcessingResource,
+	new_dag := Dag{}
-	volumes []VolumeMount,
+	for _, comp := range b.getProcessings() {
-	firstItems []string,
+		comp_res := comp.Processing
-	lastItems []string) ([]VolumeMount, []string, []string) {
+		env := getStringValue(comp_res.AbstractResource, "env")
-	_, firstItems, lastItems = b.addTaskToArgo(b.Workflow.getDag(), id, processing, firstItems, lastItems)
+		unique_name := getArgoName(comp_res.GetName(), comp.ID)
 	template := &Template{Name: getArgoName(processing.GetName(), id)}
 	template.CreateContainer(processing, b.Workflow.getDag())
 	// get datacenter from the processing
 	if processing.IsService {
 		b.CreateService(id, processing)
 		template.Metadata.Labels = make(map[string]string)
 		template.Metadata.Labels["app"] = "oc-service-" + processing.GetName() // Construct the template for the k8s service and add a link in graph between k8s service and processing
 	}
 	storages := b.OriginWorkflow.GetStoragesByRelatedProcessing(id)
 	for _, storage := range storages {
 		if storage.Local {
 			volumes = template.Container.AddVolumeMount(VolumeMount{
 				Name:      strings.ReplaceAll(strings.ToLower(storage.GetName()), " ", "-"),
 				MountPath: storage.Path,
 				Storage:   storage,
 			}, volumes)
 		}
 	}
 	b.Workflow.Spec.Templates = append(b.Workflow.Spec.Templates, *template)
 	return volumes, firstItems, lastItems
 }
 func (b *ArgoBuilder) addTaskToArgo(dag *Dag, graphItemID string, processing *processing.ProcessingResource,
 	firstItems []string, lastItems []string) (*Dag, []string, []string) {
 	unique_name := getArgoName(processing.GetName(), graphItemID)
 		step := Task{Name: unique_name, Template: unique_name}
-	if processing.Container != nil {
+		comp_envs := getComputingEnvironment(strings.Split(env, " "))
-		for name, value := range processing.Container.Env {
+
-			step.Arguments.Parameters = append(step.Arguments.Parameters, Parameter{
+		for name, value := range comp_envs {
-				Name:  name,
+			step.Arguments.Parameters = append(step.Arguments.Parameters, Parameter{Name: name, Value: value})
 				Value: b.affectVariableEnv(value, b.OriginWorkflow.Graph),
 			})
 		}
 		// retrieves the name (computing.name-computing.ID)
 		step.Dependencies = b.getDependency(comp.ID) // Error : we use the component ID instead of the GraphItem ID -> store objects
 		new_dag.Tasks = append(new_dag.Tasks, step)
 	}
-	step.Dependencies = b.getArgoDependencies(graphItemID)
+
-	name := ""
+	for i, _ := range b.Services {
-	if b.OriginWorkflow.Graph.Items[graphItemID].Processing != nil {
+		name := "workflow-service-pod-"+strconv.Itoa(i + 1)
-		name = b.OriginWorkflow.Graph.Items[graphItemID].Processing.GetName()
+		new_dag.Tasks = append(new_dag.Tasks, Task{Name: name , Template: name})
 	}
-	if b.OriginWorkflow.Graph.Items[graphItemID].Workflow != nil {
+
-		name = b.OriginWorkflow.Graph.Items[graphItemID].Workflow.GetName()
+	b.Workflow.Spec.Templates = append(b.Workflow.Spec.Templates, Template{Name: "dag", Dag: new_dag})
-	}
+	
 	if len(step.Dependencies) == 0 && name != "" {
 		firstItems = append(firstItems, getArgoName(name, graphItemID))
 	}
 	if ok, _ := b.isArgoDependancy(graphItemID); !ok && name != "" {
 		lastItems = append(lastItems, getArgoName(name, graphItemID))
 	}
 	dag.Tasks = append(dag.Tasks, step)
 	return dag, firstItems, lastItems
 }
-func (b *ArgoBuilder) affectVariableEnv(envVar string, graph *graph.Graph) string {
+func (b *ArgoBuilder) createVolumes() {
-	var myExp = regexp.MustCompile(`(\{\{.*\}\})`) // regex to find all the variables in the command
+	// For testing purposes we only declare one volume, mounted in each computing
-	matches := myExp.FindAllString(envVar, -1)     // find all the variables in the command
+	new_volume := VolumeClaimTemplate{}
-	for _, match := range matches {                // for each variable in the command
+	new_volume.Metadata.Name = "workdir"
-		splitted := strings.Split( // split the variable to get the inout and the vars only
+	new_volume.Spec.AccessModes = []string{"ReadWriteOnce"}
-			strings.ReplaceAll(strings.ReplaceAll(strings.ReplaceAll(match, "{{", ""), "}}", ""), " ", ""), "_")
+	new_volume.Spec.Resources.Requests.Storage = "1Gi"
-		if len(splitted) < 3 { // if the variable is not well formatted, we skip it
+	b.Workflow.Spec.Volumes = append(b.Workflow.Spec.Volumes, new_volume)
-			logger.Error().Msgf("The variable %v is not well formatted", match)
+}
 func (b *ArgoBuilder) getDependency(current_computing_id string) (dependencies []string) {
 	for _, link := range b.OriginWorkflow.Graph.Links {
 		if b.OriginWorkflow.Graph.Items[link.Source.ID].Processing == nil {
 			continue
 		}
 		graphItemID := splitted[1] // graphitemid is the id of the object
 		vars := splitted[2]        // vars is the name of the variable of the object
 		_, obj := graph.GetResource(graphItemID)
 		if obj != nil {
 			envVar = strings.ReplaceAll(envVar, match, fmt.Sprintf("%v", obj.Serialize()[vars]))
 		}
 	}
 	return envVar
 }
 func (b *ArgoBuilder) createVolumes(volumes []VolumeMount) { // TODO : one think about remote volume but TG
 	for _, volume := range volumes {
 		new_volume := VolumeClaimTemplate{}
 		new_volume.Metadata.Name = strings.ReplaceAll(strings.ToLower(volume.Name), " ", "-")
 		new_volume.Spec.AccessModes = []string{"ReadWriteOnce"}
 		new_volume.Spec.Resources.Requests.Storage = fmt.Sprintf("%v", volume.Storage.Size) + volume.Storage.SizeType.ToArgo()
 		b.Workflow.Spec.Volumes = append(b.Workflow.Spec.Volumes, new_volume)
 	}
 }
 func (b *ArgoBuilder) isArgoDependancy(id string) (bool, []string) {
 	dependancyOfIDs := []string{}
 	isDeps := false
 	for _, link := range b.OriginWorkflow.Graph.Links {
 		source := b.OriginWorkflow.Graph.Items[link.Destination.ID].Processing
 		if id == link.Source.ID && source != nil {
 			isDeps = true
 			dependancyOfIDs = append(dependancyOfIDs, getArgoName(source.GetName(), link.Destination.ID))
 		}
 		wourceWF := b.OriginWorkflow.Graph.Items[link.Destination.ID].Workflow
 		if id == link.Source.ID && wourceWF != nil {
 			isDeps = true
 			dependancyOfIDs = append(dependancyOfIDs, getArgoName(wourceWF.GetName(), link.Destination.ID))
 		}
 	}
 	return isDeps, dependancyOfIDs
 }
 func (b *ArgoBuilder) getArgoDependencies(id string) (dependencies []string) {
 	for _, link := range b.OriginWorkflow.Graph.Links {
 		source := b.OriginWorkflow.Graph.Items[link.Source.ID].Processing
-		if id == link.Destination.ID && source != nil {
+		if current_computing_id == link.Destination.ID && source != nil {
 			dependency_name := getArgoName(source.GetName(), link.Source.ID)
 			dependencies = append(dependencies, dependency_name)
 			continue
 		}
 	}
 	return
 }
 func getComputingCommands(user_input string) []string {
 	user_input = removeImageName(user_input)
 	if len(user_input) == 0 {
 		return []string{}
 	}
 	return strings.Split(user_input, " ")
 }
 func getComputingArgs(user_input string, command string) (list_args []string) {
 	if len(user_input) == 0 {
 		return
 	}
 	args := strings.Split(user_input," ")
 	// quickfix that might need improvement
 	if strings.Contains(command, "sh -c") {
 		list_args = append(list_args, strings.Join(args, " "))
 		return
 	}
 	list_args = append(list_args, args...)
 	return
 }
 // Currently implements code to overcome problems in data structure
 func getComputingEnvironment(user_input []string) (map_env map[string]string) {
 	logger := oclib.GetLogger()
 	is_empty := len(user_input) == 0
 	is_empty_string := len(user_input) == 1 && user_input[0] == ""
 	if is_empty || is_empty_string {
 		return
 	}
 	if len(user_input) == 1 {
 		user_input = strings.Split(user_input[0], ",")
 	}
 	map_env = make(map[string]string, 0)
 	for _, str := range user_input {
 		new_pair := strings.Split(str, "=")
 		if len(new_pair) != 2 {
 			logger.Error().Msg("Error extracting the environment variable from " + str)
 			panic(0)
 		}
 		map_env[new_pair[0]] = new_pair[1]
 	}
 	return
 }
 func getComputingEnvironmentName(user_input []string) (list_names []string) {
 	env_map := getComputingEnvironment(user_input)
 	for name := range env_map {
 		list_names = append(list_names, name)
 	}
 	return
 }
 func generateWfName() (Name string) {
 	Name = fakelish.GenerateFakeWord(5, 8) + "-" + fakelish.GenerateFakeWord(5, 8)
 	return
 }
 func getArgoName(raw_name string, component_id string) (formatedName string) {
@ -303,3 +284,77 @@ func getArgoName(raw_name string, component_id string) (formatedName string) {
 	formatedName = strings.ToLower(formatedName)
 	return
 }
 func removeImageName(user_input string) string {
 	// First command is the name of the container for now
 	if len(strings.Split(user_input, " ")) == 1 {
 		return ""
 	}
 	slice_input := strings.Split(user_input, " ")
 	new_slice := slice_input[1:]
 	user_input = strings.Join(new_slice, " ")
 	return user_input
 }
 // Return the graphItem containing a Processing resource, so that we have access to the ID of the graphItem in order to identify it in the links
 func (b *ArgoBuilder) getProcessings() (list_computings []graph.GraphItem) {
 	for _, item := range b.OriginWorkflow.Graph.Items {
 		if item.Processing != nil {
 			list_computings = append(list_computings, item)
 		}
 	}
 	return
 }
 // Pass a GraphItem's UUID and not the ID  
 func (b *ArgoBuilder) IsProcessing(component_uuid string) bool {
 	return slices.Contains(b.OriginWorkflow.Processings, component_uuid)
 }
 func getStringValue(comp resource_model.AbstractResource, key string) string {
 	if res := comp.GetModelValue(key); res != nil {
 		return res.(string)
 	}
 	return ""
 }
 func (b *ArgoBuilder) isService(id string) bool{
 	comp := b.OriginWorkflow.Graph.Items[id]
 	if comp.Processing == nil {
 		return false
 	}
 	_, is_exposed := comp.Processing.ResourceModel.Model["expose"]
 	return is_exposed
 }
 func getServiceExposure(service processing.ProcessingResource) ServiceExposure{
 	var exposure_type ServiceExposure
 	contract := getExposeContract(service.ResourceModel.Model["expose"])
 	_, pat := contract["PAT"]
 	_, reverse := contract["reverse"]
 	if pat && reverse {
 		exposure_type=  Both
 	}
 	if pat {
 		exposure_type = PAT
 	}
 	if reverse{
 		exposure_type = Reverse 
 	}
 	return exposure_type
 }
 func (b *ArgoBuilder) CreateIngress(processing processing.ProcessingResource, service Service) Ingress{
 	contract := getExposeContract(processing.ResourceModel.Model["expose"])
 	new_ingress := models.NewIngress(contract,service.Metadata.Name)
 	return new_ingress
 }
--- a/workflow_builder/argo_services.go
+++ b/workflow_builder/argo_services.go
@ -2,54 +2,165 @@ package workflow_builder
 import (
 	"oc-monitord/models"
 	"strconv"
 	"strings"
-	"cloud.o-forge.io/core/oc-lib/models/resources/processing"
+	"cloud.o-forge.io/core/oc-lib/models/resource_model"
 	"cloud.o-forge.io/core/oc-lib/models/resources/workflow/graph"
 	"github.com/nwtgck/go-fakelish"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"gopkg.in/yaml.v3"
 )
-func (b *ArgoBuilder) CreateService(id string, processing *processing.ProcessingResource) {
+type ServiceType string 
-	new_service := models.Service{
+
-		APIVersion: "v1",
+const (
-		Kind:       "Service",
+	NodePort	ServiceType = "NodePort"
-		Metadata: models.Metadata{
+	ClusterIP	ServiceType = "ClusterIP"
-			Name: "workflow-service",
+)
-		},
+
-		Spec: models.ServiceSpec{
+// TODO : refactor this method or the deserialization process in oc-lib to get rid of the mongo code
-			Selector: map[string]string{"app": "oc-service"},
+func getExposeContract(expose resource_model.Model) map[string]map[string]string {
-			Ports:    []models.ServicePort{},
+	contract := make(map[string]map[string]string,0)
-			Type:     "NodePort",
+	
-		},
+	mapped_info := bson.M{}
 	// var contract PortTranslation
 	_ , byt, _ := bson.MarshalValue(expose.Value)
 	bson.Unmarshal(byt,&mapped_info)
 	for _,v := range mapped_info {
 		port := v.(primitive.M)["Key"].(string)
 		// exposed_port := map[string]interface{}{data["Key"] : ""}
 		port_translation := v.(primitive.M)["Value"]
 		contract[port] = map[string]string{}
 		for _,v2 := range port_translation.(primitive.A) {
 			if v2.(primitive.M)["Key"] == "reverse" {
 				contract[port]["reverse"] = v2.(primitive.M)["Value"].(string)
 			}
-	if processing == nil {
+			if v2.(primitive.M)["Key"] == "PAT" {
-		return
+				contract[port]["PAT"] = v2.(primitive.M)["Value"].(string)
 			}
-	b.completeServicePorts(&new_service, id, processing)
+		}
-	b.Services = append(b.Services, &new_service)
+	}
 	return contract
 }
-func (b *ArgoBuilder) completeServicePorts(service *models.Service, id string, processing *processing.ProcessingResource) {
+
-	for _, execute := range processing.Expose {
+func (b *ArgoBuilder) CreateKubeService(processing graph.GraphItem, service_type ServiceType) models.Service{
-		if execute.PAT != 0 {
+	
 	// model {
 	// 	Type : "dict",
 	// 	Value : {
 	// 		"80" : {
 	// 			"reverse"	: "",
 	// 			"PAT"		: "34000"	
 	// 		},
 	// 		"344" : {
 	// 			"reverse"	: "",
 	// 			"PAT"		: "34400"	
 	// 		}
 	// 	} 
 	// }
 	new_service := models.Service{
 		Manifest: models.Manifest{
 			ApiVersion: "v1", 
 			Kind: "Service", 
 			Metadata: models.Metadata{
 				Name: "workflow-service-"+ processing.Processing.Name + "-" + processing.ID ,
 				},
 			},
 			Spec: models.ServiceSpec{
 				Selector: map[string]string{"app": "service-" + fakelish.GenerateFakeWord(5, 8)},
 				Ports: []models.ServicePort{
 				},
 				Type: string(service_type),
 			},
 	}
 	completeServicePorts(&new_service, processing)
 	return new_service
 }
 func completeServicePorts(service *models.Service, processing graph.GraphItem) {
 	contract := getExposeContract(processing.Processing.ResourceModel.Model["expose"])
 	for str_port,translation_dict := range contract{
 		port, err := strconv.ParseInt(str_port, 10, 64)
 		if err != nil {
 			logger.Error().Msg("Could not convert " + str_port + "to an int")
 			return
 		}
 		// This condition allows us to create NodePort if PAT is filled or a ClusterIP that only expose port 80 and 443 (for Ingress)
 		if _, ok := translation_dict["PAT"]; ok{
 			port_translation, err := strconv.ParseInt(translation_dict["PAT"], 10, 64)
 			if err != nil {
 				logger.Error().Msg("Could not convert " + translation_dict["PAT"] + "to an int")
 				return
 			}
 			new_port_translation := models.ServicePort{
-				Name:       strings.ToLower(processing.Name) + id,
+				Name: strings.ToLower(processing.Processing.Name) + processing.ID,
-				Port:       execute.Port,
+				Port:  port_translation-30000,
-				TargetPort: execute.PAT,
+				TargetPort: port,
 				NodePort: port_translation,
 				Protocol: "TCP",
 			}
 			service.Spec.Ports = append(service.Spec.Ports, new_port_translation)
 		} else {
 			port_spec := []models.ServicePort{
 				models.ServicePort{
 					Name: strings.ToLower(processing.Processing.Name) + processing.ID + "-80",
 					Port:  80,
 					TargetPort: 80,
 					Protocol: "TCP",
 			},
 			models.ServicePort{
 				Name: strings.ToLower(processing.Processing.Name) + processing.ID + "-443",
 				Port:  443,
 				TargetPort: 443,
 				Protocol: "TCP",
 			},
 		}
 		service.Spec.Ports = append(service.Spec.Ports,port_spec...)
 		}
 	}
 	return
 }
-func (b *ArgoBuilder) addServiceToArgo() error {
+// The k8s service passed as the parameter only expose one port because it is the result of CreateService()
-	for _, service := range b.Services {
+// we check if this port is already exposed by a service in the workflow and we proceed to the creation of a new service OR 
 // add the port to the list of port exposed by an existing if portAlreadyExposed is false 
 func (b *ArgoBuilder) addKubeServiceToWorkflow(service models.Service, processing_name string, processing_id string) (label string) {
 	if exposed, service_available_port := b.portAlreadyExposed(service.Spec.Ports[0].TargetPort); exposed && service_available_port != nil{
 		// The port you want to expose is already exposed by all the existing services
 		service_available_port.Spec.Ports = append(service_available_port.Spec.Ports, service.Spec.Ports...)
 		return service_available_port.Spec.Selector["app"]
 	} 
 	b.Services = append(b.Services, service)
 	return service.Spec.Selector["app"]	
 }
 func (b *ArgoBuilder) addServiceToArgo(service models.Service) error {
 	service_manifest, err := yaml.Marshal(service)
 	if err != nil {
-			logger.Error().Msg("Could not marshal service manifest : " + err.Error())
+		logger.Error().Msg("Could not marshal service manifest")
 		return err
 	}
-		service_template := models.Template{Name: "workflow-service-pod",
+	
 	service_template := models.Template{Name: "workflow-service-pod-" + strconv.Itoa(len(b.Services)), 
 								Resource: models.ServiceResource{
 									Action: "create", 
 									SuccessCondition: "status.succeeded > 0",
@ -59,6 +170,46 @@ func (b *ArgoBuilder) addServiceToArgo() error {
 									},
 								}
 	b.Workflow.Spec.Templates = append(b.Workflow.Spec.Templates, service_template)
-	}
+
 	return nil
 }
 func (b *ArgoBuilder) addLabel(name string, id string) {
 	argo_name := getArgoName(name,id)
 	for _, template := range b.Workflow.Spec.Templates{
 		if template.Name == argo_name{
 			template.Metadata.Labels["app"] = "service-workflow"			
 			return
 		}
 	}
 }
 func (b *ArgoBuilder) portAlreadyExposed(port int64) (exposed bool, service *models.Service ){
 	// For all already existing k8s services, test if the port in parameter is already exposed and returns the first service that doesn't yet expose this port 
 	for _, s := range b.Services {
 		i := 0
 		port_exposed := false
 		for !port_exposed {
 			if s.Spec.Ports[i].TargetPort == port {
 				port_exposed = true
 			}
 		}
 		if !port_exposed {
 			return false, &s
 		}
 	}
 	return true, nil
 }
 // If contract has a reverse value
 	// Test if service already exist for the argo service
 		// Yes : create ingress, associate it with the existing kube service (name + exposed port on service) 
 		// No : 
 			// - create template for a service that expose the port of the argo service (pod)
 			// - store the name of the service and its port exposed
 			// - create template for an ingress : manifest must contain the path, name of the service and port exposed on the service
 func (b *ArgoBuilder) addIngress(){
 }
--- a/workflow_builder/graph.go
+++ b/workflow_builder/graph.go
@ -26,7 +26,6 @@ func (w *WorflowDB) getWorkflow(workflow_id string) (workflow *workflow.Workflow
 	logger := oclib.GetLogger()
 	lib_data := oclib.LoadOne(oclib.LibDataEnum(oclib.WORKFLOW), workflow_id)
 	fmt.Println(lib_data.Code, lib_data.Err)
 	if lib_data.Code != 200 {
 		logger.Error().Msg("Error loading the graph")
 		return workflow, errors.New(lib_data.Err)
@ -40,20 +39,20 @@ func (w *WorflowDB) getWorkflow(workflow_id string) (workflow *workflow.Workflow
 	return new_wf, nil
 }
-func (w *WorflowDB) ExportToArgo(timeout int) (string, int, error) {
+func (w *WorflowDB) ExportToArgo(timeout int) (string, error) {
 	logger := oclib.GetLogger()
 	if len(w.Workflow.Name) == 0 || w.Workflow.Graph == nil {
-		return "", 0, fmt.Errorf("can't export a graph that has not been loaded yet")
+		return "", fmt.Errorf("can't export a graph that has not been loaded yet")
 	}
-	argo_builder := ArgoBuilder{OriginWorkflow: w.Workflow, Timeout: timeout}
+	argo_builder := ArgoBuilder{OriginWorkflow: *w.Workflow, Timeout: timeout}
-	filename, stepMax, _, _, err := argo_builder.CreateDAG(true)
+	filename, err := argo_builder.CreateDAG()
 	if err != nil {
 		logger.Error().Msg("Could not create the argo file for " + w.Workflow.Name)
-		return "", 0, err
+		return "", err
 	}
-	return filename, stepMax, nil
+	return filename, nil
 }
 // TODO implement this function
Author	SHA1	Message	Date
pb	2f9b2fb464	creating services inside the argo manifest	2024-12-23 16:05:25 +01:00
pb	d1dab992cf	updated deployment requirement	2024-09-06 14:24:20 +02:00
pb	52278609bd	Merge branch 'main' of https://cloud.o-forge.io/core/oc-monitord into services_demo	2024-09-05 11:45:08 +02:00
pb	ed48fc0a55	improve handling of same port translation	2024-09-04 17:12:54 +02:00
pb	03ad8c084d	add nginx conf file	2024-09-03 18:11:37 +02:00