Skip to content

Commit

Permalink
Merge branch 'master' into release-3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
harrisonliu5 committed Oct 30, 2023
2 parents 3bd19e0 + bff4820 commit 1e832ea
Show file tree
Hide file tree
Showing 145 changed files with 2,012 additions and 536 deletions.
7 changes: 4 additions & 3 deletions build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
# that can be found in the LICENSE file.

# Prepare the build environment
FROM node:12-alpine3.14 as builder
FROM node:14-alpine as builder

ARG YARN_VERSION=1.22.4

WORKDIR /kubesphere
ADD . /kubesphere/

RUN apk add --no-cache --virtual .build-deps ca-certificates python2 python3 py3-pip make openssl g++ bash
RUN apk add --no-cache --virtual python2
RUN apk add --no-cache --virtual .build-deps ca-certificates python3 py3-pip make openssl g++ bash
RUN npm install yarn@${YARN_VERSION}

# If you have trouble downloading the yarn binary, try the following:
Expand All @@ -32,7 +33,7 @@ RUN mv /kubesphere/package.json /out/
##############
# Final Image
##############
FROM node:12-alpine3.14 as base_os_context
FROM node:14-alpine as base_os_context

RUN adduser -D -g kubesphere -u 1002 kubesphere && \
mkdir -p /opt/kubesphere/console && \
Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile.dapper
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Use of this source code is governed by an Apache license
# that can be found in the LICENSE file.

FROM node:12-alpine3.14
FROM node:14-alpine

