Kubero V3 refactoring

.dockerignore

@@ -1,4 +1,4 @@
-**/node_modules_AAAA
+**/node_modules
 Dockerfile
 .dockerignore
 .git
@@ -9,4 +9,4 @@ docker-compose.*
 kind.*
 .eslintrc.js
 README.md
-**/dist_AAAAA
+**/dist

Dockerfile

@@ -4,12 +4,11 @@ ENV NODE_ENV=development
 WORKDIR /build
 
 ## Server
-COPY server ./server
+COPY server-refactored-v3 ./server
 RUN cd /build/server && \
     yarn install
 RUN cd /build/server && \
-    yarn build && \
-    yarn swaggergen
+    yarn build
 
 ## Client
 COPY client ./client
@@ -30,13 +29,15 @@ WORKDIR /app/
 
 COPY --from=build /build/server/dist /app/server
 COPY --from=build /build/server/package.json /app/server/package.json
-COPY --from=build /build/server/src/modules/templates /app/server/modules/templates
+COPY --from=build /build/server/src/deployments/templates /app/server/deployments/templates
 COPY --from=build /build/server/node_modules /app/server/node_modules
-COPY --from=build /build/server/swagger.json /app/swagger.json
+
+# temporary fix for the public folder
+COPY --from=build /build/server-refactored-v3/dist/public /app/server/public
 
 
 RUN echo -n $VERSION > /app/server/VERSION
 
 WORKDIR /app/server
 
-CMD [ "node", "index.js" ]
+CMD [ "node", "main" ]

SECURITY.md

@@ -5,6 +5,7 @@
 | Version | Supported          |
 | ------- | ------------------ |
 | 2.X.X   | :white_check_mark: |
+| 2.X.X   | EOL 31.03.2025     |
 | 1.X.X   | EOL 28.09.2024     |
 | 0.X.X   |                    |
 

client/package.json

