diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..5601d3bbb232b817dddb815531d4697e507721ab
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/target/
+.project
+.classpath
+/.settings
diff --git a/Dockerfile.cridge b/Dockerfile.cridge
new file mode 100644
index 0000000000000000000000000000000000000000..71e8ca99e949f3c43764185b0dcf271d2c960ac3
--- /dev/null
+++ b/Dockerfile.cridge
@@ -0,0 +1,6 @@
+FROM ibm-semeru-runtimes:open-17.0.7_7-jdk
+MAINTAINER openslice.io
+RUN mkdir /opt/shareclasses
+RUN mkdir -p /opt/openslice/lib/
+COPY target/org.etsi.osl.tmf.api-1.2.0-SNAPSHOT-exec.jar /opt/openslice/lib/
+CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.cridge-1.2.0-SNAPSHOT-exec.jar"]
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..261eeb9e9f8b2b4b0d119366dda99c6fd7d35c64
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/README.md b/README.md
index 7069b5fa928c0ae11e03819f25e4a9da10bf7e1d..2f649ae9a9fec4df01edbefcd6eb91bd8123bd1d 100644
--- a/README.md
+++ b/README.md
@@ -1,92 +1,4 @@
 # org.etsi.osl.cridge
+Openslice CRD 2 TMF bridge services. It is used to translate K8S resource models to TMF models.
 
