Merge pull request #54 from bartoval/last_observer_image

Last observer image

Author: bartoval

__tests__/REST.api.spec.ts

@@ -396,7 +396,7 @@ describe('RESTApi', () => {
         .mockResolvedValue({}); // Rest succeed
 
       await expect(RESTApi.createDeployment()).resolves.not.toThrow();
-      expect(mockAxiosFetch).toHaveBeenCalledTimes(11); // Total number of requests
+      expect(mockAxiosFetch).toHaveBeenCalledTimes(10); // Total number of requests
     });
 
     it('handles network errors during deployment deletion', async () => {
@@ -415,7 +415,7 @@ describe('RESTApi', () => {
         .mockResolvedValue({}); // Rest succeed
 
       await expect(RESTApi.deleteDeployment()).resolves.not.toThrow();
-      expect(mockAxiosFetch).toHaveBeenCalledTimes(11); // Total number of requests
+      expect(mockAxiosFetch).toHaveBeenCalledTimes(10); // Total number of requests
     });
   });
 });

src/console/API/REST.api.ts

@@ -26,20 +26,20 @@ import {
   serviceAccountPath,
   configMapPath,
   routePath,
-  linkPath
+  linkPath,
+  jobPath
 } from './REST.paths';
 import { convertSiteCRToSite } from './REST.utils';
 import certificateData from '../deployment/Certificate.json';
 import configMapPromData from '../deployment/ConfigMap-Prom.json';
-import configMapData from '../deployment/ConfigMap.json';
-import deploymentPromData from '../deployment/Deployment-Prom.json';
 import deploymentData from '../deployment/Deployment.json';
+import jobData from '../deployment/Job.json';
 import roleData from '../deployment/Role.json';
 import roleBindingData from '../deployment/RoleBinding.json';
-import RouteData from '../deployment/Route.json';
-import servicePromData from '../deployment/Service-Prom.json';
+import routeData from '../deployment/Route.json';
 import serviceData from '../deployment/Service.json';
 import serviceAccountData from '../deployment/ServiceAccount.json';
+import serviceAccountSetupData from '../deployment/ServiceAccountSetup.json';
 import { ListCrdResponse, PartialDeploymentResponse } from '../interfaces/CRD_Base';
 import { SiteView } from '../interfaces/REST.interfaces';
 