@@ -3,8 +3,8 @@
   "private": true,
   "license": "GPL-3.0",
   "scripts": {
-    "dev": "vite",
-    "watch": "vue-tsc --noEmit && vite build --watch",
+    "run": "vite",
+    "dev": "vue-tsc --noEmit && vite build --watch",
     "build": "vue-tsc --noEmit && vite build",
     "preview": "vite preview",
     "lint": "eslint . --fix --ignore-path .gitignore"

client/src/components/apps/addons.vue

@@ -272,7 +272,7 @@ export default defineComponent({
             this.dialog = true;
         },
         loadStorageClasses() {
-            axios.get(`/api/config/storageclasses`)
+            axios.get(`/api/kubernetes/storageclasses`)
             .then(response => {
                 for (let storageClass of response.data) {
                     this.availableStorageClasses.push({

client/src/components/apps/alerts.vue

@@ -84,7 +84,7 @@ export default {
             }, 10000);
         },
         loadRules() {
-            axios.get(`/api/rules/${this.pipeline}/${this.phase}/${this.app}`)
+            axios.get(`/api/metrics/rules/${this.pipeline}/${this.phase}/${this.app}`)
             .then(response => {
                 this.rules = response.data
             })

client/src/components/apps/appstats.vue

@@ -480,7 +480,7 @@ export default defineComponent({
     },
     methods: {
         loadUptimes() {
-            axios.get(`/api/uptimes/${this.pipeline}/${this.phase}`)
+            axios.get(`/api/metrics/uptimes/${this.pipeline}/${this.phase}`)
             .then(response => {
                 this.uptimes = response.data;
                 this.loadMetrics();
@@ -491,7 +491,7 @@ export default defineComponent({
         },
 
         loadMetrics() {
-            axios.get(`/api/metrics/${this.pipeline}/${this.phase}/${this.app}`)
+            axios.get(`/api/metrics/resources/${this.pipeline}/${this.phase}/${this.app}`)
             .then(response => {
                 for (var i = 0; i < response.data.length; i++) {
                     if (response.data[i].cpu.percentage != null && response.data[i].memory.percentage != null) {

client/src/components/apps/buildsform.vue

@@ -137,7 +137,7 @@ export default defineComponent({
         const repoB64 = btoa(this.appData?.spec.gitrepo.ssh_url)
         //const provider = this.appData?.spec.gitrepo.provider
         const provider = "github" // TODO: FIX: get provider from appData
-        axios.get(`/api/repo/${provider}/${repoB64}/references/list`)
+        axios.get(`/api/repo/${provider}/${repoB64}/references`)
         .then(response => {
             this.references = response.data
         })

client/src/components/apps/console.vue

@@ -109,7 +109,7 @@ export default defineComponent({
     }),
     methods: {
         loadPods() {
-            axios.get(`/api/status/pods/${this.pipeline}/${this.phase}/${this.app}`).then((response) => {
+            axios.get(`/api/apps/${this.pipeline}/${this.phase}/${this.app}/pods`).then((response) => {
                 //this.loadContainers();
                 for (let pod of response.data) {
                     const p = {name: pod.name, containers: pod.containers.map((c: any) => c.name)} as Pod;
@@ -258,7 +258,7 @@ export default defineComponent({
             });
         },
         execInContainer(){
-            axios.post(`/api/console/${this.pipeline}/${this.phase}/${this.app}/exec`, {
+            axios.post(`/api/apps/${this.pipeline}/${this.phase}/${this.app}/console`, {
                 podName: this.pod.name,
                 containerName: this.container,
                 command: this.command,

client/src/components/apps/detail.vue

@@ -160,7 +160,7 @@ export default defineComponent({
             });
         },
         loadApp() {
-            axios.get('/api/pipelines/'+this.pipeline+'/'+this.phase+'/'+this.app).then(response => {
+            axios.get('/api/apps/'+this.pipeline+'/'+this.phase+'/'+this.app).then(response => {
                 this.appData = response.data;
                 //console.log(this.appData);
             });
@@ -172,7 +172,7 @@ export default defineComponent({
             this.$router.push(`/pipeline/${this.pipeline}/${this.phase}/apps/${this.app}`);
         },
         ActionStartDownload() {
-            axios.get('/api/pipelines/'+this.pipeline+'/'+this.phase+'/'+this.app+'/download').then(response => {
+            axios.get('/api/apps/'+this.pipeline+'/'+this.phase+'/'+this.app+'/download').then(response => {
                 //console.log(response.data);
                 const url = window.URL.createObjectURL(new Blob([response.data]));
                 const link = document.createElement('a');
@@ -197,7 +197,7 @@ export default defineComponent({
             })
             .then((result) => {
                 if (result.isConfirmed) {
-                    axios.delete(`/api/pipelines/${this.pipeline}/${this.phase}/${this.app}`)
+                    axios.delete(`/api/apps/${this.pipeline}/${this.phase}/${this.app}`)
                     .then(response => {
                         // sleep 1 second
                         setTimeout(() => {
@@ -213,7 +213,7 @@ export default defineComponent({
             });
         },
         async restartApp() {
-            axios.get(`/api/pipelines/${this.pipeline}/${this.phase}/${this.app}/restart`)
+            axios.get(`/api/apps/${this.pipeline}/${this.phase}/${this.app}/restart`)
             .then(response => {
                 //console.log(response);
                 this.loadingState = true;

client/src/components/apps/events.vue

@@ -139,7 +139,7 @@ export default defineComponent({
         const namespace = this.pipeline + "-" + this.phase;
         //axios.get(`/api/events?namespace=${this.$route.query.namespace}`)
         //console.log("loadEvents", namespace);
-        axios.get(`/api/events?namespace=${namespace}`)
+        axios.get(`/api/kubernetes/events?namespace=${namespace}`)
         .then(response => {
             // sort by creationTimestamp
             response.data.sort((a: any, b: any) => {