-
-
-## Getting started
-
-To make it easy for you to get started with GitLab, here's a list of recommended next steps.
-
-Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
-
-## Add your files
-
-- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
-- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
-
-```
-cd existing_repo
-git remote add origin https://labs.etsi.org/rep/osl/code/org.etsi.osl.cridge.git
-git branch -M main
-git push -uf origin main
-```
-
-## Integrate with your tools
-
-- [ ] [Set up project integrations](https://labs.etsi.org/rep/osl/code/org.etsi.osl.cridge/-/settings/integrations)
-
-## Collaborate with your team
-
-- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
-- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
-- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
-- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
-- [ ] [Automatically merge when pipeline succeeds](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
-
-## Test and Deploy
-
-Use the built-in continuous integration in GitLab.
-
-- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
-- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
-- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
-- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
-- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
-
-***
-
-# Editing this README
-
-When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.
-
-## Suggestions for a good README
-Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
-
-## Name
-Choose a self-explaining name for your project.
-
-## Description
-Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
-
-## Badges
-On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
-
-## Visuals
-Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
-
-## Installation
-Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
-
-## Usage
-Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
-
-## Support
-Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
-
-## Roadmap
-If you have ideas for releases in the future, it is a good idea to list them in the README.
-
-## Contributing
-State if you are open to contributions and what your requirements are for accepting them.
-
-For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
-
-You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
-
-## Authors and acknowledgment
-Show your appreciation to those who have contributed to the project.
-
-## License
-For open source projects, say how it is licensed.
-
-## Project status
-If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
+It also can receive resource LCM from OSOM and manage the local K8S defined resources.
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d8026334095d61b2b5c1eb1f376bcdb6b134ad63
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,251 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.etsi.osl</groupId>
+		<artifactId>org.etsi.osl.main</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+		<relativePath>../org.etsi.osl.main</relativePath>
+	</parent>
+
+	<artifactId>org.etsi.osl.cridge</artifactId>
+
+	<name>org.etsi.osl.cridge</name>
+	<url>http://openslice.io</url>
+
+
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<spring.boot-version>${spring-boot-version}</spring.boot-version>
+		<spring.boot.fabric8-version>3.0.3</spring.boot.fabric8-version>
+		<fabric8.version>6.7.2</fabric8.version>
+		<camel.version>4.0.0-RC1</camel.version>
+		<slf4j-api.version>1.7.5</slf4j-api.version>
+		<slf4j-simple.version>1.7.28</slf4j-simple.version>
+	</properties>
+
+	<dependencyManagement>
+		<dependencies>
+			<!-- Spring Boot BOM -->
+			<dependency>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-dependencies</artifactId>
+				<version>${spring.boot-version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-starter-kubernetes-fabric8-all</artifactId>
+				<version>${spring.boot.fabric8-version}</version>
+			</dependency>
+
+			<!-- Camel BOM -->
+			<dependency>
+				<groupId>org.apache.camel.springboot</groupId>
+				<artifactId>camel-spring-boot-dependencies</artifactId>
+				<version>${camel.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+
+		</dependencies>
+
+	</dependencyManagement>
+
+	<dependencies>
+
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
+
+
+
+		<!-- fabric8 -->
+
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-kubernetes-fabric8-all</artifactId>
+		</dependency>
+
+
+		<dependency>
+			<groupId>org.etsi.osl</groupId>
+			<artifactId>org.etsi.osl.tmf.api</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		
+		
+		
+		<!-- activeMQ -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-activemq</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.activemq</groupId>
+			<artifactId>activemq-amqp</artifactId>
+			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.qpid</groupId>
+					<artifactId>proton-j</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.messaginghub</groupId>
+			<artifactId>pooled-jms</artifactId>
+		</dependency>
+
+		<!-- Camel -->
+		<dependency>
+			<groupId>org.apache.camel.springboot</groupId>
+			<artifactId>camel-spring-boot-starter</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.activemq</groupId>
+			<artifactId>activemq-pool</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.camel</groupId>
+			<artifactId>camel-activemq</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.activemq</groupId>
+					<artifactId>activemq-broker</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.camel.springboot</groupId>
+			<artifactId>camel-service-starter</artifactId>
+		</dependency>
+
+		<dependency>
+  			<groupId>org.apache.camel.springboot</groupId>
+			<artifactId>camel-http-starter</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.camel</groupId>
+			<artifactId>camel-jackson</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.camel</groupId>
+			<artifactId>camel-stream</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+		</dependency>
+
+	</dependencies>
+
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-maven-plugin</artifactId>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<configuration>
+						<source>17</source>
+						<target>17</target>
+						<annotationProcessorPaths>
+							<path>
+								<groupId>org.projectlombok</groupId>
+								<artifactId>lombok</artifactId>
+							</path>
+						</annotationProcessorPaths>
+					</configuration>
+				</plugin>
+				<plugin>
+					<!-- run mvn license:update-file-header to manually update all headers 
+						everywhere -->
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>license-maven-plugin</artifactId>
+					<version>${maven-license-plugin.version}</version>
+					<configuration>
+						<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
+						<processStartTag>========================LICENSE_START=================================</processStartTag>
+						<processEndTag>=========================LICENSE_END==================================</processEndTag>
+						<excludes>*.json</excludes>
+					</configuration>
+					<executions>
+						<execution>
+							<id>generate-license-headers</id>
+							<goals>
+								<goal>update-file-header</goal>
+							</goals>
+							<phase>process-sources</phase>
+							<configuration>
+								<licenseName>${license.licenseName}</licenseName>
+
+							</configuration>
+						</execution>
+						<execution>
+							<id>download-licenses</id>
+							<goals>
+								<goal>download-licenses</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<version>${spring-boot-version}</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<version>${spring-boot-version}</version>
+				<configuration>
+					<classifier>exec</classifier>
+				</configuration>
+			</plugin>
+		</plugins>
+
+	</build>
+
+
+
+</project>
diff --git a/src/main/java/org/etsi/osl/cridge/ActiveMQComponentConfig.java b/src/main/java/org/etsi/osl/cridge/ActiveMQComponentConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..b961569f22b7d857e8c9693a0005e4b7f4768368
--- /dev/null
+++ b/src/main/java/org/etsi/osl/cridge/ActiveMQComponentConfig.java
@@ -0,0 +1,42 @@
+/*-
+ * ========================LICENSE_START=================================
+ * org.etsi.osl.bugzilla
+ * %%
+ * Copyright (C) 2019 openslice.io
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * =========================LICENSE_END==================================
+ */
+package org.etsi.osl.cridge;
+
+
+import org.apache.camel.component.activemq.ActiveMQComponent;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import jakarta.jms.ConnectionFactory;
+
+/**
+ * @author ctranoris
+ *
+ */
+@Configuration
+public class ActiveMQComponentConfig {
+
+    @Bean(name = "activemq")
+    public ActiveMQComponent createComponent(ConnectionFactory factory) {
+        ActiveMQComponent activeMQComponent = new ActiveMQComponent();
+		activeMQComponent.setConnectionFactory( factory );
+        return activeMQComponent;
+    }
+}
diff --git a/src/main/java/org/etsi/osl/cridge/CRRouteBuilder.java b/src/main/java/org/etsi/osl/cridge/CRRouteBuilder.java
new file mode 100644
index 0000000000000000000000000000000000000000..e6cf5cb4e155d69582514ea36bff6432901061db
--- /dev/null
+++ b/src/main/java/org/etsi/osl/cridge/CRRouteBuilder.java
@@ -0,0 +1,88 @@
+package org.etsi.osl.cridge;
+
+import java.util.concurrent.ConcurrentHashMap;
+import org.apache.camel.LoggingLevel;
+import org.apache.camel.builder.RouteBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import io.fabric8.kubernetes.api.model.Namespace;
+import io.fabric8.kubernetes.api.model.NamespaceBuilder;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClientBuilder;
+import org.etsi.osl.tmf.rcm634.model.ResourceSpecification;
+import lombok.Getter;
+
+@Service
+@Getter
+public class CRRouteBuilder  extends RouteBuilder{
+
+	@Value("${CRD_DEPLOY_CR_REQ}")
+	private String CRD_DEPLOY_CR_REQ = "";
+
+
+    @Value("${CRD_PATCH_CR_REQ}")
+    private String CRD_PATCH_CR_REQ = "";
+    
+    @Value("${CRD_DELETE_CR_REQ}")
+    private String CRD_DELETE_CR_REQ = "";
+	
+
+	@Autowired
+	private KubernetesClientResource kubernetesClientResource;
+	
+	
+	private static final Logger logger = LoggerFactory.getLogger( CRRouteBuilder.class.getSimpleName());
+
+	@Override
+	public void configure() throws Exception {
+		
+		from( CRD_DEPLOY_CR_REQ )
+		.log(LoggingLevel.INFO, log, CRD_DEPLOY_CR_REQ + " message received!")
+		.to("log:DEBUG?showBody=true&showHeaders=true")
+		.bean( kubernetesClientResource, "deployCR(${headers}, ${body})")
+		.convertBodyTo( String.class );
+		
+		from( CRD_DELETE_CR_REQ )
+        .log(LoggingLevel.INFO, log, CRD_DELETE_CR_REQ + " message received!")
+        .to("log:DEBUG?showBody=true&showHeaders=true")
+        .bean( kubernetesClientResource, "deleteCR(${headers}, ${body})")
+        .convertBodyTo( String.class );
+        
+        from( CRD_PATCH_CR_REQ )
+        .log(LoggingLevel.INFO, log, CRD_PATCH_CR_REQ + " message received!")
+        .to("log:DEBUG?showBody=true&showHeaders=true")
+        .bean( kubernetesClientResource, "patchCR(${headers}, ${body})")
+        .convertBodyTo( String.class );
+        
+        
+      from( "timer://processUpdateResources?period=60000" )
+      .log(LoggingLevel.INFO, log, " process nameSpacesTobeDeleted!")
+      .to("log:DEBUG?showBody=true&showHeaders=true")
+      .bean( CRRouteBuilder.class , "processNameSpacesTobeDeleted()");
+		
+	}
+	
+	 public void processNameSpacesTobeDeleted() {
+	   
+	   kubernetesClientResource.getNameSpacesTobeDeleted().forEach( (nameSpaceName, nameSpaceId) -> {
+	     
+	     try (final KubernetesClient k8s = new KubernetesClientBuilder().build()) {
+	       logger.info("Trying to delete namespace {}", nameSpaceName);
+	       Namespace ns = new NamespaceBuilder()
+	            .withNewMetadata()
+	            .withName( nameSpaceName )
+	            .endMetadata().build();
+	        k8s.namespaces().resource(ns).delete();     
+	        
+	        kubernetesClientResource.getNameSpacesTobeDeleted().remove(nameSpaceName);
+	     }catch (Exception e) {
+	        e.printStackTrace();
+	      }
+	    });
+	   
+	 }
+
+}
diff --git a/src/main/java/org/etsi/osl/cridge/CatalogClient.java b/src/main/java/org/etsi/osl/cridge/CatalogClient.java
new file mode 100644
index 0000000000000000000000000000000000000000..76eff954bdc667155ab9ff9da55a7b329025ca34
--- /dev/null
+++ b/src/main/java/org/etsi/osl/cridge/CatalogClient.java
@@ -0,0 +1,295 @@
+package org.etsi.osl.cridge;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.apache.camel.LoggingLevel;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.dataformat.JsonLibrary;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import org.etsi.osl.model.DeploymentDescriptor;
+import org.etsi.osl.tmf.rcm634.model.LogicalResourceSpecification;
+import org.etsi.osl.tmf.rcm634.model.ResourceSpecification;
+import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationCreate;
+import org.etsi.osl.tmf.ri639.model.LogicalResource;
+import org.etsi.osl.tmf.ri639.model.Resource;
+import org.etsi.osl.tmf.ri639.model.ResourceCreate;
+import org.etsi.osl.tmf.ri639.model.ResourceUpdate;
+
+/**
+ * @author ctranoris
+ */
+@Service
+public class CatalogClient  extends RouteBuilder{
+
+
+	private static final Logger logger = LoggerFactory.getLogger( CatalogClient.class.getSimpleName());
+
+    @Autowired
+    private ProducerTemplate template;
+
+	@Value("${CATALOG_ADD_RESOURCESPEC}")
+	private String CATALOG_ADD_RESOURCESPEC = "";
+
+	@Value("${CATALOG_UPD_RESOURCESPEC}")
+	private String CATALOG_UPD_RESOURCESPEC = "";
+	
+	@Value("${CATALOG_GET_RESOURCESPEC_BY_ID}")
+	private String CATALOG_GET_RESOURCESPEC_BY_ID = "";
+
+	@Value("${CATALOG_GET_RESOURCESPEC_BY_ΝAME_CATEGORY}")
+	private String CATALOG_GET_RESOURCESPEC_BY_ΝAME_CATEGORY = "";
+
+
+	@Value("${CATALOG_UPDADD_RESOURCESPEC}")
+	private String CATALOG_UPDADD_RESOURCESPEC = "";
+	
+	
+	@Value("${CATALOG_UPDADD_RESOURCE}")
+	private String CATALOG_UPDADD_RESOURCE = "";
+	
+
+    @Value("${CATALOG_UPD_RESOURCE}")
+    private String CATALOG_UPD_RESOURCE = "";
+
+	@Value("${CATALOG_GET_RESOURCE_BY_ID}")
+	private String CATALOG_GET_RESOURCE_BY_ID = "";
+	
+	
+    //private ConcurrentHashMap<String, ResourceUpdate> resourcesToBeUpdated = new ConcurrentHashMap<>();
+	
+
+	@Override
+	public void configure() throws Exception {
+
+
+	  
+//	  from( "timer://processUpdateResources?period=5000" )
+//      .log(LoggingLevel.INFO, log, " process processUpdateResources!")
+//      .to("log:DEBUG?showBody=true&showHeaders=true")
+//      .bean( "catalogClient", "processUpdateResources()");
+		
+	
+	}
+	
+	
+	/**
+	 * get  service spec by id from model via bus
+	 * @param id
+	 * @return
+	 * @throws IOException
+	 */
+	public ResourceSpecification retrieveResourceSpecByNameCategoryVersion(String aName, String aCategory, String aVersion) {
+		logger.info("will retrieve Resource Specification aName=" + aName   );
+		
+		try {
+			Map<String, Object> map = new HashMap<>();
+			map.put( "aname", aName);
+			map.put( "acategory", aCategory);
+			map.put( "aversion", aVersion);
+			Object response = 
+					template.requestBodyAndHeaders( CATALOG_GET_RESOURCESPEC_BY_ΝAME_CATEGORY, null, map);
+
+			if ( !(response instanceof String)) {
+				logger.error("Resource Specification object is wrong.");
+				return null;
+			}
+			LogicalResourceSpecification sor = toJsonObj( (String)response, LogicalResourceSpecification.class); 
+			//logger.debug("retrieveSpec response is: " + response);
+			return sor;
+			
+		}catch (Exception e) {
+			logger.error("Cannot retrieve Resource Specification details from catalog. " + e.toString());
+		}
+		return null;
+	}
+	
+	/**
+	 * get  service spec by id from model via bus
+	 * @param id
+	 * @return
+	 * @throws IOException
+	 */
+	public ResourceSpecification retrieveResourceSpec(String specid) {
+		logger.info("will retrieve Resource Specification id=" + specid   );
+		
+		try {
+			Object response = template.
+					requestBody( CATALOG_GET_RESOURCESPEC_BY_ID, specid);
+
+			if ( !(response instanceof String)) {
+				logger.error("Resource Specification object is wrong.");
+				return null;
+			}
+			LogicalResourceSpecification sor = toJsonObj( (String)response, LogicalResourceSpecification.class); 
+			//logger.debug("retrieveSpec response is: " + response);
+			return sor;
+			
+		}catch (Exception e) {
+			logger.error("Cannot retrieve Resource Specification details from catalog. " + e.toString());
+		}
+		return null;
+	}
+	
+
+	public LogicalResourceSpecification createOrUpdateResourceSpecByNameCategoryVersion( ResourceSpecificationCreate s) {
+		logger.info("will createOrUpdateResourceSpecByNameCategoryVersion "  );
+		try {
+			Map<String, Object> map = new HashMap<>();
+			map.put("aname", s.getName());
+			map.put("aversion", s.getVersion());
+			map.put("acategory", s.getCategory());
+			
+			Object response = template.requestBodyAndHeaders( CATALOG_UPDADD_RESOURCESPEC, toJsonString(s), map);
+
+			if ( !(response instanceof String)) {
+				logger.error("ResourceSpecification  object is wrong.");
+			}
+
+			LogicalResourceSpecification rs = toJsonObj( (String)response, LogicalResourceSpecification.class); 
+			return rs;
+			
+			
+		}catch (Exception e) {
+			logger.error("Cannot create ResourceSpecification");
+			e.printStackTrace();
+		}
+		return null;
+		
+	}
+	
+	public Resource createOrUpdateResourceByNameCategoryVersion( ResourceCreate s) {
+		logger.info("will createOrUpdateResourceByNameVersion a Resource "  );
+		try {
+			Map<String, Object> map = new HashMap<>();
+			map.put("aname", s.getName());
+			map.put("aversion", s.getResourceVersion());
+			map.put("acategory", s.getCategory());
+			
+			Object response = template.requestBodyAndHeaders( CATALOG_UPDADD_RESOURCE, toJsonString(s), map);
+
+			if ( !(response instanceof String)) {
+				logger.error("Resource  object is wrong.");
+			}
+
+			logger.debug( response.toString() );
+			try {
+				LogicalResource rs = toJsonObj( (String)response, LogicalResource.class); 
+				return rs;				
+			}catch (Exception e) {
+				logger.error("Cannot create LogicalResource");
+				e.printStackTrace();
+			}
+			
+			try {
+				Resource rs = toJsonObj( (String)response, Resource.class); 
+				return rs;				
+			}catch (Exception e) {
+				logger.error("Cannot create as Resource");
+				e.printStackTrace();
+			}
+			
+			
+		}catch (Exception e) {
+			logger.error("Cannot create Resource");
+			e.printStackTrace();
+		}
+		return null;
+		
+	}
+	
+
+	
+	private <T> T toJsonObj(String content, Class<T> valueType)  throws IOException {
+	  ObjectMapper mapper = new ObjectMapper();
+	  mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+	  return mapper.readValue( content, valueType);
+	}
+
+	private   String toJsonString(Object object) throws IOException {
+	  ObjectMapper mapper = new ObjectMapper();
+	  mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+	  return mapper.writeValueAsString(object);
+	}
+
+	
+
+	public Resource updateResourceById(String oslResourceId, ResourceUpdate rs) {
+
+
+	  logger.info("will update Resource : " + oslResourceId );
+	  try {
+	    Map<String, Object> map = new HashMap<>();
+	    map.put("resourceId", oslResourceId );
+	    map.put("propagateToSO", false );
+
+	    Object response = template.requestBodyAndHeaders( CATALOG_UPD_RESOURCE, toJsonString(rs), map);
+
+	    if ( !(response instanceof String)) {
+	      logger.error("Service Instance object is wrong.");
+	    }
+
+	    LogicalResource resourceInstance = toJsonObj( (String)response, LogicalResource.class); 
+	    //logger.debug("createService response is: " + response);
+	    return resourceInstance;
+
+
+	  }catch (Exception e) {
+        e.printStackTrace();
+	    logger.error("Cannot update Service: " + oslResourceId + ": " + e.toString());
+	  }
+	  return null;
+	}
+
+//  public void updateResourceById(String oslResourceId, ResourceUpdate rs) {
+//
+//    resourcesToBeUpdated.put(oslResourceId, rs);
+//   
+//    
+//  }
+    
+//  public void processUpdateResources() {
+//    
+//    resourcesToBeUpdated.forEach( (oslResourceId, rs) -> {
+//      
+//      logger.info("will update Resource : " + oslResourceId );
+//      try {
+//          Map<String, Object> map = new HashMap<>();
+//          map.put("resourceId", oslResourceId );
+//          map.put("propagateToSO", false );
+//          String json = toJsonString(rs);
+//          Object response = template.requestBodyAndHeaders( CATALOG_UPD_RESOURCE, json, map);
+//
+//          if ( !(response instanceof String)) {
+//              logger.error("Service Instance object is wrong.");
+//          }
+//
+//          //LogicalResource resourceInstance = toJsonObj( (String)response, LogicalResource.class); 
+//          //logger.debug("createService response is: " + response);
+//          //return resourceInstance;
+//          
+//          resourcesToBeUpdated.remove(oslResourceId);
+//          
+//
+//          logger.info("Updated successfully Resource : " + oslResourceId );
+//      }catch (Exception e) {
+//        e.printStackTrace();
+//          logger.error("Cannot update Resource: " + oslResourceId + ": " + e.toString());
+//      }
+//      
+//      
+//      
+//    });
+//  }
+
+}
diff --git a/src/main/java/org/etsi/osl/cridge/CridgeSpingBoot.java b/src/main/java/org/etsi/osl/cridge/CridgeSpingBoot.java
new file mode 100644
index 0000000000000000000000000000000000000000..b3bfbb7fd0850afbeb504056ad036ffc49e41e10
--- /dev/null
+++ b/src/main/java/org/etsi/osl/cridge/CridgeSpingBoot.java
@@ -0,0 +1,101 @@
+/*-
+ * ========================LICENSE_START=================================
+ * org.etsi.osl.cridge
+ * %%
+ * Copyright (C) 2019 openslice.io
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * =========================LICENSE_END==================================
+ */
+package org.etsi.osl.cridge;
+
+import java.util.Map;
+import java.util.Objects;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.ExitCodeGenerator;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.event.ContextStoppedEvent;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
+import io.fabric8.kubernetes.api.model.ListOptionsBuilder;
+import io.fabric8.kubernetes.api.model.Node;
+import io.fabric8.kubernetes.api.model.NodeList;
+import io.fabric8.kubernetes.api.model.Pod;
+import io.fabric8.kubernetes.api.model.PodList;
+import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition;
+import io.fabric8.kubernetes.client.DefaultKubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClientBuilder;
+import io.fabric8.kubernetes.client.KubernetesClientException;
+import io.fabric8.kubernetes.client.Watch;
+import io.fabric8.kubernetes.client.Watcher;
+import io.fabric8.kubernetes.client.WatcherException;
+import io.fabric8.kubernetes.client.Watcher.Action;
+import io.fabric8.kubernetes.client.dsl.base.ResourceDefinitionContext;
+import io.fabric8.kubernetes.client.informers.ResourceEventHandler;
+import io.fabric8.kubernetes.client.informers.SharedIndexInformer;
+import io.fabric8.kubernetes.client.informers.SharedInformerFactory;
+
+/**
+ * @author ctranoris
+ *
+ */
+@EnableScheduling
+@SpringBootApplication
+public class CridgeSpingBoot implements CommandLineRunner {
+
+	private static ApplicationContext applicationContext;
+
+	private static final Logger logger = LoggerFactory.getLogger(CridgeSpingBoot.class.getSimpleName());
+
+
+	@Bean
+	KubernetesClient kubernetesClient() {
+		return new KubernetesClientBuilder().build();
+	}
+
+	@Override
+	public void run(String... arg0) throws Exception {
+		if (arg0.length > 0 && arg0[0].equals("exitcode")) {
+			throw new ExitException();
+		}
+
+	}
+
+	public static void main(String[] args) throws Exception {
+
+		logger.info("=========== STARTING CRIDGE ==============================");
+		applicationContext = new SpringApplication(CridgeSpingBoot.class).run(args);
+	}
+
+	class ExitException extends RuntimeException implements ExitCodeGenerator {
+		private static final long serialVersionUID = 1L;
+
+		@Override
+		public int getExitCode() {
+			return 10;
+		}
+	}
+	
+	
+}
diff --git a/src/main/java/org/etsi/osl/cridge/KubernetesClientResource.java b/src/main/java/org/etsi/osl/cridge/KubernetesClientResource.java
new file mode 100644
index 0000000000000000000000000000000000000000..98b98e1a8fa7392e0448c78225c47272f4aaf91e
--- /dev/null
+++ b/src/main/java/org/etsi/osl/cridge/KubernetesClientResource.java
@@ -0,0 +1,637 @@
+package org.etsi.osl.cridge;
+
+import java.sql.Date;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
+import io.fabric8.kubernetes.api.model.Namespace;
+import io.fabric8.kubernetes.api.model.NamespaceBuilder;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.api.model.Secret;
+import io.fabric8.kubernetes.api.model.StatusDetails;
+import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition;
+import io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClientBuilder;
+import io.fabric8.kubernetes.client.Watch;
+import io.fabric8.kubernetes.client.Watcher;
+import io.fabric8.kubernetes.client.WatcherException;
+import io.fabric8.kubernetes.client.dsl.Resource;
+import io.fabric8.kubernetes.client.informers.ResourceEventHandler;
+import io.fabric8.kubernetes.client.informers.SharedIndexInformer;
+import io.fabric8.kubernetes.client.informers.SharedInformerFactory;
+import io.fabric8.kubernetes.client.utils.Serialization;
+import org.etsi.osl.domain.model.DomainModelDefinition;
+import org.etsi.osl.domain.model.kubernetes.KubernetesCRDProperty;
+import org.etsi.osl.domain.model.kubernetes.KubernetesCRDV1;
+import org.etsi.osl.domain.model.kubernetes.KubernetesCRV1;
+import org.etsi.osl.domain.model.kubernetes.KubernetesContextDefinition;
+import org.etsi.osl.domain.model.kubernetes.KubernetesSecret;
+import org.etsi.osl.tmf.common.model.EValueType;
+import org.etsi.osl.tmf.rcm634.model.ResourceSpecification;
+import org.etsi.osl.tmf.ri639.model.ResourceCreate;
+import org.etsi.osl.tmf.ri639.model.ResourceStatusType;
+import org.etsi.osl.tmf.ri639.model.ResourceUpdate;
+import lombok.Getter;
+
+/**
+ * @author ctranoris
+ */
+@Component
+@Getter
+public class KubernetesClientResource {
+
+  private static final Logger logger = LoggerFactory.getLogger( "org.etsi.osl.cridge" );
+
+  @Autowired
+  private KubernetesClient kubernetesClient;
+
+  @Autowired
+  CatalogClient catalogClient;
+
+  private KubernetesContextDefinition kubernetesContextDefinition = null;
+
+  private ResourceSpecification kubernetesCRDV1ResourceSpec = null;
+
+  private ResourceSpecification kubernetesCRV1ResourceSpec = null;
+  
+  private ResourceSpecification kubernetesSecretResourceSpec = null;
+  
+
+  /**
+   * Garbage collect namespaces to be deleted
+   */
+  private ConcurrentHashMap<String, String> nameSpacesTobeDeleted = new ConcurrentHashMap<>();
+
+  private Map<String, Object> watchersForNamespaces = new HashMap<>();
+
+  
+
+  /**
+   * @return the opensliceResourceSpecification
+   * @throws Exception
+   */
+  public KubernetesContextDefinition getKubernetesContextDefinition() throws Exception {
+    if (kubernetesContextDefinition == null) {
+      ResourceSpecification rspec = catalogClient.retrieveResourceSpecByNameCategoryVersion(
+          KubernetesContextDefinition.OSL_KUBD_RSPEC_NAME,
+          KubernetesContextDefinition.OSL_KUBD_RSPEC_CATEGORY,
+          KubernetesContextDefinition.OSL_KUBD_RSPEC_VERSION);
+      if (rspec == null) {
+        throw new Exception("Cannot retrieve KubernetesContextDefinition ResourceSpecification");
+      }
+
+
+      kubernetesContextDefinition = KubernetesContextDefinition.builder()
+          .osl_KUBD_SPEC_UUID(rspec.getUuid())
+          .name(this.getKubernetesClient().getConfiguration().getCurrentContext().getContext().getCluster()
+              + "@" + kubernetesClient.getMasterUrl().toExternalForm())
+          .clusterVersion(kubernetesClient.getKubernetesVersion().getMajor() + "."
+              + kubernetesClient.getKubernetesVersion().getMinor())
+          .masterURL(kubernetesClient.getMasterUrl().toExternalForm())
+          .currentContextCluster(
+              kubernetesClient.getConfiguration().getCurrentContext().getContext().getCluster())
+          .currentContextName(kubernetesClient.getConfiguration().getCurrentContext().getName())
+          .currentContextUser(kubernetesClient.getConfiguration().getCurrentContext().getContext().getUser())
+          .build();
+
+      // initialize also KubernetesCRDV1
+      kubernetesCRDV1ResourceSpec = catalogClient.retrieveResourceSpecByNameCategoryVersion(
+          KubernetesCRDV1.OSL_KUBCRD_RSPEC_NAME, KubernetesCRDV1.OSL_KUBCRD_RSPEC_CATEGORY,
+          KubernetesCRDV1.OSL_KUBCRD_RSPEC_VERSION);
+
+      kubernetesCRV1ResourceSpec  = catalogClient.retrieveResourceSpecByNameCategoryVersion(
+          KubernetesCRV1.OSL_KUBCRV1_RSPEC_NAME, 
+          KubernetesCRV1.OSL_KUBCRV1_RSPEC_CATEGORY,
+          KubernetesCRV1.OSL_KUBCRV1_RSPEC_VERSION);
+
+      kubernetesSecretResourceSpec  = catalogClient.retrieveResourceSpecByNameCategoryVersion(
+          KubernetesSecret.OSL_KUBSECRET_RSPEC_NAME, 
+          KubernetesSecret.OSL_KUBSECRET_RSPEC_CATEGORY,
+          KubernetesSecret.OSL_KUBSECRET_RSPEC_VERSION);
+
+    }
+    return kubernetesContextDefinition;
+  }
+
+
+  List<KubernetesCRDV1> KubernetesCRD2OpensliceCRD(CustomResourceDefinition crd) {
+
+    ArrayList<KubernetesCRDV1> result = new ArrayList<>();
+    crd.getSpec().getVersions().stream().forEach(version -> {
+      KubernetesCRDV1 kcrd = KubernetesCRDV1.builder()
+          .osl_KUBCRD_RSPEC_UUID( kubernetesCRDV1ResourceSpec.getUuid() )
+          .name(  crd.getSpec().getNames().getKind()
+              + "@" 
+              + crd.getSpec().getGroup()+"/"+version.getName()
+              + "@" 
+              +  kubernetesClient.getConfiguration().getCurrentContext().getContext().getCluster()
+              + "@" + 
+              kubernetesClient.getMasterUrl().toExternalForm()  )
+          .version( version.getName() )
+          .currentContextCluster( kubernetesClient.getConfiguration().getCurrentContext().getContext().getCluster() )
+          .clusterMasterURL( kubernetesClient.getMasterUrl().toString()  )
+          .fullResourceName( crd.getFullResourceName() )
+          .kind( crd.getSpec().getNames().getKind() )
+          .apiGroup( crd.getSpec().getGroup() )
+          .uID( crd.getMetadata().getUid() )
+          .description( version.getSchema().getOpenAPIV3Schema().getDescription() )
+          .metadata( "" )
+          .build();
+
+      if (version.getSchema().getOpenAPIV3Schema().getProperties() != null)
+        version.getSchema().getOpenAPIV3Schema().getProperties().forEach((kPropName, vProVal) -> {
+          if (kPropName.equals("spec") || kPropName.equals("status")) {
+            logger.debug("propName={} propValue={} ", kPropName, vProVal.getType());						
+            addCRDProperties(kcrd, kPropName, vProVal, "");						
+          }
+
+
+        });
+
+      if (version.getSchema().getOpenAPIV3Schema().getAdditionalProperties() != null) {
+        version.getSchema().getOpenAPIV3Schema().getAdditionalProperties().getAdditionalProperties()
+        .forEach((kPropName, vProVal) -> {
+          logger.debug("propName={} propValue={} ", kPropName, vProVal);
+          KubernetesCRDProperty kpcrdProperty = KubernetesCRDProperty
+              .builder()
+              .name(kPropName)
+              .build();
+          kcrd.getAdditionalProperties().put("additionalProperty." + kPropName,  kpcrdProperty);		
+
+        });
+      }
+
+      kcrd.setYaml( Serialization.asYaml( version.getSchema().getOpenAPIV3Schema().getProperties()  ) );
+      kcrd.setJson( Serialization.asJson( version.getSchema().getOpenAPIV3Schema().getProperties() ) );
+
+      result.add( kcrd );
+    });
+
+    return result;
+
+  }
+
+  private void addCRDProperties(KubernetesCRDV1 kcrd, String kPropName, JSONSchemaProps vProVal, String prefix ) {
+
+
+    String propertyToAdd =  prefix + kPropName;
+
+    EValueType etype;
+    if (vProVal.getType() == null) {
+      etype = EValueType.TEXT;
+    } else  if (vProVal.getType().equalsIgnoreCase("boolean")) {
+      etype = EValueType.BOOLEAN;
+    } else if (vProVal.getType().equalsIgnoreCase("integer")) {
+      etype = EValueType.INTEGER;
+    }  else if (vProVal.getType().equalsIgnoreCase("object")) {
+      etype = EValueType.OBJECT;
+      vProVal.getProperties().forEach((pk, pv) -> {
+        addCRDProperties(kcrd, pk, pv, propertyToAdd + ".");					
+      });
+    }  else if (vProVal.getType().equalsIgnoreCase("array")) {
+      etype = EValueType.ARRAY;
+      vProVal.getProperties().forEach((pk, pv) -> {
+        addCRDProperties(kcrd, pk, pv, propertyToAdd + "[].");					
+      });
+    } else
+      etype = EValueType.TEXT;
+
+
+    KubernetesCRDProperty kpcrdProperty = KubernetesCRDProperty
+        .builder()
+        .name(kPropName)
+        .description( vProVal.getDescription() )
+        .defaultValue( vProVal.getDefault()!=null? vProVal.getDefault().asText() : "" )
+        .valueType( etype.getValue() )
+        .build();
+
+
+    kcrd.getProperties().put(  propertyToAdd, kpcrdProperty );
+
+  }
+
+
+  KubernetesCRV1 KubernetesCR2OpensliceCR(GenericKubernetesResource gkr) {
+
+    String baseCRD = String.format( "%s@%s@%s@%s",
+        gkr.getKind(),
+        gkr.getApiVersion(),
+        kubernetesClient.getConfiguration().getCurrentContext().getContext().getCluster(),
+        kubernetesClient.getMasterUrl().toExternalForm());
+
+    KubernetesCRV1 kcrv = KubernetesCRV1.builder()
+        .osl_KUBCRV1_RSPEC_UUID( kubernetesCRV1ResourceSpec.getUuid() )
+        .name( gkr.getMetadata().getName()  
+            + "@" 
+            + gkr.getMetadata().getNamespace()
+            + "@" 
+            +  kubernetesClient.getConfiguration().getCurrentContext().getContext().getCluster()
+            + "@" + 
+            kubernetesClient.getMasterUrl().toExternalForm()  )
+        .version( gkr.getApiVersion() )
+        .currentContextCluster( kubernetesClient.getConfiguration().getCurrentContext().getContext().getCluster() )
+        .clusterMasterURL( kubernetesClient.getMasterUrl().toString()  )
+        .fullResourceName( "" )
+        .namespace( Serialization.asJson( gkr.getMetadata().getNamespace()) )
+        .kind( gkr.getKind() )
+        .apiGroup( gkr.getPlural() )
+        .uID( gkr.getMetadata().getUid() )
+        .metadata( gkr.getMetadata().toString()  ) //.metadata( gkr.getMetadata().toString() )
+        .category( baseCRD )
+        .description( 
+            String.format( "A CR in namespace %s based on CRD %s", gkr.getMetadata().getNamespace(),  baseCRD ))
+        .build();
+
+
+    gkr.getMetadata().getLabels().forEach((pk, pv) -> {
+      logger.debug("\t label: {} {} ", pk, pv);
+      kcrv.getProperties().put( pk  , pv);
+
+    });
+
+    kcrv.setStatusCheckFieldName( gkr.getMetadata().getLabels().get("org.etsi.osl.statusCheckFieldName"));
+    kcrv.setStatusCheckValueStandby( gkr.getMetadata().getLabels().get("org.etsi.osl.statusCheckValueStandby"));
+    kcrv.setStatusCheckValueAlarm( gkr.getMetadata().getLabels().get("org.etsi.osl.statusCheckValueAlarm"));
+    kcrv.setStatusCheckValueAvailable( gkr.getMetadata().getLabels().get("org.etsi.osl.statusCheckValueAvailable"));
+    kcrv.setStatusCheckValueReserved( gkr.getMetadata().getLabels().get("org.etsi.osl.statusCheckValueReserved"));
+    kcrv.setStatusCheckValueUnknown( gkr.getMetadata().getLabels().get("org.etsi.osl.statusCheckValueUnknown"));
+    kcrv.setStatusCheckValueSuspended( gkr.getMetadata().getLabels().get("org.etsi.osl.statusCheckValueSuspended"));
+    kcrv.setStatusValue(    ResourceStatusType.UNKNOWN );
+    
+    gkr.getAdditionalProperties().forEach((pk, pv) -> {
+      logger.debug("\t {} {} ", pk, pv);
+      if (pv instanceof Map) {
+        addCRVProperties( kcrv, pk, (Map<String, Object>) pv, "");					
+      }else {
+        Map<String, Object> values = (Map<String, Object>) pv;
+        values.forEach((speck, specv) ->{
+          logger.debug("\t  {}={} ", speck, specv);
+          String propertyName = pk +"." +speck;
+          String propertyValue = specv.toString();
+          kcrv.getProperties().put( propertyName , propertyValue);
+          
+          //check resource status
+          if ( kcrv.getStatusCheckFieldName().equals(propertyName) ){
+            kcrv.setStatusValue(  checKCRVResourceStatus(kcrv, propertyValue) );            
+          }
+        });					
+      }
+
+    });
+
+    kcrv.getProperties().put( "AdditionPropertiesAsJson" , Serialization.asJson( gkr.getAdditionalProperties() ));
+
+    kcrv.setYaml( Serialization.asYaml( gkr ) );
+    kcrv.setJson( Serialization.asJson( gkr ) );
+    kcrv.setCr_spec( Serialization.asJson( gkr )  );
+
+    return kcrv;
+
+  }
+
+
+  private ResourceStatusType checKCRVResourceStatus(KubernetesCRV1 kcrv, String propertyValue) {
+
+    if (propertyValue.equals(kcrv.getStatusCheckValueAlarm())) {
+      return ResourceStatusType.ALARM;
+    } else if (propertyValue.equals(kcrv.getStatusCheckValueAvailable())) {
+      return ResourceStatusType.AVAILABLE;
+    } else if (propertyValue.equals(kcrv.getStatusCheckValueReserved())) {
+      return ResourceStatusType.RESERVED;
+    } else if (propertyValue.equals(kcrv.getStatusCheckValueStandby())) {
+      return ResourceStatusType.STANDBY;
+    } else if (propertyValue.equals(kcrv.getStatusCheckValueSuspended())) {
+      return ResourceStatusType.SUSPENDED;
+    } else if (propertyValue.equals(kcrv.getStatusCheckValueUnknown())) {
+      return ResourceStatusType.UNKNOWN;
+    } else {
+      return ResourceStatusType.UNKNOWN;
+    }
+
+  }
+
+
+  private void addCRVProperties(KubernetesCRV1 kcrv,String kPropName, Map<String, Object> vProVal, String prefix) {
+
+
+
+    vProVal.forEach((speck, specv) ->{
+      if (specv instanceof Map) {
+        String propertyToAdd =  prefix + kPropName;
+        addCRVProperties( kcrv, speck, (Map<String, Object>) specv, propertyToAdd + ".");		
+      }else {
+        String propertyToAdd =  prefix + kPropName+ "."+speck;
+        logger.debug("\t {} {}={} ", propertyToAdd, speck, specv);		
+        kcrv.getProperties().put( propertyToAdd , specv.toString());	
+        String propertyName = propertyToAdd;
+        String propertyValue = specv.toString();
+        if ( kcrv.getStatusCheckFieldName()!=null && kcrv.getStatusCheckFieldName().equals(propertyName) ){
+          kcrv.setStatusValue(  checKCRVResourceStatus(kcrv, propertyValue) );            
+        }
+      }
+
+    });
+
+
+
+  }
+  
+  
+  private KubernetesSecret KubernetesSecret2OpensliceResource(Secret secret) {
+
+    
+    String baseCRD = String.format( "%s@%s@%s@%s",
+        secret.getKind(),
+        secret.getApiVersion(),
+        kubernetesClient.getConfiguration().getCurrentContext().getContext().getCluster(),
+        kubernetesClient.getMasterUrl().toExternalForm());
+
+    KubernetesSecret kcrv = KubernetesSecret.builder()
+        .osl_KUBCRD_RSPEC_UUID( kubernetesSecretResourceSpec.getUuid() )
+        .name( secret.getMetadata().getName()  
+            + "@" 
+            + secret.getMetadata().getNamespace()
+            + "@" 
+            +  kubernetesClient.getConfiguration().getCurrentContext().getContext().getCluster()
+            + "@" + 
+            kubernetesClient.getMasterUrl().toExternalForm()  )
+        .version( secret.getApiVersion() )
+        .currentContextCluster( kubernetesClient.getConfiguration().getCurrentContext().getContext().getCluster() )
+        .clusterMasterURL( kubernetesClient.getMasterUrl().toString()  )
+        .fullResourceName( "" )
+        .namespace( Serialization.asJson( secret.getMetadata().getNamespace()) )
+        .kind( secret.getKind() )
+        .apiGroup( secret.getPlural() )
+        .uID( secret.getMetadata().getUid() )
+        .metadata(Serialization.asJson( secret.getMetadata())  ) //.metadata( gkr.getMetadata().toString() )        
+        .description( 
+            String.format( "A secret in namespace %s on %s", secret.getMetadata().getNamespace(),  baseCRD ))
+        .build();
+
+
+    secret.getMetadata().getLabels().forEach((pk, pv) -> {
+      logger.debug("\t label: {} {} ", pk, pv);
+      kcrv.getProperties().put( pk  , pv);
+
+    });
+    
+
+    if (secret.getData()  != null)
+      secret.getData().forEach((kPropName, vProVal) -> {
+        logger.debug("propName={} propValue={} ", kPropName, vProVal );        
+        kcrv.getData().put(kPropName, vProVal);
+      });
+    if (secret.getStringData()  != null)
+      secret.getStringData().forEach((kPropName, vProVal) -> {
+        logger.debug("propName={} propValue={} ", kPropName, vProVal );        
+        kcrv.getProperties().put(kPropName, vProVal);
+      });
+    
+    kcrv.setDataObj( Serialization.asYaml( secret.getData() )  );
+    kcrv.setYaml( Serialization.asYaml( secret ) );
+    kcrv.setJson( Serialization.asJson( secret ) );
+
+    return kcrv;
+  }
+
+  
+
+  public String deployCR(Map<String, Object> headers, String crspec) {
+
+    logger.debug("============ Deploy crspec =============" );
+
+    logger.debug("Check if this CRIDGE instance is related to this deployment" );
+    if ( (headers.get("currentContextCluster") ==null) || 
+        ( ! headers.get("currentContextCluster").equals( kubernetesContextDefinition.getCurrentContextCluster() ))) {
+
+      logger.debug("Will return SEE OTHER header={}, this.context= {}", headers.get("currentContextCluster"),  kubernetesContextDefinition.getCurrentContextCluster() );
+      return "SEE OTHER";
+      
+    }
+    
+    if ( (headers.get("clusterMasterURL") ==null) || 
+        ( ! headers.get("clusterMasterURL").equals( kubernetesContextDefinition.getMasterURL() ))) {
+
+      logger.debug("Will return SEE OTHER header={}, this.context= {}", headers.get("clusterMasterURL"),  kubernetesContextDefinition.getMasterURL() );
+      return "SEE OTHER";
+      
+    }
+    
+    logger.debug("Deploy the following CR:" );
+    logger.debug("{}", crspec );
+   
+
+    try (final KubernetesClient k8s = new KubernetesClientBuilder().build()) {
+
+      GenericKubernetesResource gkr =  Serialization.unmarshal( crspec );
+      headers.forEach(((hname, hval) ->{
+        if (hval instanceof String s) {
+          if ( hname.contains("org.etsi.osl")) {
+            logger.debug("Header: {} = {} ", hname, s );      
+            if ( gkr.getMetadata() == null ) {
+              gkr.setMetadata( new ObjectMeta());
+              gkr.getMetadata().setLabels( new HashMap<String, String>());
+            }
+            gkr.getMetadata().getLabels().put(hname, s);
+          }
+        }
+      }));
+      if ( headers.get("org.etsi.osl.prefixId") !=null ) {
+        gkr.getMetadata().setName( (String) headers.get("org.etsi.osl.prefixName") ) ;
+      }else {
+        gkr.getMetadata().setName( "cr" + ((String) headers.get("org.etsi.osl.resourceId")).substring(0, 8) ) ;
+      }
+      
+      
+      String nameSpacename = (String) headers.get("org.etsi.osl.namespace");
+
+      try {
+
+        //first try create namespace for the service order
+        Namespace ns = new NamespaceBuilder()
+            .withNewMetadata()
+            .withName( nameSpacename )
+            .addToLabels("org.etsi.osl", "org.etsi.osl")
+            .endMetadata().build();
+        k8s.namespaces().resource(ns).create();    
+        
+        
+      }catch (Exception e) {
+        //e.printStackTrace();
+        //if it exists already just continue!
+        logger.info("Cannot create namespace, already exists!" + e.getMessage() );
+      }
+      
+
+      /* if the equivalent namespace for the service order is successfully created the create
+       * related watchers  for secrets, services, configmaps, pods, etc
+       *     1) we need to create domainmodels for these
+       *     2) we add them as support resources to our initial resource
+       */        
+
+      if ( this.watchersForNamespaces.get(nameSpacename) == null ) {
+        SharedIndexInformer<Secret> result = createWatchersFornamespace( nameSpacename, headers );       
+        this.watchersForNamespaces.put(nameSpacename, result);
+      }
+      
+      
+      Resource<GenericKubernetesResource> dummyObject = k8s.resource( gkr );
+      dummyObject.create();      
+    }catch (Exception e) {
+      e.printStackTrace();
+      return "FAIL " + e.getMessage();
+    }
+
+    return "OK";
+
+  }
+  
+  /**
+   * if the equivalent namespace for the service order is successfully created the create
+   * related wathcers  for secrets, services, configmaps, pods, etc
+   *     1) we need to create domainmodels for these
+   *     2) we add them as support resources to our initial resource
+   * @param nameSpacename
+   * @param headers 
+   * @return 
+   */
+  private SharedIndexInformer<Secret> createWatchersFornamespace(String nameSpacename, Map<String, Object> headers) {
+    //watcher for secrets
+      
+      SharedIndexInformer<Secret> shixInformer = 
+          this.getKubernetesClient()
+          .secrets().inNamespace(nameSpacename).inform(new ResourceEventHandler<Secret>() {
+
+            @Override
+            public void onAdd(Secret obj) {
+            logger.debug("Added Namespace watcher Resource Kind:{} Name:{} UID:{} Namespace:{}", 
+                obj.getKind(), 
+                obj.getMetadata().getName(),
+                obj.getMetadata().getUid(),
+                obj.getMetadata().getNamespace());
+            
+            headers.forEach(((hname, hval) ->{
+              if (hval instanceof String s) {
+                if ( hname.contains("org.etsi.osl")) {
+                  logger.debug("Header: {} = {} ", hname, s );      
+                  if ( obj.getMetadata() == null ) {
+                    obj.setMetadata( new ObjectMeta());
+                    obj.getMetadata().setLabels( new HashMap<String, String>());
+                  }
+                  obj.getMetadata().getLabels().put(hname, s);
+                }
+              }
+            }));
+            
+            updateKubernetesSecretResourceInOSLCatalog( obj );     
+            
+              
+            }
+
+            @Override
+            public void onUpdate(Secret oldObj, Secret newObj) {
+              logger.debug("onUpdate Namespace watcher Resource Kind:{} Name:{} UID:{} Namespace:{}", 
+                  newObj.getKind(), 
+                  newObj.getMetadata().getName(),
+                  newObj.getMetadata().getUid(),
+                  newObj.getMetadata().getNamespace());
+              updateKubernetesSecretResourceInOSLCatalog( newObj );    
+              
+            }
+
+            @Override
+            public void onDelete(Secret obj, boolean deletedFinalStateUnknown) {
+              logger.debug("onDelete Namespace watcher Resource Kind:{} Name:{} UID:{} Namespace:{}", 
+                  obj.getKind(), 
+                  obj.getMetadata().getName(),
+                  obj.getMetadata().getUid(),
+                  obj.getMetadata().getNamespace());
+              updateKubernetesSecretResourceInOSLCatalog( obj );    
+              
+            }
+
+        
+      }, 30 * 1000L); // resync period (set 0 for no resync);
+    
+      shixInformer.start();
+      
+      return shixInformer;
+    
+  }
+
+  private void updateKubernetesSecretResourceInOSLCatalog(Secret resource) {
+    ResourceCreate rs = this
+        .KubernetesSecret2OpensliceResource( resource )
+        .toResourceCreate();
+
+    catalogClient.createOrUpdateResourceByNameCategoryVersion( rs );  
+    
+  }
+  
+  
+
+  
+  
+
+  public String deleteCR(Map<String, Object> headers, String crspec) {
+
+    logger.debug("============ DELETE crspec =============" );
+    logger.debug("{}", crspec );
+   
+    
+
+    try (final KubernetesClient k8s = new KubernetesClientBuilder().build()) {
+
+      GenericKubernetesResource gkr =  Serialization.unmarshal( crspec );
+      headers.forEach(((hname, hval) ->{
+        if (hval instanceof String s) {
+          if ( hname.contains("org.etsi.osl")) {
+            logger.debug("Header: {} = {} ", hname, s );      
+            gkr.getMetadata().getLabels().put(hname, s);
+          }
+        }
+      }));
+      gkr.getMetadata().setName( (String) headers.get("org.etsi.osl.prefixName")) ;
+      Resource<GenericKubernetesResource> dummyObject = k8s.resource( gkr );
+      List<StatusDetails> result = dummyObject.delete();      
+
+      logger.debug("============ DELETE crspec: result {} =============", result.toString() );
+      
+      String nameSpacename = (String) headers.get("org.etsi.osl.namespace");
+      this.nameSpacesTobeDeleted.put(nameSpacename, nameSpacename);
+      this.watchersForNamespaces.remove(nameSpacename);
+      
+    }catch (Exception e) {
+      e.printStackTrace();
+    }
+    
+
+    
+      
+    return "DONE";
+
+  }
+  
+  public String patchCR(Map<String, Object> headers, String crspec) {
+
+    logger.debug("============ PATCH crspec =============" );
+    logger.debug("{}", crspec );
+    logger.error("NOT IMPLEMENTED" );
+
+    return "DONE";
+
+  }
+
+}
diff --git a/src/main/java/org/etsi/osl/cridge/WatcherService.java b/src/main/java/org/etsi/osl/cridge/WatcherService.java
new file mode 100644
index 0000000000000000000000000000000000000000..9cdc7f968fd55f989b2ca64785c2ee6b70e772ae
--- /dev/null
+++ b/src/main/java/org/etsi/osl/cridge/WatcherService.java
@@ -0,0 +1,322 @@
+package org.etsi.osl.cridge;
+
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.context.event.ContextStartedEvent;
+import org.springframework.context.event.ContextStoppedEvent;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Service;
+
+import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
+import io.fabric8.kubernetes.api.model.Pod;
+import io.fabric8.kubernetes.api.model.PodList;
+import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.Watch;
+import io.fabric8.kubernetes.client.Watcher;
+import io.fabric8.kubernetes.client.WatcherException;
+import io.fabric8.kubernetes.client.dsl.base.ResourceDefinitionContext;
+import io.fabric8.kubernetes.client.informers.ResourceEventHandler;
+import io.fabric8.kubernetes.client.informers.SharedIndexInformer;
+import io.fabric8.kubernetes.client.informers.SharedInformerFactory;
+import org.etsi.osl.domain.model.kubernetes.KubernetesCRDV1;
+import org.etsi.osl.domain.model.kubernetes.KubernetesContextDefinition;
+import org.etsi.osl.tmf.common.model.EValueType;
+import org.etsi.osl.tmf.rcm634.model.ResourceSpecification;
+import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationCreate;
+import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationRef;
+import org.etsi.osl.tmf.ri639.model.Resource;
+import org.etsi.osl.tmf.ri639.model.ResourceCreate;
+import org.etsi.osl.tmf.ri639.model.ResourceUpdate;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+
+/**
+ * @author ctranoris
+ */
+@Service
+public class WatcherService {
+
+	private static final Logger logger = LoggerFactory.getLogger("org.etsi.osl.cridge");
+
+	private Watch watch;
+
+	@Autowired
+	CatalogClient catalogClient;
+
+	@Autowired
+	private KubernetesClientResource kubernetesClientResource;
+
+
+	/**
+	 * This one is executed when the cridge service application starts
+	 * @param event
+	 */
+	@EventListener
+	public void onApplicationEvent(ContextRefreshedEvent event) {
+
+		logger.info("Starting WatcherService event {} ", event.toString());
+		logger.info("Starting WatcherService for cluster getContexts {} ",
+				kubernetesClientResource.getKubernetesClient().getConfiguration().getContexts().toString());
+		
+		Resource result = registerKubernetesClientInOSLResource();
+		while ( result == null ) {
+			try {
+				logger.info("Cannot get resource for registerKubernetesClient. Retrying in 10 seconds" );
+				Thread.sleep( 10000 );
+			} catch (InterruptedException e) {
+				e.printStackTrace();
+			}
+			result = registerKubernetesClientInOSLResource();
+		}
+
+		SharedInformerFactory sharedInformerFactory = kubernetesClientResource.getKubernetesClient().informers();
+
+		SharedIndexInformer<CustomResourceDefinition> shixInformer = sharedInformerFactory
+				.sharedIndexInformerFor(CustomResourceDefinition.class, 30 * 1000L);
+
+		shixInformer.addEventHandler(new ResourceEventHandler<CustomResourceDefinition>() {
+			@Override
+			public void onAdd(CustomResourceDefinition crd) {
+				logger.debug("ADDED {} CRD:{} Group:{} Kind:{} UID:{} ", crd.getKind(), 
+						crd.getMetadata().getName(),
+						crd.getSpec().getGroup(), 
+						crd.getSpec().getNames().getKind(),
+						crd.getMetadata().getUid());
+				
+	
+					          
+				List<KubernetesCRDV1> rspec = kubernetesClientResource.KubernetesCRD2OpensliceCRD(crd);
+				for (KubernetesCRDV1 rs : rspec) {
+					  catalogClient.createOrUpdateResourceSpecByNameCategoryVersion(rs.toRSpecCreate());
+					  catalogClient.createOrUpdateResourceByNameCategoryVersion( rs.toResourceCreate() );
+				}
+				
+		          
+
+				createCRDSharedIndexInformer(crd);
+
+			}
+
+			@Override
+			public void onUpdate(CustomResourceDefinition oldcrd, CustomResourceDefinition newcrd) {
+				logger.debug("CRD_UPDATED {} {} for kind {}", newcrd.getKind(), newcrd.getSpec().getGroup(), newcrd.getSpec().getNames().getKind());
+
+				String oldLAC = oldcrd.getMetadata().getAnnotations()
+						.get("kubectl.kubernetes.io/last-applied-configuration");
+				String newLAC = newcrd.getMetadata().getAnnotations()
+						.get("kubectl.kubernetes.io/last-applied-configuration");
+				if ( (newLAC == null) || !newLAC.equals(oldLAC)) {
+					logger.debug("\t NEWCRD:{} Group:{} Kind:{} UID:{} ", newcrd.getMetadata().getName(),
+							newcrd.getSpec().getGroup(), newcrd.getSpec().getNames().getKind(),
+							newcrd.getMetadata().getUid());
+
+					logger.debug("UPDATED Resource Definition of {} ", newcrd.getKind());
+					logger.debug("\t Annotations:{} ", newcrd.getMetadata().getAnnotations().toString());
+				}
+
+			}
+
+			@Override
+			public void onDelete(CustomResourceDefinition crd, boolean deletedFinalStateUnknown) {
+				logger.debug("CRD_DELETED {}", crd.getKind());
+				logger.debug("\t DELETEDCRD:{} Group:{} Kind:{} UID:{} ", crd.getMetadata().getName(),
+						crd.getSpec().getGroup(), crd.getSpec().getNames().getKind(), crd.getMetadata().getUid());
+			}
+		});
+
+		sharedInformerFactory.startAllRegisteredInformers();
+
+//		watch = kubernetesClient.apiextensions().v1().customResourceDefinitions().watch(new Watcher<>() {
+//
+//			@Override
+//			public void eventReceived(Action action, CustomResourceDefinition crd) {
+//
+//				
+//				//kubernetesClient.namespaces().
+//	            		  
+//	              logger.debug("{} CRD:{} Group:{} Kind:{} UID:{} ", 
+//	            		  action.name(),
+//	            		  crd.getMetadata().getName(), 
+//	            		  crd.getSpec().getGroup(), 
+//	            		  crd.getSpec().getNames().getKind(),
+//	            		  crd.getMetadata().getUid());
+//	              
+//	              crd.getSpec().getVersions().stream().forEach(
+//	            		  	version -> {
+//
+//	            		  		if (version.getSchema().getOpenAPIV3Schema().getProperties()!=null )
+//	            		  			version.getSchema().getOpenAPIV3Schema().getProperties().forEach( 
+//		            		  			(k,v1) -> {
+//		            		  				logger.debug("propName={} propValue={} ",k,v1.getType() );
+//		            		  				if (k.equals("spec") || k.equals("status")) {
+//		            		  					v1.getProperties().forEach( (pk, pv) -> logger.debug("\t{} {} ", pk, pv.getType() ));		            		  					            		  					
+//		            		  				}
+//		            		  			});
+//	            		  		if (version.getSchema().getOpenAPIV3Schema().getAdditionalProperties()!=null )
+//	            		  			version.getSchema().getOpenAPIV3Schema().getAdditionalProperties().getAdditionalProperties().forEach( 
+//	                 		  			(kPropName,vProVal) -> {         		  				
+//	                 		  				logger.debug("AdditionalProperty propName={} propValue={} ", kPropName ,vProVal  );	         		  						
+//	         		  						
+//	                 		  			});
+//	            		  		}
+//	            		  	);
+//	              if (  action.name().equals( Action.ADDED.name() ) ) {
+//		              createCRDWatcher( crd );	
+//		              ResourceSpecificationCreate rspec = (ResourceSpecificationCreate) modelTransformer.CRD2TMFResourceSpecification(crd);
+//		              catalogClient.createResourceSpec( rspec );
+//	              }	             
+//				
+//			}
+//
+//			@Override
+//			public void onClose(WatcherException e) {
+//	              logger.debug("Closing due to {} ", e.getMessage());
+//				
+//			}
+//          
+//          });
+
+	}
+
+	/**
+	 * register the Kubernetes Context of this Cridge instance
+	 * @return
+	 */
+	private Resource registerKubernetesClientInOSLResource() {
+	
+		try {
+			ResourceCreate rsc;
+			rsc = kubernetesClientResource.getKubernetesContextDefinition().toResourceCreate();
+			Resource result = catalogClient.createOrUpdateResourceByNameCategoryVersion(rsc );
+			return result;
+		} catch (Exception e1) {
+
+			e1.printStackTrace();
+		}
+		
+		return null;
+		
+		
+	}
+
+	protected void createCRDSharedIndexInformer(CustomResourceDefinition crd) {
+		
+		ResourceDefinitionContext context = new ResourceDefinitionContext.Builder()
+				.withGroup(crd.getSpec().getGroup())
+				.withVersion(crd.getSpec().getVersions().get(0).getName())
+				.withKind(crd.getSpec().getNames().getKind())
+				.withPlural(crd.getSpec().getNames().getPlural()).build();
+		try {
+			int a = kubernetesClientResource.getKubernetesClient().genericKubernetesResources(context).list().getItems().size();
+		} catch (Exception e) {
+			// e.printStackTrace();
+			logger.error("Cannot create createCRDSharedIndexInformer. Seems there are no resources for kind: "
+					+ crd.getSpec().getNames().getKind());
+			return;
+		}
+
+		logger.debug("Creating new Watcher for kind: {}", crd.getSpec().getNames().getKind());
+		Watch watch = kubernetesClientResource.getKubernetesClient().genericKubernetesResources(context).inAnyNamespace().watch(new Watcher<>() {
+
+			private String watcherResourcesName;
+			
+
+			@Override
+			public void eventReceived(Action action, GenericKubernetesResource genericKubernetesResource) {
+				watcherResourcesName = genericKubernetesResource.getKind();
+
+				logger.debug("{} Resource Kind:{} Name:{} UID:{} Namespace:{}", action.name(),
+						genericKubernetesResource.getKind(), genericKubernetesResource.getMetadata().getName(),
+						genericKubernetesResource.getMetadata().getUid(),
+						genericKubernetesResource.getMetadata().getNamespace());
+				genericKubernetesResource.getAdditionalProperties().forEach((pk, pv) -> {
+					logger.debug("\t {} {} ", pk, pv);
+					Map<String, Object> values = (Map<String, Object>) pv;
+					values.forEach((speck, specv) -> logger.debug("\t  {}={} ", speck, specv));
+				});
+				//ADDED, DELETED, MODIFIED, BOOKMARK, ERROR
+				if ( action.name().equals( "ADDED" ) ) {
+				  updateGenericKubernetesResourceInOSLCatalog( genericKubernetesResource );				  
+				
+				} else if ( action.name().equals( "MODIFIED" ) ) {
+                  updateGenericKubernetesResourceInOSLCatalog( genericKubernetesResource );					
+				} else if ( action.name().equals( "DELETED" ) ) {
+                  updateGenericKubernetesResourceInOSLCatalog( genericKubernetesResource );					
+				} else {
+					
+				}
+				
+			}
+
+			@Override
+			public void onClose(WatcherException e) {
+				logger.info("Closing resources Watcher of {} due to {} ", watcherResourcesName, e.getMessage());
+				createCRDSharedIndexInformer(crd); //schedule a new one
+				return;
+			}
+
+		});
+		
+		
+
+	}
+
+	protected void updateGenericKubernetesResourceInOSLCatalog(GenericKubernetesResource genericKubernetesResource) {
+	  String oslResourceId = genericKubernetesResource.getMetadata().getLabels().get("org.etsi.osl.resourceId");
+
+	  if ( oslResourceId != null ) {
+	    ResourceUpdate rs = kubernetesClientResource
+            .KubernetesCR2OpensliceCR( genericKubernetesResource )
+            .toResourceUpdate();
+	    catalogClient.updateResourceById(oslResourceId, rs);
+	  }else {
+	      ResourceCreate rs = kubernetesClientResource
+	          .KubernetesCR2OpensliceCR( genericKubernetesResource )
+	          .toResourceCreate();
+
+	      catalogClient.createOrUpdateResourceByNameCategoryVersion( rs );	    
+	  }            
+
+	}
+
+//	protected void createCRDWatcher(CustomResourceDefinition crd) {
+//		ResourceDefinitionContext context = new ResourceDefinitionContext.Builder().withGroup(crd.getSpec().getGroup())
+//				.withVersion(crd.getSpec().getVersions().get(0).getName()).withKind(crd.getSpec().getNames().getKind())
+//				.withPlural(crd.getSpec().getNames().getPlural()).build();
+//
+//		Watch watch = kubernetesClientResource.getKubernetesClient().genericKubernetesResources(context).inAnyNamespace().watch(new Watcher<>() {
+//			@Override
+//			public void eventReceived(Action action, GenericKubernetesResource genericKubernetesResource) {
+//				logger.debug("{} Kind:{} Name:{} UID:{} Namespace:{}", action.name(),
+//						genericKubernetesResource.getKind(), genericKubernetesResource.getMetadata().getName(),
+//						genericKubernetesResource.getMetadata().getUid(),
+//						genericKubernetesResource.getMetadata().getNamespace());
+//				genericKubernetesResource.getAdditionalProperties().forEach((pk, pv) -> {
+//					logger.debug("\t {} {} ", pk, pv);
+//					Map<String, Object> values = (Map<String, Object>) pv;
+//					values.forEach((speck, specv) -> logger.debug("\t  {}={} ", speck, specv));
+//				});
+//			}
+//
+//			@Override
+//			public void onClose(WatcherException e) {
+//				logger.info("Closing due to {} ", e.getMessage());
+//			}
+//		});
+//
+//	}
+
+	@PreDestroy
+	ApplicationListener<ContextStoppedEvent> stop() {
+		// return event -> sharedInformerFactory.stopAllRegisteredInformers();
+		logger.info("Closing due to ContextStoppedEvent ");
+		return event -> watch.close();
+	}
+}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
new file mode 100644
index 0000000000000000000000000000000000000000..30dc66035076e41e1d46f8297f6f4d01ce7cffe9
--- /dev/null
+++ b/src/main/resources/application.yml
@@ -0,0 +1,48 @@
+spring:
+  config:
+    activate:
+      on-profile: "default"
+  application:
+    name: cridge
+  activemq:
+    brokerUrl: tcp://localhost:61616?jms.watchTopicAdvisories=false
+    user: artemis
+    password: artemis
+    pool:
+      enabled: true
+      max-connections: 100
+    packages:
+      trust-all: true
+
+server:
+  port: 0
+  
+   
+logging:
+  level:
+    org.etsi.osl.cridge: DEBUG
+    root: INFO
+    org.springframework: INFO
+    org.apache.camel: INFO 
+    reactor.netty.tcp.TcpClient: INFO 
+    reactor.netty.http.client.HttpClient: INFO 
+  pattern:
+    console: "%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"
+    file: "%d %p %c{1.} [%t] %m%n"
+    
+
+CATALOG_ADD_RESOURCE: "jms:queue:CATALOG.ADD.RESOURCE"
+CATALOG_UPD_RESOURCE: "jms:queue:CATALOG.UPD.RESOURCE"
+CATALOG_UPDADD_RESOURCE: "jms:queue:CATALOG.UPDADD.RESOURCE"
+CATALOG_GET_RESOURCE_BY_ID: "jms:queue:CATALOG.GET.RESOURCE"
+CATALOG_ADD_RESOURCESPEC: "jms:queue:CATALOG.ADD.RESOURCESPEC"
+CATALOG_UPD_RESOURCESPEC: "jms:queue:CATALOG.UPD.RESOURCESPEC"
+CATALOG_UPDADD_RESOURCESPEC: "jms:queue:CATALOG.UPDADD.RESOURCESPEC"
+CATALOG_GET_RESOURCESPEC_BY_ID: "jms:queue:CATALOG.GET.RESOURCESPEC_BY_ID"
+CATALOG_GET_RESOURCESPEC_BY_ΝAME_CATEGORY: "jms:queue:CATALOG.GET.RESOURCESPEC_BY_ΝAME_CATEGORY"
+
+
+#CRD ACTIONS
+CRD_DEPLOY_CR_REQ: "jms:queue:CRD.DEPLOY.CR_REQ"
+CRD_DELETE_CR_REQ: "jms:queue:CRD.DELETE.CR_REQ"
+CRD_PATCH_CR_REQ: "jms:queue:CRD.PATCH.CR_REQ"
\ No newline at end of file
diff --git a/src/test/java/org/etsi/osl/cridge/CreateResource.java b/src/test/java/org/etsi/osl/cridge/CreateResource.java
new file mode 100644
index 0000000000000000000000000000000000000000..ec7fb90820906adb538a651c39f4c5ac6c8941f9
--- /dev/null
+++ b/src/test/java/org/etsi/osl/cridge/CreateResource.java
@@ -0,0 +1,54 @@
+package org.etsi.osl.cridge;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
+import io.fabric8.kubernetes.api.model.GenericKubernetesResourceBuilder;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClientBuilder;
+import io.fabric8.kubernetes.client.dsl.base.ResourceDefinitionContext;
+import io.fabric8.kubernetes.client.dsl.Resource;
+
+public class CreateResource {
+
+	public static void main(String[] args) {
+		try (final KubernetesClient k8s = new KubernetesClientBuilder().build()) {
+
+			/**
+			 * 1st approach with GenericKubernetesResource
+			 */
+//    	ResourceDefinitionContext context = new ResourceDefinitionContext.Builder()
+//	    	      .withGroup("stable.example.com")
+//	    	      .withVersion("v1")
+//	    	      .withKind("CronTab")
+//	    	      .withPlural("crontabs")
+//	    	      .withNamespaced(true)
+//	    	      .build();
+//
+//	      k8s.genericKubernetesResources(context)
+//	    	      .inNamespace("default")
+//	    	      .resource(genericKubernetesResource)
+//	    	      .create();
+			/**
+			 * 2nd approach with GenericKubernetesResource
+			 */
+			Map<String, Object> spec = new HashMap<>();
+			spec.put("title", "my-awesome-book title");
+			spec.put("author", "TestAuthor");
+			spec.put("isbn", "0077000007");
+
+			GenericKubernetesResource genericKubernetesResource = new GenericKubernetesResourceBuilder()
+					.withApiVersion("testing.fabric8.io/v1alpha1").withKind("Book").withNewMetadata()
+					.withName("my-new-book-object-" + UUID.randomUUID().toString()).withNamespace("testakis")
+					.endMetadata().addToAdditionalProperties("spec", spec).build();
+
+			Resource<GenericKubernetesResource> dummyObject = k8s.resource(genericKubernetesResource);
+			// Create Custom Resource
+			dummyObject.create();
+
+		}
+	}
+
+}
diff --git a/src/test/java/org/etsi/osl/cridge/CreateResourceArgoJenkins.java b/src/test/java/org/etsi/osl/cridge/CreateResourceArgoJenkins.java
new file mode 100644
index 0000000000000000000000000000000000000000..58fe4bbc23283cc989abe252642b7d0950ab5be5
--- /dev/null
+++ b/src/test/java/org/etsi/osl/cridge/CreateResourceArgoJenkins.java
@@ -0,0 +1,72 @@
+package org.etsi.osl.cridge;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
+import io.fabric8.kubernetes.api.model.GenericKubernetesResourceBuilder;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClientBuilder;
+import io.fabric8.kubernetes.client.dsl.base.ResourceDefinitionContext;
+import io.fabric8.kubernetes.client.utils.Serialization;
+import io.fabric8.kubernetes.client.dsl.Resource;
+
+public class CreateResourceArgoJenkins {
+
+
+	// @formatter:off
+	public static void main(String[] args) {
+		try (final KubernetesClient k8s = new KubernetesClientBuilder().build()) {
+
+			String yamlfile = 
+"""			
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: openslice-jenkins
+  namespace: argocd
+  finalizers: 
+  - resources-finalizer.argocd.argoproj.io
+spec:
+  project: default
+  destination:
+    namespace: default    #update namespace name if you wish
+    name: in-cluster   #update cluster name if its different
+  source:
+    repoURL: https://charts.jenkins.io
+    targetRevision: "4.6.1"
+    chart: jenkins
+    helm:
+      values: |
+        controller:
+          service:
+            type: ClusterIP
+operation:
+  initiatedBy:
+    username: %s    		
+  sync:
+    prune: true
+    syncStrategy:
+      hook: {}
+
+""".formatted( "myuser" );
+			
+
+			System.out.println( yamlfile );
+			GenericKubernetesResource gkr =  Serialization.unmarshal(yamlfile);
+			
+		              
+			Resource<GenericKubernetesResource> dummyObject = k8s.resource( gkr );
+			dummyObject.create();
+			
+/*
+ * to delete we need: 
+ * kubectl patch app openslice-jenkins -n argocd -p '{"metadata": {"finalizers": ["resources-finalizer.argocd.argoproj.io"]}}' --type merge
+ * kubectl delete app openslice-jenkins -n argocd			
+ */
+
+		}
+	}
+
+}
diff --git a/src/test/java/org/etsi/osl/cridge/CreateResourceArgoJenkinsProgram.java b/src/test/java/org/etsi/osl/cridge/CreateResourceArgoJenkinsProgram.java
new file mode 100644
index 0000000000000000000000000000000000000000..cc5e85980a251cd0fde10c9a3899b13dd082b9c9
--- /dev/null
+++ b/src/test/java/org/etsi/osl/cridge/CreateResourceArgoJenkinsProgram.java
@@ -0,0 +1,137 @@
+package org.etsi.osl.cridge;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import org.apache.camel.util.json.JsonObject;
+
+import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
+import io.fabric8.kubernetes.api.model.GenericKubernetesResourceBuilder;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClientBuilder;
+import io.fabric8.kubernetes.client.dsl.base.ResourceDefinitionContext;
+import io.fabric8.kubernetes.client.utils.Serialization;
+import io.fabric8.kubernetes.client.dsl.Resource;
+
+public class CreateResourceArgoJenkinsProgram {
+
+	// @formatter:off
+	public static void main(String[] args) {
+		try (final KubernetesClient k8s = new KubernetesClientBuilder().build()) {
+			
+			
+			
+			JsonObject objSpec = new JsonObject();
+			
+		      objSpec.put("project", "default");
+		      //obj.put("num", Integer.valueOf(100));
+		      
+		      JsonObject objdestination = new JsonObject();
+		      	objdestination.put("namespace", "default");
+		      	objdestination.put("name", "in-cluster");		      
+		      objSpec.put("destination", objdestination);
+
+		      JsonObject objsource = new JsonObject();
+		      objsource.put("repoURL", "https://charts.jenkins.io");
+		      objsource.put("targetRevision", "4.6.1");
+		      objsource.put("chart", "jenkins");
+		      JsonObject objvalues = new JsonObject();
+		      objvalues.put("values", "controller:\n  service:\n    type: ClusterIP\n");
+		      
+		      
+		      objsource.put("helm", objvalues);
+		      objSpec.put("source", objsource);
+
+			
+
+				JsonObject objOperation = new JsonObject();
+				JsonObject intiby = (new JsonObject());
+				intiby.put("username", "testadmin");
+				objOperation.put("initiatedBy",  intiby);
+				JsonObject objsync = new JsonObject();
+				objsync.put("prune", Boolean.valueOf(true));
+				JsonObject syncStrategy = (new JsonObject());
+				syncStrategy.put("hook", new JsonObject());
+				objsync.put("syncStrategy", syncStrategy );
+				objOperation.put("sync", objsync );
+		      
+			
+
+			GenericKubernetesResource genericKubernetesResource = new GenericKubernetesResourceBuilder()
+					.withApiVersion("argoproj.io/v1alpha1")
+					.withKind("Application")
+					.withNewMetadata()
+					.withName( "openslice-jenkins" )
+					.withNamespace( "argocd" )
+					.addToFinalizers("resources-finalizer.argocd.argoproj.io")
+					.endMetadata()
+					.addToAdditionalProperties("spec", objSpec)
+					.addToAdditionalProperties("operation", objOperation)
+					.build();
+
+
+			System.out.println(  Serialization.asYaml( genericKubernetesResource ) );
+
+			System.out.println(  "=============as Json===========================" );
+			System.out.println(  Serialization.asJson( genericKubernetesResource ) );
+			
+			Resource<GenericKubernetesResource> dummyObject = k8s.resource(genericKubernetesResource);
+			// Create Custom Resource
+			dummyObject.create();
+			
+/*
+ * to delete we need: 
+ * kubectl patch app ingress-nginx -n argocd -p '{"metadata": {"finalizers": ["resources-finalizer.argocd.argoproj.io"]}}' --type merge
+ * kubectl delete app ingress-nginx -n argocd			
+ */
+
+		}
+	}
+
+}
+
+
+
+/**
+ * 
+ * 
+{
+  "apiVersion": "argoproj.io/v1alpha1",
+  "kind": "Application",
+  "metadata": {
+    "finalizers": [
+      "resources-finalizer.argocd.argoproj.io"
+    ],
+    "name": "openslice-jenkins",
+    "namespace": "argocd"
+  },
+  "spec": {
+    "project": "default",
+    "destination": {
+      "namespace": "default",
+      "name": "in-cluster"
+    },
+    "source": {
+      "repoURL": "https://charts.jenkins.io",
+      "targetRevision": "4.6.1",
+      "chart": "jenkins",
+      "helm": {
+        "values": "controller:\n  service:\n    type: ClusterIP\n"
+      }
+    }
+  },
+  "operation": {
+    "initiatedBy": {
+      "username": "testadmin"
+    },
+    "sync": {
+      "prune": true,
+      "syncStrategy": {
+        "hook": {}
+      }
+    }
+  }
+}
+ * 
+ */
diff --git a/src/test/java/org/etsi/osl/cridge/CreateResourceArgoNginx.java b/src/test/java/org/etsi/osl/cridge/CreateResourceArgoNginx.java
new file mode 100644
index 0000000000000000000000000000000000000000..b9834f827be4dbfe82417b614872c83381f12548
--- /dev/null
+++ b/src/test/java/org/etsi/osl/cridge/CreateResourceArgoNginx.java
@@ -0,0 +1,72 @@
+package org.etsi.osl.cridge;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
+import io.fabric8.kubernetes.api.model.GenericKubernetesResourceBuilder;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClientBuilder;
+import io.fabric8.kubernetes.client.dsl.base.ResourceDefinitionContext;
+import io.fabric8.kubernetes.client.utils.Serialization;
+import io.fabric8.kubernetes.client.dsl.Resource;
+
+public class CreateResourceArgoNginx {
+
+
+	// @formatter:off
+	public static void main(String[] args) {
+		try (final KubernetesClient k8s = new KubernetesClientBuilder().build()) {
+
+			String yamlfile = 
+"""			
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: ingress-nginx
+  namespace: argocd
+spec:
+  project: default
+  destination:
+    namespace: default
+    #update namespace name if you wish
+    name: in-cluster   #update cluster name if its different
+  source:
+    repoURL: https://kubernetes.github.io/ingress-nginx
+    targetRevision: "4.4.0"
+    chart: ingress-nginx
+    helm:
+      values: |
+        controller:
+          service:
+            type: ClusterIP
+operation:
+  initiatedBy:
+    username: %s
+    		
+  sync:
+    prune: true
+    syncStrategy:
+      hook: {}
+
+""".formatted( "myuser" );
+			
+
+			System.out.println( yamlfile );
+			GenericKubernetesResource gkr =  Serialization.unmarshal(yamlfile);
+			
+		              
+			Resource<GenericKubernetesResource> dummyObject = k8s.resource( gkr );
+			dummyObject.create();
+			
+/*
+ * to delete we need: 
+ * kubectl patch app ingress-nginx -n argocd -p '{"metadata": {"finalizers": ["resources-finalizer.argocd.argoproj.io"]}}' --type merge
+ * kubectl delete app ingress-nginx -n argocd			
+ */
+
+		}
+	}
+
+}
diff --git a/src/test/java/org/etsi/osl/cridge/GetResourcesOfNamespace.java b/src/test/java/org/etsi/osl/cridge/GetResourcesOfNamespace.java
new file mode 100644
index 0000000000000000000000000000000000000000..0b7177a60ce70410d91ff0aa1b609726b1029db7
--- /dev/null
+++ b/src/test/java/org/etsi/osl/cridge/GetResourcesOfNamespace.java
@@ -0,0 +1,83 @@
+package org.etsi.osl.cridge;
+
+import io.fabric8.kubernetes.api.model.ConfigMap;
+import io.fabric8.kubernetes.api.model.Namespace;
+import io.fabric8.kubernetes.api.model.NamespaceBuilder;
+import io.fabric8.kubernetes.api.model.Secret;
+import io.fabric8.kubernetes.api.model.Service;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClientBuilder;
+import io.fabric8.kubernetes.client.Watch;
+import io.fabric8.kubernetes.client.Watcher;
+import io.fabric8.kubernetes.client.WatcherException;
+import io.fabric8.kubernetes.client.Watcher.Action;
+import io.fabric8.kubernetes.client.utils.Serialization;
+
+public class GetResourcesOfNamespace {
+
+
+  // @formatter:off
+  public static void main(String[] args) throws InterruptedException {
+    try (final KubernetesClient k8s = new KubernetesClientBuilder().build()) {
+
+
+      Namespace ns = new NamespaceBuilder()
+          .withNewMetadata()
+          .withName( "opencrdtest" )
+          .endMetadata().build();
+
+
+
+      for (Secret secret : k8s.secrets().inNamespace("opencrdtest").list().getItems() ) {
+        System.out.println( Serialization.asYaml( secret ) );
+      }
+
+      for (Service secret : k8s.services().inNamespace("opencrdtest").list().getItems() ) {
+        System.out.println( Serialization.asYaml( secret ) );
+      }
+
+      for (ConfigMap secret : k8s.configMaps().inNamespace("opencrdtest").list().getItems() ) {
+        System.out.println( Serialization.asYaml( secret ) );
+      }
+
+
+
+    }
+    
+    try (final KubernetesClient k8s = new KubernetesClientBuilder().build()) {
+      Watch watch = k8s.secrets().inNamespace( "16cce858-2f99-4f8f-afe6-9e1f21a78880").watch( new Watcher<>() {
+
+        @Override
+        public void eventReceived(Action action, Secret resource) {
+
+          System.out.println(String.format("%s Namespace watcher Resource Kind:%s Name:%s UID:%s Namespace:%s", action.name(),
+              resource.getKind(), 
+              resource.getMetadata().getName(),
+              resource.getMetadata().getUid(),
+              resource.getMetadata().getNamespace()));
+          //ADDED, DELETED, MODIFIED, BOOKMARK, ERROR
+         
+
+        }
+
+
+
+        @Override
+        public void onClose(WatcherException cause) {
+          System.out.println(String.format("Closing resources Watcher of nameSpace due to %s "+cause.getMessage()));
+          return;
+        }
+
+      });
+      Thread.sleep(60 * 1000L);
+      watch.close();
+    }
+    
+
+    
+    
+  }
+  
+  
+
+}
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e535939c74ad282638c06453b9938ac004463b39
--- /dev/null
+++ b/src/test/resources/logback-test.xml
@@ -0,0 +1,32 @@
+<!--
+  ========================LICENSE_START=================================
+  org.etsi.osl.tmf.api
+  %%
+  Copyright (C) 2019 openslice.io
+  %%
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  =========================LICENSE_END==================================
+  -->
+<configuration>
+    <include resource="/org/springframework/boot/logging/logback/base.xml"/>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+    <root level="error">
+        <appender-ref ref="STDOUT"/>
+    </root>
+    <logger name="root" level="debug"/>
+</configuration>