RUN adduser -D -g kubesphere -u 1002 kubesphere && \
mkdir -p /opt/kubesphere/console && \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ module.exports = {
// Navigation Pane
GATEWAY_SETTINGS: 'Gateway Settings',
// Banner
CLUSTER_GATEWAY_DESC: 'Set up and manage the configuration of the external network access gateway and service management in the cluster.',
CLUSTER_GATEWAY_DESC:
'Set up and manage the configuration of the external network access gateway and service management in the cluster.',
// Cluster Gateway
CLUSTER_GATEWAY_NOT_ENABLED: 'Cluster Gateway Not Enabled',
CLUSTER_ENABLE_GATEWAY_DESC: 'Please enable the cluster gateway.',
Expand All @@ -28,21 +29,25 @@ module.exports = {
LOAD_BALANCER_PROVIDER_SCAP: 'Load balancer provider',
// Cluster Gateway > Enable Gateway
ENABLE_GATEWAY: 'Enable Gateway',
GATEWAY_TRACING_TIP: 'If routes cannot be accessed after <b>Tracing</b> is enabled, please add the annotation <b>nginx.ingress.kubernetes.io/service-upstream: true </b> to the route.',
GATEWAY_TRACING_TIP:
'If routes cannot be accessed after <b>Tracing</b> is enabled, please add the annotation <b>nginx.ingress.kubernetes.io/service-upstream: true </b> to the route.',
// Cluster Gateway > Manage > View Details
VIEW_DETAILS: 'View Details',
// Cluster Gateway > Manage > Disable
DISABLE: 'Disable',
DISABLE_GATEWAY: 'Disable Gateway',
DISABLE_GATEWAY_TIP: 'Are you sure you want to disable the gateway?',
DISABLE_SUCCESSFUL: 'Disabled successfully.',
ENABLE_SUCCESSFUL: 'Enabled successfully.',
RESET_SUCCESSFUL: 'Reset successful',
// Cluster Gateway > Manage > Edit
EDIT: 'Edit',
EDIT_TITLE: 'Edit {title}',
// Cluster Gateway > Manage > Update
UPDATE: 'Update',
UPDATED_GATEWAY_TITLE: 'Update Gateway',
UPDATE_GATEWAY_DESC: 'This operation may interrupt business for a short while. Exercise caution when performing this operation.',
UPDATE_GATEWAY_DESC:
'This operation may interrupt business for a short while. Exercise caution when performing this operation.',
// Project Gateways
PROJECT_GATEWAY_PL: 'Project Gateways',
PROJECT_GATEWAY_NOT_ENABLED: 'Project Gateway Not Enabled',
Expand All @@ -52,5 +57,5 @@ module.exports = {
UPDATE_GATEWAY_DESC: 'The current gateway can be updated.',
// Project Gateways > Disable
PROJECT_GATEWAY_LOW: 'project gateway',
DISABLE_MULTIPLE_GATEWAYS: 'Disable Multiple Gateways'
};
DISABLE_MULTIPLE_GATEWAYS: 'Disable Multiple Gateways',
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@
module.exports = {
// Banner
ALERTING_POLICY_PL: 'Rule Groups',
ALERTING_POLICY_DESC: 'A rule group contains alert rules used to monitor cluster resources.',
ALERTING_POLICY_DESC:
'A rule group contains alert rules used to monitor cluster resources.',
REQUESTS_FOR_TRIGGER_AN_ALARM_Q: 'How are alerts generated?',
REQUESTS_FOR_TRIGGER_AN_ALARM_A: 'You need to create a rule group and set alert rules. The system will generate alerts when resource metrics meet conditions configured in rule groups.',
REQUESTS_FOR_TRIGGER_AN_ALARM_A:
'You need to create a rule group and set alert rules. The system will generate alerts when resource metrics meet conditions configured in rule groups.',
// List
CUSTOM_POLICIES: 'Custom Rule Groups',
BUILT_IN_POLICIES: 'Built-in Rule Groups',
Expand All @@ -44,24 +46,31 @@ module.exports = {
INVALID_TIME_DESC: 'Invalid value. Please enter 0 or a positive integer.',
ALIAS: 'Alias',
DURATION_MIN: 'Duration (minutes)',
ALERT_DURATION: 'Set the system to wait for a certain duration and check whether the alert situation persists before firing an alert.',
LONG_NAME_DESC: 'The name can contain only lowercase letters, numbers, and hyphens (-), and must start and end with a lowercase letter or number. The maximum length is 253 characters.',
ALERT_DURATION:
'Set the system to wait for a certain duration and check whether the alert situation persists before firing an alert.',
LONG_NAME_DESC:
'The name can contain only lowercase letters, numbers, and hyphens (-), and must start and end with a lowercase letter or number. The maximum length is 253 characters.',
NAME_EXIST_DESC: 'The name already exists. Please enter another name.',
ALIAS_NAME_DESC: 'The alias name can contain only letters, numbers, and hyphens (-), and cannot start or end with a hyphen. The maximum length is 63 characters.',
ALIAS_NAME_DESC:
'The alias name can contain only letters, numbers, and hyphens (-), and cannot start or end with a hyphen. The maximum length is 63 characters.',
CHECK_INTERVAL: 'Check Interval',
ALERTING_POLICY_CHECK_INTERVAL_DESC: 'Set the interval between metric checks. The default value is 1 minute.',
ALERTING_POLICY_CHECK_INTERVAL_DESC:
'Set the interval between metric checks. The default value is 1 minute.',
// List > Create > Rule Settings > Rule List
ADD_ALERTING_RULE: 'Add Alert Rule',
ADD_ALERTING_RULE_DESC: 'Add an alert rule to the rule group.',
ENABLE_RULE: 'Enable Rule',
DISABLE_RULE: 'Disable Rule',
// List > Create > Rule Settings > Rule Template
RULE_NAME: 'Rule Name',
CUSTOM_RULE_NAME_DESC: 'The rule name can contain any characters. The maximum length is 63 characters.',
CUSTOM_RULE_NAME_DESC:
'The rule name can contain any characters. The maximum length is 63 characters.',
LASTING_MINUTES: 'For {minutes, plural, =1 {1 minute} other {# minutes}}',
THRESHOLD_REQUIRED: 'Please enter a metric threshold.',
MESSAGE_SUMMARY_DESC: 'The message summary can contain any characters. The maximum length is 63 characters.',
MESSAGE_DETAILS_DESC: 'The message details can contain any characters. The maximum length is 256 characters.',
MESSAGE_SUMMARY_DESC:
'The message summary can contain any characters. The maximum length is 63 characters.',
MESSAGE_DETAILS_DESC:
'The message details can contain any characters. The maximum length is 256 characters.',
RULE_TEMPLATE: 'Rule Template',
RULE_SETTINGS: 'Rule Settings',
MONITORING_TARGETS: 'Monitoring Targets',
Expand Down Expand Up @@ -93,7 +102,8 @@ module.exports = {
CUSTOM_RULE: 'Custom Rule',
RULE_EXPRESSION: 'Rule Expression',
ENTER_RULE_EXPRESSION: 'Please enter a rule expression.',
ALERT_RULE_EXPRESSION_DESC: 'You can define a custom rule using PromQL statements. <a href="https://prometheus.io/docs/prometheus/latest/querying/basics/" target="_blank" rel="noreferrer noopener">Learn More</a>',
ALERT_RULE_EXPRESSION_DESC:
'You can define a custom rule using PromQL statements. <a href="https://prometheus.io/docs/prometheus/latest/querying/basics/" target="_blank" rel="noreferrer noopener">Learn More</a>',
ALERT_FUNCTIONS: 'Functions',
ALERT_METRICS: 'Metrics',
ALERT_LABELS: 'Labels',
Expand All @@ -107,10 +117,11 @@ module.exports = {
EDIT_ALERTING_POLICY: 'Edit Rule Group',
// List > Disable
DISABLE_ALERTING_POLICY: 'Disable Rule Group',
DISABLE_MULTIPLE_ALERTING_POLICIES: 'Disable Multiple Rule Groups',
// List > Delete
ALERTING_POLICY: 'Rule Group',
ALERTING_POLICY_LOW: 'rule group',
// List > reset
RESET_ALERTING_POLICY: 'Reset Rule Group',
RESET_ALERTING_POLICY_DESC: 'Are you sure you want to reset the rule group?'
};
RESET_ALERTING_POLICY_DESC: 'Are you sure you want to reset the rule group?',
}
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,6 @@ module.exports = {
// List > Delete
STORAGE_CLASS: 'Storage Class',
STORAGE_CLASS_LOW: 'storage class',
STORAGE_CLASS_DELETE_DESC: 'Deleting the volume snapshot class may affect the normal use of volume snapshots. Are you sure you want to delete the volume snapshot class?',
STORAGE_CLASS_DELETE_DESC_PL: 'Deleting the volume snapshot class may affect the normal use of volume snapshots. Enter the {type} names <strong>{resource}</strong> to confirm that you understand the risks of this operation.'
STORAGE_CLASS_DELETE_DESC: 'Are you sure you want to delete the storage class?',
STORAGE_CLASS_DELETE_DESC_PL: 'Enter the {type} names <strong>{resource}</strong> to confirm that you understand the risks of this operation.'
};
4 changes: 3 additions & 1 deletion locales/ar/l10n-devopsProjects-pipeline-details.js
Original file line number Diff line number Diff line change
Expand Up @@ -228,5 +228,7 @@ module.exports = {
// detail page // run log // task status // pipeline log modal
PIPELINE_LOG: 'Pipeline Logs',
// detail page // Create Pipeline modal // add step modal
IMPORT_FROM_CODE_REPO: 'Import From Code Repository'
IMPORT_FROM_CODE_REPO: 'Import From Code Repository',
// detail page // parameters tab
NO_BUILD_PARAMETERS: 'No build parameters are found.',
};
2 changes: 1 addition & 1 deletion locales/ar/l10n-help.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
*/
module.exports = {
USER_GUIDE: 'User Guide',
API_DOCUMENT: 'API Docuement'
API_DOCUMENT: 'API Documentation'
};
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ module.exports = {
// More > Edit YAML
// More > Delete
// Resource Status
VOLUME_MONITORING_TIP: 'Currently, only usage data of mounted volumes can be collected. Usage data of path-based volumes such as OpenEBS, Local PV, and NFS volumes may be inaccurate. <a href="https://github.com/kubesphere/kubesphere/issues/2921" target="_blank">Learn More</a>',
VOLUME_MONITORING_TIP:
'The storage system needs to have real volume quota control capabilities to output real and accurate data. Storage systems built based on host path, local pv, and open source nfs server usually do not have this capability. <a href="https://github.com/kubesphere/kubesphere/issues/2921" target="_blank">Daha Fazla Bilgi Edinin</a>',
// Mount Information
MOUNT_INFORMATION: 'Mount Information'
};
MOUNT_INFORMATION: 'Mount Information',
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ module.exports = {
// Navigation Pane
GATEWAY_SETTINGS: 'Gateway Einstellungen',
// Banner
CLUSTER_GATEWAY_DESC: 'Einrichten und Verwalten der Konfiguration des Gateways für den externen Netzwerkzugriff und der Dienstverwaltung im Cluster.',
CLUSTER_GATEWAY_DESC:
'Einrichten und Verwalten der Konfiguration des Gateways für den externen Netzwerkzugriff und der Dienstverwaltung im Cluster.',
// Cluster Gateway
CLUSTER_GATEWAY_NOT_ENABLED: 'Cluster Gateway nicht aktiviert',
CLUSTER_ENABLE_GATEWAY_DESC: 'Bitte aktivieren Sie das Cluster Gateway.',
Expand All @@ -28,21 +29,25 @@ module.exports = {
LOAD_BALANCER_PROVIDER_SCAP: 'Load Balancer Anbieter',
// Cluster Gateway > Enable Gateway
ENABLE_GATEWAY: 'Gateway aktivieren',
GATEWAY_TRACING_TIP: 'Wenn auf Ingress nicht zugegriffen werden kann, nachdem <b>Tracing</b> aktiviert wurde, fügen Sie dem Ingress bitte die Anmerkung <b>nginx.ingress.kubernetes.io/service-upstream: true </b> hinzu.',
GATEWAY_TRACING_TIP:
'Wenn auf Ingress nicht zugegriffen werden kann, nachdem <b>Tracing</b> aktiviert wurde, fügen Sie dem Ingress bitte die Anmerkung <b>nginx.ingress.kubernetes.io/service-upstream: true </b> hinzu.',
// Cluster Gateway > Manage > View Details
VIEW_DETAILS: 'Details anzeigen',
// Cluster Gateway > Manage > Disable
DISABLE: 'Deaktivieren',
DISABLE_GATEWAY: 'Gateway deaktivieren',
DISABLE_GATEWAY_TIP: 'Möchten Sie das Gateway wirklich deaktivieren?',
DISABLE_SUCCESSFUL: 'Erfolgreich deaktiviert.',
ENABLE_SUCCESSFUL: 'Enabled successfully.',
RESET_SUCCESSFUL: 'Reset successful',
// Cluster Gateway > Manage > Edit
EDIT: 'Bearbeiten',
EDIT_TITLE: '{title} bearbeiten',
// Cluster Gateway > Manage > Update
UPDATE: 'Aktualisieren',
UPDATED_GATEWAY_TITLE: 'Update Gateway',
UPDATE_GATEWAY_DESC: 'This operation may interrupt business for a short while. Exercise caution when performing this operation.',
UPDATE_GATEWAY_DESC:
'This operation may interrupt business for a short while. Exercise caution when performing this operation.',
// Project Gateways
PROJECT_GATEWAY_PL: 'Projekt Gateways',
PROJECT_GATEWAY_NOT_ENABLED: 'Projekt Gateway nicht aktiviert',
Expand All @@ -52,5 +57,5 @@ module.exports = {
UPDATE_GATEWAY_DESC: 'Das aktuelle Gateway kann aktualisiert werden.',
// Project Gateways > Disable
PROJECT_GATEWAY_LOW: 'projekt gateway',
DISABLE_MULTIPLE_GATEWAYS: 'Mehrere Gateways deaktivieren'
};
DISABLE_MULTIPLE_GATEWAYS: 'Mehrere Gateways deaktivieren',
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@
module.exports = {
// Banner
ALERTING_POLICY_PL: 'Regelgruppen',
ALERTING_POLICY_DESC: 'Eine Regelgruppe enthält Warnregeln, die zur Überwachung von Clusterressourcen verwendet werden.',
ALERTING_POLICY_DESC:
'Eine Regelgruppe enthält Warnregeln, die zur Überwachung von Clusterressourcen verwendet werden.',
REQUESTS_FOR_TRIGGER_AN_ALARM_Q: 'Wie werden Warnungen erzeugt?',
REQUESTS_FOR_TRIGGER_AN_ALARM_A: 'Sie müssen eine Regelgruppe erstellen und Warnregeln festlegen. Das System generiert Warnungen, wenn Ressourcenmetriken die in Regelgruppen konfigurierten Bedingungen erfüllen.',
REQUESTS_FOR_TRIGGER_AN_ALARM_A:
'Sie müssen eine Regelgruppe erstellen und Warnregeln festlegen. Das System generiert Warnungen, wenn Ressourcenmetriken die in Regelgruppen konfigurierten Bedingungen erfüllen.',
// List
CUSTOM_POLICIES: 'Benutzerdefinierte Regelgruppen',
BUILT_IN_POLICIES: 'Integrierte Regelgruppen',
Expand All @@ -41,27 +43,36 @@ module.exports = {
CRITICAL_ALERT: 'Kritisch',
ERROR_ALERT: 'Fehler',
WARNING_ALERT: 'Warnung',
INVALID_TIME_DESC: 'Ungültiger Wert. Bitte geben Sie 0 oder eine positive Zahl ein.',
INVALID_TIME_DESC:
'Ungültiger Wert. Bitte geben Sie 0 oder eine positive Zahl ein.',
ALIAS: 'Alias',
DURATION_MIN: 'Dauer (Minuten)',
ALERT_DURATION: 'Stellen Sie das System so ein, dass es eine bestimmte Zeit lang wartet, und prüfen Sie, ob die Alarmsituation fortbesteht, bevor ein Alarm ausgelöst wird.',
LONG_NAME_DESC: 'Der Name darf nur Kleinbuchstaben, Zahlen und Bindestriche (-) enthalten und muss mit einem Kleinbuchstaben oder einer Zahl beginnen und enden. Die maximale Länge beträgt 253 Zeichen.',
NAME_EXIST_DESC: 'Der Name existiert bereits. Bitte geben Sie einen anderen Namen ein.',
ALIAS_NAME_DESC: 'The alias name can contain only letters, numbers, and hyphens (-), and cannot start or end with a hyphen. The maximum length is 63 characters.',
ALERT_DURATION:
'Stellen Sie das System so ein, dass es eine bestimmte Zeit lang wartet, und prüfen Sie, ob die Alarmsituation fortbesteht, bevor ein Alarm ausgelöst wird.',
LONG_NAME_DESC:
'Der Name darf nur Kleinbuchstaben, Zahlen und Bindestriche (-) enthalten und muss mit einem Kleinbuchstaben oder einer Zahl beginnen und enden. Die maximale Länge beträgt 253 Zeichen.',
NAME_EXIST_DESC:
'Der Name existiert bereits. Bitte geben Sie einen anderen Namen ein.',
ALIAS_NAME_DESC:
'The alias name can contain only letters, numbers, and hyphens (-), and cannot start or end with a hyphen. The maximum length is 63 characters.',
CHECK_INTERVAL: 'Check Interval',
ALERTING_POLICY_CHECK_INTERVAL_DESC: 'Set the interval between metric checks. The default value is 1 minute.',
ALERTING_POLICY_CHECK_INTERVAL_DESC:
'Set the interval between metric checks. The default value is 1 minute.',
// List > Create > Rule Settings > Rule List
ADD_ALERTING_RULE: 'Add Alert Rule',
ADD_ALERTING_RULE_DESC: 'Add an alert rule to the rule group.',
ENABLE_RULE: 'Enable Rule',
DISABLE_RULE: 'Disable Rule',
// List > Create > Rule Settings > Rule Template
RULE_NAME: 'Rule Name',
CUSTOM_RULE_NAME_DESC: 'The rule name can contain any characters. The maximum length is 63 characters.',
CUSTOM_RULE_NAME_DESC:
'The rule name can contain any characters. The maximum length is 63 characters.',
LASTING_MINUTES: 'For {minutes, plural, =1 {1 minute} other {# minutes}}',
THRESHOLD_REQUIRED: 'Please enter a metric threshold.',
MESSAGE_SUMMARY_DESC: 'The message summary can contain any characters. The maximum length is 63 characters.',
MESSAGE_DETAILS_DESC: 'The message details can contain any characters. The maximum length is 256 characters.',
MESSAGE_SUMMARY_DESC:
'The message summary can contain any characters. The maximum length is 63 characters.',
MESSAGE_DETAILS_DESC:
'The message details can contain any characters. The maximum length is 256 characters.',
RULE_TEMPLATE: 'Regelvorlage',
RULE_SETTINGS: 'Regeleinstellungen',
MONITORING_TARGETS: 'Überwachungsziele',
Expand Down Expand Up @@ -93,7 +104,8 @@ module.exports = {
CUSTOM_RULE: 'Individuelle Regel',
RULE_EXPRESSION: 'Regelausdruck',
ENTER_RULE_EXPRESSION: 'Bitte geben Sie einen Regelausdruck ein.',
ALERT_RULE_EXPRESSION_DESC: 'Sie können eine benutzerdefinierte Regel mithilfe von PromQL-Anweisungen definieren. <a href="https://prometheus.io/docs/prometheus/latest/querying/basics/" target="_blank" rel="noreferrer noopener">Mehr erfahren</a>',
ALERT_RULE_EXPRESSION_DESC:
'Sie können eine benutzerdefinierte Regel mithilfe von PromQL-Anweisungen definieren. <a href="https://prometheus.io/docs/prometheus/latest/querying/basics/" target="_blank" rel="noreferrer noopener">Mehr erfahren</a>',
ALERT_FUNCTIONS: 'Funktionen',
ALERT_METRICS: 'Metriken',
ALERT_LABELS: 'Labels',
Expand All @@ -107,10 +119,11 @@ module.exports = {
EDIT_ALERTING_POLICY: 'Regelgruppe bearbeiten',
// List > Disable
DISABLE_ALERTING_POLICY: 'Disable Rule Group',
DISABLE_MULTIPLE_ALERTING_POLICIES: 'Disable Multiple Rule Groups',
// List > Delete
ALERTING_POLICY: 'Regelgruppe',
ALERTING_POLICY_LOW: 'regelgruppe',
// List > reset
RESET_ALERTING_POLICY: 'Reset Rule Group',
RESET_ALERTING_POLICY_DESC: 'Are you sure you want to reset the rule group?'
};
RESET_ALERTING_POLICY_DESC: 'Are you sure you want to reset the rule group?',
}
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,6 @@ module.exports = {
// List > Delete
STORAGE_CLASS: 'Speicherklasse',
STORAGE_CLASS_LOW: 'speicherklasse',
STORAGE_CLASS_DELETE_DESC: 'Deleting the volume snapshot class may affect the normal use of volume snapshots. Are you sure you want to delete the volume snapshot class?',
STORAGE_CLASS_DELETE_DESC_PL: 'Deleting the volume snapshot class may affect the normal use of volume snapshots. Enter the {type} names <strong>{resource}</strong> to confirm that you understand the risks of this operation.'
STORAGE_CLASS_DELETE_DESC: 'Are you sure you want to delete the speicherklasse?',
STORAGE_CLASS_DELETE_DESC_PL: 'Enter the {type} names <strong>{resource}</strong> to confirm that you understand the risks of this operation.'
};
4 changes: 3 additions & 1 deletion locales/de/l10n-devopsProjects-pipeline-details.js
Original file line number Diff line number Diff line change
Expand Up @@ -228,5 +228,7 @@ module.exports = {
// detail page // run log // task status // pipeline log modal
PIPELINE_LOG: 'Pipeline Logs',
// detail page // Create Pipeline modal // add step modal
IMPORT_FROM_CODE_REPO: 'Import From Code Repository'
IMPORT_FROM_CODE_REPO: 'Import From Code Repository',
// detail page // parameters tab
NO_BUILD_PARAMETERS: 'Not found build parameters.',
};
Loading

0 comments on commit 1e832ea

Please sign in to comment.