Prepare for next version (#401)

* Copy of Kiali frontend source code Kiali frontend source originated from: * git ref: v2.2 * git commit: cb33b859493abf0d2706068ddaaace5656dc0d4d * GitHub URL: https://github.com/kiali/kiali/tree/cb33b859493abf0d2706068ddaaace5656dc0d4d/frontend/src Signed-off-by: kiali-bot <[email protected]> * Release v2.2.0 * Prepare for next version --------- Signed-off-by: kiali-bot <[email protected]> Co-authored-by: kiali-bot <[email protected]>
kiali · Dec 3, 2024 · f195018 · f195018
1 parent 3db69ba
commit f195018
Show file tree

Hide file tree

Showing 45 changed files with 469 additions and 315 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 SHELL=/bin/bash
 
 # Identifies the current build. Match the same version of Kiali Server and Operator.
-VERSION ?= v2.2.0-SNAPSHOT
+VERSION ?= v2.3.0-SNAPSHOT
 COMMIT_HASH ?= $(shell git rev-parse HEAD)
 
 # Directories based on the root project directory

diff --git a/plugin/cypress/integration/kiali/common/apps.ts b/plugin/cypress/integration/kiali/common/apps.ts
@@ -55,7 +55,7 @@ Then('user sees span details', () => {
     .eq(1) // take 1st  row
     .find('td')
     .eq(4) // take 5th cell (kebab)
-    .should('be.visible');
+    .should('exist');
 
   cy.get('table')
     .should('be.visible')

diff --git a/plugin/cypress/integration/kiali/common/workload_logs.ts b/plugin/cypress/integration/kiali/common/workload_logs.ts
@@ -8,8 +8,20 @@ Given(
   'I am on the logs tab of the {string} workload detail page of the {string} namespace',
   (workload: string, namespace: string) => {
     cy.visit({ url: `/console/namespaces/${namespace}/workloads/${workload}?tab=logs&refresh=0` });
-    cy.get('#metrics_filter_interval_duration-toggle').click();
-    cy.get('#1800').click();
+
+    const changeIntervalDuration = (): void => {
+      cy.get('#metrics_filter_interval_duration-toggle').click();
+      cy.get('#1800').click();
+    };
+
+    // In OSSMC, the duration interval is configured using the time duration modal component
+    if (Cypress.env('OSSMC')) {
+      cy.get('#time_duration').click();
+      changeIntervalDuration();
+      cy.get('#time-duration-modal').find('button').contains('Confirm').click();
+    } else {
+      changeIntervalDuration();
+    }
   }
 );
 

diff --git a/plugin/package.json b/plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ossmconsole",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "private": true,
   "repository": {
     "type": "git",

diff --git a/plugin/plugin-metadata.ts b/plugin/plugin-metadata.ts
@@ -2,7 +2,7 @@ import { ConsolePluginBuildMetadata } from '@openshift-console/dynamic-plugin-sd
 
 const metadata: ConsolePluginBuildMetadata = {
   name: 'ossmconsole',
-  version: '2.2.0',
+  version: '2.3.0',
   displayName: 'OpenShift Service Mesh Console',
   description: 'Provides Service Mesh/Istio Observability',
   exposedModules: {

diff --git a/plugin/src/kiali/README.md b/plugin/src/kiali/README.md
@@ -2,6 +2,6 @@
 
 Copy of Kiali frontend source code
 Kiali frontend source originated from:
-* git ref:    master
-* git commit: f9f04eef5bdaa9df626030a778d3ba53a40df75e
-* GitHub URL: https://github.com/kiali/kiali/tree/f9f04eef5bdaa9df626030a778d3ba53a40df75e/frontend/src
+* git ref:    v2.2
+* git commit: cb33b859493abf0d2706068ddaaace5656dc0d4d
+* GitHub URL: https://github.com/kiali/kiali/tree/cb33b859493abf0d2706068ddaaace5656dc0d4d/frontend/src
diff --git a/plugin/src/kiali/components/Envoy/tables/ClusterTable.tsx b/plugin/src/kiali/components/Envoy/tables/ClusterTable.tsx
@@ -13,7 +13,7 @@ import { kialiStyle } from 'styles/StyleUtils';
 import { isParentKiosk } from '../../Kiosk/KioskActions';
 import { SortableTh } from 'components/Table/SimpleTable';
 import { t } from 'utils/I18nUtils';
-import { dicIstioTypeToGVK } from '../../../types/IstioConfigList';
+import { dicTypeToGVK, gvkType } from '../../../types/IstioConfigList';
 
 export class ClusterTable implements SummaryTable {
   kiosk: string;
@@ -271,7 +271,7 @@ export class ClusterTable implements SummaryTable {
               value.subset,
               value.direction,
               value.type,
-              istioConfigLink(value.destination_rule, dicIstioTypeToGVK['DestinationRule'])
+              istioConfigLink(value.destination_rule, dicTypeToGVK[gvkType.DestinationRule])
             ]
           };
         }

diff --git a/plugin/src/kiali/components/Envoy/tables/RouteTable.tsx b/plugin/src/kiali/components/Envoy/tables/RouteTable.tsx
@@ -12,7 +12,7 @@ import { KialiIcon } from 'config/KialiIcon';
 import { kialiStyle } from 'styles/StyleUtils';
 import { isParentKiosk } from '../../Kiosk/KioskActions';
 import { SortableTh } from 'components/Table/SimpleTable';
-import { dicIstioTypeToGVK } from '../../../types/IstioConfigList';
+import { dicTypeToGVK, gvkType } from '../../../types/IstioConfigList';
 
 export class RouteTable implements SummaryTable {
   kiosk: string;
@@ -187,7 +187,7 @@ export class RouteTable implements SummaryTable {
               summary.name,
               serviceLink(summary.domains, this.namespaces, this.namespace, true, parentKiosk),
               summary.match,
-              istioConfigLink(summary.virtual_service, dicIstioTypeToGVK['VirtualService'])
+              istioConfigLink(summary.virtual_service, dicTypeToGVK[gvkType.VirtualService])
             ]
           };
         }

diff --git a/plugin/src/kiali/components/IstioWizards/ServiceWizard.tsx b/plugin/src/kiali/components/IstioWizards/ServiceWizard.tsx
@@ -73,7 +73,7 @@ import { ConfigPreviewItem, IstioConfigPreview } from 'components/IstioConfigPre
 import { KialiIcon } from '../../config/KialiIcon';
 import { ApiResponse } from 'types/Api';
 import { t } from 'utils/I18nUtils';
-import { dicIstioTypeToGVK } from '../../types/IstioConfigList';
+import { dicTypeToGVK, gvkType } from '../../types/IstioConfigList';
 import { getGVKTypeString } from '../../utils/IstioConfigUtils';
 
 const emptyServiceWizardState = (fqdnServiceName: string): ServiceWizardState => {
@@ -371,7 +371,7 @@ export class ServiceWizard extends React.Component<ServiceWizardProps, ServiceWi
           promises.push(
             API.createIstioConfigDetail(
               this.props.namespace,
-              dicIstioTypeToGVK['Gateway'],
+              dicTypeToGVK[gvkType.Gateway],
               JSON.stringify(gw),
               this.props.cluster
             )
@@ -382,7 +382,7 @@ export class ServiceWizard extends React.Component<ServiceWizardProps, ServiceWi
           promises.push(
             API.createIstioConfigDetail(
               this.props.namespace,
-              dicIstioTypeToGVK['K8sGateway'],
+              dicTypeToGVK[gvkType.K8sGateway],
               JSON.stringify(k8sgateway),
               this.props.cluster
             )
@@ -394,7 +394,7 @@ export class ServiceWizard extends React.Component<ServiceWizardProps, ServiceWi
             promises.push(
               API.updateIstioConfigDetail(
                 this.props.namespace,
-                dicIstioTypeToGVK['DestinationRule'],
+                dicTypeToGVK[gvkType.DestinationRule],
                 dr.metadata.name,
                 JSON.stringify(dr),
                 this.props.cluster
@@ -406,7 +406,7 @@ export class ServiceWizard extends React.Component<ServiceWizardProps, ServiceWi
             promises.push(
               API.updateIstioConfigDetail(
                 this.props.namespace,
-                dicIstioTypeToGVK['VirtualService'],
+                dicTypeToGVK[gvkType.VirtualService],
                 vs.metadata.name,
                 JSON.stringify(vs),
                 this.props.cluster
@@ -418,7 +418,7 @@ export class ServiceWizard extends React.Component<ServiceWizardProps, ServiceWi
             promises.push(
               API.updateIstioConfigDetail(
                 this.props.namespace,
-                dicIstioTypeToGVK['K8sHTTPRoute'],
+                dicTypeToGVK[gvkType.K8sHTTPRoute],
                 k8shttproute.metadata.name,
                 JSON.stringify(k8shttproute),
                 this.props.cluster
@@ -430,7 +430,7 @@ export class ServiceWizard extends React.Component<ServiceWizardProps, ServiceWi
             promises.push(
               API.updateIstioConfigDetail(
                 this.props.namespace,
-                dicIstioTypeToGVK['K8sGRPCRoute'],
+                dicTypeToGVK[gvkType.K8sGRPCRoute],
                 k8sgrpcroute.metadata.name,
                 JSON.stringify(k8sgrpcroute),
                 this.props.cluster
@@ -447,7 +447,7 @@ export class ServiceWizard extends React.Component<ServiceWizardProps, ServiceWi
             promises.push(
               API.createIstioConfigDetail(
                 this.props.namespace,
-                dicIstioTypeToGVK['DestinationRule'],
+                dicTypeToGVK[gvkType.DestinationRule],
                 JSON.stringify(dr),
                 this.props.cluster
               )
@@ -458,7 +458,7 @@ export class ServiceWizard extends React.Component<ServiceWizardProps, ServiceWi
             promises.push(
               API.createIstioConfigDetail(
                 this.props.namespace,
-                dicIstioTypeToGVK['VirtualService'],
+                dicTypeToGVK[gvkType.VirtualService],
                 JSON.stringify(vs),
                 this.props.cluster
               )
@@ -469,7 +469,7 @@ export class ServiceWizard extends React.Component<ServiceWizardProps, ServiceWi
             promises.push(
               API.createIstioConfigDetail(
                 this.props.namespace,
-                dicIstioTypeToGVK['K8sHTTPRoute'],
+                dicTypeToGVK[gvkType.K8sHTTPRoute],
                 JSON.stringify(k8shttproute),
                 this.props.cluster
               )
@@ -480,7 +480,7 @@ export class ServiceWizard extends React.Component<ServiceWizardProps, ServiceWi
             promises.push(
               API.createIstioConfigDetail(
                 this.props.namespace,
-                dicIstioTypeToGVK['K8sGRPCRoute'],
+                dicTypeToGVK[gvkType.K8sGRPCRoute],
                 JSON.stringify(k8sgrpcroute),
                 this.props.cluster
               )
@@ -491,7 +491,7 @@ export class ServiceWizard extends React.Component<ServiceWizardProps, ServiceWi
             promises.push(
               API.createIstioConfigDetail(
                 this.props.namespace,
-                dicIstioTypeToGVK['PeerAuthentication'],
+                dicTypeToGVK[gvkType.PeerAuthentication],
                 JSON.stringify(pa),
                 this.props.cluster
               )
@@ -539,7 +539,7 @@ export class ServiceWizard extends React.Component<ServiceWizardProps, ServiceWi
         promises.push(
           API.createIstioConfigDetail(
             this.props.namespace,
-            dicIstioTypeToGVK['PeerAuthentication'],
+            dicTypeToGVK[gvkType.PeerAuthentication],
             JSON.stringify(pa),
             this.props.cluster
           )
@@ -548,7 +548,7 @@ export class ServiceWizard extends React.Component<ServiceWizardProps, ServiceWi
         promises.push(
           API.updateIstioConfigDetail(
             this.props.namespace,
-            dicIstioTypeToGVK['PeerAuthentication'],
+            dicTypeToGVK[gvkType.PeerAuthentication],
             dr.metadata.name,
             JSON.stringify(pa),
             this.props.cluster
@@ -559,7 +559,7 @@ export class ServiceWizard extends React.Component<ServiceWizardProps, ServiceWi
       promises.push(
         API.deleteIstioConfigDetail(
           this.props.namespace,
-          dicIstioTypeToGVK['PeerAuthentication'],
+          dicTypeToGVK[gvkType.PeerAuthentication],
           dr.metadata.name,
           this.props.cluster
         )
@@ -756,13 +756,17 @@ export class ServiceWizard extends React.Component<ServiceWizardProps, ServiceWi
   };
 
   onConfirmPreview = (items: ConfigPreviewItem[]): void => {
-    const dr = items.filter(it => getGVKTypeString(it.objectGVK) === getGVKTypeString('DestinationRule'))[0];
-    const gw = items.filter(it => getGVKTypeString(it.objectGVK) === getGVKTypeString('Gateway'))[0];
-    const k8sgateway = items.filter(it => getGVKTypeString(it.objectGVK) === getGVKTypeString('K8sGateway'))[0];
-    const pa = items.filter(it => getGVKTypeString(it.objectGVK) === getGVKTypeString('PeerAuthentication'))[0];
-    const vs = items.filter(it => getGVKTypeString(it.objectGVK) === getGVKTypeString('VirtualService'))[0];
-    const k8shttproute = items.filter(it => getGVKTypeString(it.objectGVK) === getGVKTypeString('K8sHTTPRoute'))[0];
-    const k8sgrpcroute = items.filter(it => getGVKTypeString(it.objectGVK) === getGVKTypeString('K8sGRPCRoute'))[0];
+    const dr = items.filter(it => getGVKTypeString(it.objectGVK) === getGVKTypeString(gvkType.DestinationRule))[0];
+    const gw = items.filter(it => getGVKTypeString(it.objectGVK) === getGVKTypeString(gvkType.Gateway))[0];
+    const k8sgateway = items.filter(it => getGVKTypeString(it.objectGVK) === getGVKTypeString(gvkType.K8sGateway))[0];
+    const pa = items.filter(it => getGVKTypeString(it.objectGVK) === getGVKTypeString(gvkType.PeerAuthentication))[0];
+    const vs = items.filter(it => getGVKTypeString(it.objectGVK) === getGVKTypeString(gvkType.VirtualService))[0];
+    const k8shttproute = items.filter(
+      it => getGVKTypeString(it.objectGVK) === getGVKTypeString(gvkType.K8sHTTPRoute)
+    )[0];
+    const k8sgrpcroute = items.filter(
+      it => getGVKTypeString(it.objectGVK) === getGVKTypeString(gvkType.K8sGRPCRoute)
+    )[0];
 
     const previews: WizardPreviews = {
       dr: dr ? (dr.items[0] as DestinationRule) : undefined,
@@ -783,51 +787,51 @@ export class ServiceWizard extends React.Component<ServiceWizardProps, ServiceWi
     if (this.state.previews) {
       if (this.state.previews.dr) {
         items.push({
-          objectGVK: dicIstioTypeToGVK['DestinationRule'],
+          objectGVK: dicTypeToGVK[gvkType.DestinationRule],
           items: [this.state.previews.dr],
           title: 'Destination Rule'
         });
       }
 
       if (this.state.previews.gw) {
-        items.push({ objectGVK: dicIstioTypeToGVK['Gateway'], items: [this.state.previews.gw], title: 'Gateway' });
+        items.push({ objectGVK: dicTypeToGVK[gvkType.Gateway], items: [this.state.previews.gw], title: 'Gateway' });
       }
 
       if (this.state.previews.k8sgateway) {
         items.push({
-          objectGVK: dicIstioTypeToGVK['K8sGateway'],
+          objectGVK: dicTypeToGVK[gvkType.K8sGateway],
           items: [this.state.previews.k8sgateway],
           title: 'K8s Gateway'
         });
       }
 
       if (this.state.previews.k8shttproute) {
         items.push({
-          objectGVK: dicIstioTypeToGVK['K8sHTTPRoute'],
+          objectGVK: dicTypeToGVK[gvkType.K8sHTTPRoute],
           items: [this.state.previews.k8shttproute],
           title: 'K8s HTTPRoute'
         });
       }
 
       if (this.state.previews.k8sgrpcroute) {
         items.push({
-          objectGVK: dicIstioTypeToGVK['K8sGRPCRoute'],
+          objectGVK: dicTypeToGVK[gvkType.K8sGRPCRoute],
           items: [this.state.previews.k8sgrpcroute],
           title: 'K8s GRPCRoute'
         });
       }
 
       if (this.state.previews.pa) {
         items.push({
-          objectGVK: dicIstioTypeToGVK['PeerAuthentication'],
+          objectGVK: dicTypeToGVK[gvkType.PeerAuthentication],
           items: [this.state.previews.pa],
           title: 'Peer Authentication'
         });
       }
 
       if (this.state.previews.vs) {
         items.push({
-          objectGVK: dicIstioTypeToGVK['VirtualService'],
+          objectGVK: dicTypeToGVK[gvkType.VirtualService],
           items: [this.state.previews.vs],
           title: 'VirtualService'
         });

diff --git a/plugin/src/kiali/components/IstioWizards/WizardActions.ts b/plugin/src/kiali/components/IstioWizards/WizardActions.ts
@@ -11,6 +11,7 @@ import {
   ConnectionPoolSettings,
   DestinationRule,
   Gateway,
+  GroupVersionKind,
   HTTPMatchRequest,
   HTTPRoute,
   HTTPRouteDestination,
@@ -68,6 +69,7 @@ import { ADD, SET, REQ_MOD, RESP_MOD, REQ_RED, REQ_MIR } from './K8sRequestRouti
 import { ANYTHING, PRESENCE } from './RequestRouting/MatchBuilder';
 import { t } from 'utils/I18nUtils';
 import { defaultGatewayLabel, defaultGatewayLabelValue } from 'config/Constants';
+import { dicTypeToGVK, gvkType } from '../../types/IstioConfigList';
 
 export const WIZARD_TRAFFIC_SHIFTING = 'traffic_shifting';
 export const WIZARD_TCP_TRAFFIC_SHIFTING = 'tcp_traffic_shifting';
@@ -2366,7 +2368,7 @@ export const buildNamespaceInjectionPatch = (enable: boolean, remove: boolean, r
   return JSON.stringify(patch);
 };
 
-export const buildWorkloadInjectionPatch = (workloadType: string, enable: boolean, remove: boolean): string => {
+export const buildWorkloadInjectionPatch = (gvk: GroupVersionKind, enable: boolean, remove: boolean): string => {
   const patch = {};
 
   // environments prefer to use the pod label over the annotation
@@ -2375,7 +2377,7 @@ export const buildWorkloadInjectionPatch = (workloadType: string, enable: boolea
   labels[serverConfig.istioAnnotations.istioInjectionAnnotation] = remove ? null : enable ? 'true' : 'false';
   const annotations = {};
   annotations[serverConfig.istioAnnotations.istioInjectionAnnotation] = null;
-  if (workloadType === 'Pod') {
+  if (gvk.Kind === dicTypeToGVK[gvkType.Pod].Kind) {
     patch['labels'] = labels;
     patch['annotations'] = annotations;
   } else {

diff --git a/plugin/src/kiali/components/IstioWizards/WorkloadWizardActionsDropdownGroup.tsx b/plugin/src/kiali/components/IstioWizards/WorkloadWizardActionsDropdownGroup.tsx
@@ -15,6 +15,8 @@ import { renderDisabledDropdownOption } from 'utils/DropdownUtils';
 import { MessageType } from 'types/MessageCenter';
 import { groupMenuStyle } from 'styles/DropdownStyles';
 import { t } from 'utils/I18nUtils';
+import { getGVKTypeString } from '../../utils/IstioConfigUtils';
+import { gvkType } from '../../types/IstioConfigList';
 
 type Props = {
   actionsLabel: boolean;
@@ -34,11 +36,11 @@ export const WorkloadWizardActionsDropdownGroup: React.FunctionComponent<Props>
       case WIZARD_REMOVE_AUTO_INJECTION:
         const remove = key === WIZARD_REMOVE_AUTO_INJECTION;
         const enable = key === WIZARD_ENABLE_AUTO_INJECTION;
-        const jsonInjectionPatch = buildWorkloadInjectionPatch(props.workload.type, enable, remove);
+        const jsonInjectionPatch = buildWorkloadInjectionPatch(props.workload.gvk, enable, remove);
         API.updateWorkload(
           props.namespace,
           props.workload.name,
-          props.workload.type,
+          props.workload.gvk,
           jsonInjectionPatch,
           undefined,
           props.workload.cluster
@@ -139,7 +141,7 @@ export const WorkloadWizardActionsDropdownGroup: React.FunctionComponent<Props>
   }
 
   // Annotations
-  if (props.annotations && props.workload.type === 'Deployment') {
+  if (props.annotations && getGVKTypeString(props.workload.gvk) === getGVKTypeString(gvkType.Deployment)) {
     const annotationsAction = (
       <DropdownItem
         data-test={WIZARD_EDIT_ANNOTATIONS}