Skip to content

Commit 33ddf26

Browse files
committed
CONSOLE-4858: Remove get-active-plugins filter
These cycles will be addressed by CONSOLE-4806 and CONSOLE-4840
1 parent baa9292 commit 33ddf26

File tree

5 files changed

+16
-30
lines changed

5 files changed

+16
-30
lines changed

frontend/packages/console-app/src/plugin.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import '@console/internal/i18n.js';
2-
import '@console/shared/src/index.ts'; // this import is load bearing in development?!?!
31
import { GuidedTour, Plugin } from '@console/plugin-sdk';
42
import { getGuidedTour } from './components/guided-tour';
53

frontend/public/components/RBAC/role-type.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ import type { K8sResourceKind } from '../../module/k8s/types';
33

44
export const isSystemRole = (role: K8sResourceKind) => _.startsWith(role.metadata.name, 'system:');
55

6-
// const addHref = (name, ns) => ns ? `/k8s/ns/${ns}/roles/${name}/add-rule` : `/k8s/cluster/clusterroles/${name}/add-rule`;
7-
86
export const roleKind = (role: K8sResourceKind) =>
97
role.metadata.namespace ? 'Role' : 'ClusterRole';
108

frontend/public/locales/en/public.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,8 @@
380380
"{{readyReplicas}} of {{count}} machine_one": "{{readyReplicas}} of {{count}} machine",
381381
"{{readyReplicas}} of {{count}} machine_other": "{{readyReplicas}} of {{count}} machines",
382382
"Create {{objLabel}}": "Create {{objLabel}}",
383+
"Terminating": "Terminating",
384+
"CrashLoopBackOff": "CrashLoopBackOff",
383385
"CronJob details": "CronJob details",
384386
"Schedule": "Schedule",
385387
"Suspend": "Suspend",
@@ -585,14 +587,14 @@
585587
"Showing most recent {{count}} event_one": "Showing most recent {{count}} event",
586588
"Showing most recent {{count}} event_other": "Showing most recent {{count}} events",
587589
"Older events are not stored.": "Older events are not stored.",
588-
"Filter {{label}}...": "Filter {{label}}...",
589590
"Create {{label}}": "Create {{label}}",
590591
"by name": "by name",
591592
"Submit": "Submit",
592593
"Reset": "Reset",
593594
"Row select": "Row select",
594595
"Actions": "Actions",
595596
"Export as CSV": "Export as CSV",
597+
"Filter {{label}}...": "Filter {{label}}...",
596598
"Label": "Label",
597599
"Clear all filters": "Clear all filters",
598600
"Filter": "Filter",
@@ -1094,7 +1096,6 @@
10941096
"Notifications in the other alerts group": "Notifications in the other alerts group",
10951097
"Recommendations": "Recommendations",
10961098
"Notifications in the recommendations group": "Notifications in the recommendations group",
1097-
"Terminating": "Terminating",
10981099
"No PersistentVolume": "No PersistentVolume",
10991100
"Used": "Used",
11001101
"Total": "Total",
@@ -1121,7 +1122,18 @@
11211122
"Reconnect": "Reconnect",
11221123
"Connecting to": "Connecting to",
11231124
"Collapse": "Collapse",
1125+
"Ready": "Ready",
1126+
"Owner": "Owner",
1127+
"IP address": "IP address",
11241128
"Receiving Traffic": "Receiving Traffic",
1129+
"{{numCores}} cores": "{{numCores}} cores",
1130+
"Pod unschedulable": "Pod unschedulable",
1131+
"Pod crash loop back-off": "Pod crash loop back-off",
1132+
"CrashLoopBackOff indicates that the application within the container is failing to start properly.": "CrashLoopBackOff indicates that the application within the container is failing to start properly.",
1133+
"To troubleshoot, view logs and events, then debug in terminal.": "To troubleshoot, view logs and events, then debug in terminal.",
1134+
"View events": "View events",
1135+
"Debug container {{name}}": "Debug container {{name}}",
1136+
"Create Pod": "Create Pod",
11251137
"Not Receiving Traffic": "Not Receiving Traffic",
11261138
"Log in to your account": "Log in to your account",
11271139
"Log in": "Log in",
@@ -1130,10 +1142,6 @@
11301142
"Login is required. Please try again.": "Login is required. Please try again.",
11311143
"Could not check CSRF token. Please try again.": "Could not check CSRF token. Please try again.",
11321144
"Invalid login or password. Please try again.": "Invalid login or password. Please try again.",
1133-
"Ready": "Ready",
1134-
"Owner": "Owner",
1135-
"IP address": "IP address",
1136-
"{{numCores}} cores": "{{numCores}} cores",
11371145
"since <1></1>": "since <1></1>",
11381146
"at <1></1> ": "at <1></1> ",
11391147
"with exit code {{exitCode}} ": "with exit code {{exitCode}} ",
@@ -1143,21 +1151,13 @@
11431151
"Terminated <1></1><2></2><3></3>": "Terminated <1></1><2></2><3></3>",
11441152
"Exit code": "Exit code",
11451153
"View in query browser": "View in query browser",
1146-
"Pod unschedulable": "Pod unschedulable",
1147-
"Pod crash loop back-off": "Pod crash loop back-off",
1148-
"CrashLoopBackOff indicates that the application within the container is failing to start properly.": "CrashLoopBackOff indicates that the application within the container is failing to start properly.",
1149-
"To troubleshoot, view logs and events, then debug in terminal.": "To troubleshoot, view logs and events, then debug in terminal.",
1150-
"View events": "View events",
1151-
"Debug container {{name}}": "Debug container {{name}}",
11521154
"Restart policy": "Restart policy",
11531155
"Pod IPs": "Pod IPs",
11541156
"Host IPs": "Host IPs",
11551157
"Host IP": "Host IP",
11561158
"Image pull secret": "Image pull secret",
11571159
"Pod details": "Pod details",
11581160
"Init containers": "Init containers",
1159-
"CrashLoopBackOff": "CrashLoopBackOff",
1160-
"Create Pod": "Create Pod",
11611161
"Web console update is available": "Web console update is available",
11621162
"There has been an update to the web console. Ensure any changes have been saved and refresh your browser to access the latest version.": "There has been an update to the web console. Ensure any changes have been saved and refresh your browser to access the latest version.",
11631163
"Refresh web console": "Refresh web console",