@@ -182,13 +182,12 @@ export const RESTApi = {
       { path: roleBindPath(), data: roleBindingData },
       { path: certificatePath(), data: certificateData },
       { path: deploymentsPath(), data: deploymentData },
-      { path: deploymentsPath(), data: deploymentPromData },
+      { path: jobPath(), data: jobData },
       { path: servicePath(), data: serviceData },
-      { path: servicePath(), data: servicePromData },
+      { path: serviceAccountPath(), data: serviceAccountSetupData },
       { path: serviceAccountPath(), data: serviceAccountData },
-      { path: configMapPath(), data: configMapData },
       { path: configMapPath(), data: configMapPromData },
-      { path: routePath(), data: RouteData }
+      { path: routePath(), data: routeData }
     ];
 
     const promises = requests.map(({ path, data }) =>
@@ -208,16 +207,15 @@ export const RESTApi = {
 
   deleteDeployment: async (): Promise<void> => {
     const requests = [
-      { path: `${routePath()}/${RouteData.metadata.name}` },
+      { path: `${routePath()}/${routeData.metadata.name}` },
       { path: `${rolePath()}/${roleData.metadata.name}` },
       { path: `${roleBindPath()}/${roleBindingData.metadata.name}` },
       { path: `${certificatePath()}/${certificateData.metadata.name}` },
       { path: `${deploymentsPath()}/${deploymentData.metadata.name}` },
-      { path: `${deploymentsPath()}/${deploymentPromData.metadata.name}` },
+      { path: `${deploymentsPath()}/${jobData.metadata.name}` },
       { path: `${servicePath()}/${serviceData.metadata.name}` },
-      { path: `${servicePath()}/${servicePromData.metadata.name}` },
+      { path: `${serviceAccountPath()}/${serviceAccountSetupData.metadata.name}` },
       { path: `${serviceAccountPath()}/${serviceAccountData.metadata.name}` },
-      { path: `${configMapPath()}/${configMapData.metadata.name}` },
       { path: `${configMapPath()}/${configMapPromData.metadata.name}` }
     ];
 

src/console/API/REST.paths.ts

@@ -7,7 +7,8 @@ const BASE_PATHS = {
   cr: `${K8S_PREFIX_PATH}apis/${GROUP}/${API_VERSION}/namespaces`,
   rbac: `${K8S_PREFIX_PATH}apis/rbac.authorization.k8s.io/v1/namespaces`,
   k8s: `${K8S_PREFIX_PATH}api/v1/namespaces`,
-  route: `${K8S_PREFIX_PATH}apis/route.openshift.io/v1/namespaces`
+  route: `${K8S_PREFIX_PATH}apis/route.openshift.io/v1/namespaces`,
+  batch: `${K8S_PREFIX_PATH}apis/batch/v1/namespaces`
 };
 
 // Helper to build namespace paths
@@ -52,3 +53,4 @@ export const servicePath = () => buildPath(BASE_PATHS.k8s, 'services');
 export const serviceAccountPath = () => buildPath(BASE_PATHS.k8s, 'serviceaccounts');
 
 export const routePath = () => buildPath(BASE_PATHS.route, 'routes');
+export const jobPath = () => buildPath(BASE_PATHS.batch, 'jobs');

src/console/deployment/Certificate.json

@@ -2,7 +2,13 @@
   "apiVersion": "skupper.io/v2alpha1",
   "kind": "Certificate",
   "metadata": {
-    "name": "skupper-management-client"
+    "name": "skupper-network-observer-client",
+    "labels": {
+      "app.kubernetes.io/name": "network-observer",
+      "app.kubernetes.io/instance": "skupper-network-observer",
+      "app.kubernetes.io/version": "2.0.0",
+      "app.kubernetes.io/part-of": "skupper-network-observer"
+    }
   },
   "spec": {
     "ca": "skupper-local-ca",

src/console/deployment/ConfigMap-Prom.json

@@ -1,14 +1,16 @@
 {
   "apiVersion": "v1",
-  "data": {
-    "prometheus.yml": "global:\n  scrape_interval: 15s\n  evaluation_interval: 15s\nalerting:\n  alertmanagers:\n    - static_configs:\n        - targets:\nrule_files:\nscrape_configs:\n  - job_name: network-observer-service\n    kubernetes_sd_configs:\n    - role: service\n      kubeconfig_file: \"\"\n      follow_redirects: true\n      enable_http2: true\n      namespaces:\n        own_namespace: true\n    scheme: https\n    tls_config:\n      ca_file: /etc/tls/openshift/service-ca.crt\n    follow_redirects: true\n    enable_http2: true\n    relabel_configs:\n    - source_labels: [__meta_kubernetes_service_label_app_kubernetes_io_name]\n      regex: network-observer\n      action: keep\n    - source_labels: [__meta_kubernetes_service_port_name]\n      regex: https\n      action: keep\n    - action: labelmap\n      regex: __meta_kubernetes_service_label_(.+)\n      replacement: $1\n    - source_labels: [__meta_kubernetes_namespace]\n      target_label: namespace\n    - source_labels: [__meta_kubernetes_service_name]\n      target_label: service\n",
-    "web-config.yml": "# TLS configuration.\n#\n#tls_server_config:\n#  cert_file: /etc/tls/certs/tls.crt\n#  key_file: /etc/tls/certs/tls.key\n"
-  },
   "kind": "ConfigMap",
   "metadata": {
-    "name": "prometheus-server-config",
+    "name": "skupper-network-observer-prometheus",
     "labels": {
+      "app.kubernetes.io/name": "network-observer",
+      "app.kubernetes.io/instance": "skupper-network-observer",
+      "app.kubernetes.io/version": "2.0.0",
       "app.kubernetes.io/part-of": "skupper-network-observer"
     }
+  },
+  "data": {
+    "prometheus.yml": "global:\n  scrape_interval:     15s\n  evaluation_interval: 15s\nalerting:\n  alertmanagers:\n    - static_configs:\n        - targets:\nscrape_configs:\n  - job_name: \"network-observer-local\"\n    scheme: http\n    follow_redirects: true\n    enable_http2: true\n    static_configs:\n      - targets: [ \"localhost:8080\" ]\n"
   }
 }