frontend/webpack.circular-deps.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ const HandleCyclesPluginName = 'HandleCyclesPlugin';
1212
type PresetOptions = {
1313
/** Exclude modules that match the given regex */
1414
exclude?: RegExp;
15-
/** Ignores cycles that involve modules matching the given regex */
16-
filterModules?: RegExp;
1715
/** Path to write the cycle report to */
1816
reportFile: string;
1917
/** Thresholds for the number of cycles detected before emitting an error */
@@ -120,12 +118,7 @@ export class CircularDependencyPreset {
120118
new CircularDependencyPlugin({
121119
exclude: this.options.exclude,
122120
onDetected: ({ module: { resource }, paths: modulePaths }) => {
123-
if (
124-
!this.options.filterModules ||
125-
!modulePaths.some((p) => this.options.filterModules.test(p))
126-
) {
127-
cycles.push({ causedBy: resource, modulePaths });
128-
}
121+
cycles.push({ causedBy: resource, modulePaths });
129122
},
130123
}),
131124
{

frontend/webpack.config.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -340,10 +340,7 @@ const config: Configuration = {
340340
if (CHECK_CYCLES === 'true') {
341341
new CircularDependencyPreset({
342342
exclude: /node_modules|public\/dist|\.(gql|html)$/,
343-
// TODO: investigate how to load the plugins registry asynchronously
344-
filterModules: /^get-active-plugins\.js$/,
345-
// TODO: Fix cycles unveiled by CONSOLE-4837, then remove the below line
346-
thresholds: { totalCycles: 10 },
343+
thresholds: { totalCycles: 21 }, // TODO(CONSOLE-4806): Set threshold to 0
347344
reportFile: '.webpack-cycles',
348345
}).apply(config.plugins);
349346
}

0 commit comments

Comments
 (0)