@rancher/shell 1.2.3 → 2.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/assets/data/aws-regions.json +9 -0
- package/assets/images/vendor/openid.svg +18 -0
- package/assets/styles/app.scss +1 -2
- package/assets/styles/fonts/_icons.scss +3 -3
- package/assets/styles/global/_columns.scss +1 -1
- package/assets/styles/global/_labeled-input.scss +1 -0
- package/assets/styles/global/_layout.scss +99 -0
- package/assets/styles/themes/_csp.scss +2 -2
- package/assets/styles/themes/_dark.scss +8 -2
- package/assets/styles/themes/_light.scss +2 -1
- package/assets/styles/themes/_suse.scss +1 -1
- package/assets/styles/vendor/vue-select.scss +5 -0
- package/assets/translations/en-us.yaml +315 -64
- package/assets/translations/zh-hans.yaml +7 -31
- package/babel.config.js +8 -2
- package/chart/__tests__/S3.test.ts +9 -2
- package/chart/gatekeeper.vue +2 -11
- package/chart/istio.vue +1 -10
- package/chart/logging/index.vue +2 -11
- package/chart/monitoring/alerting/index.vue +7 -21
- package/chart/monitoring/grafana/index.vue +61 -2
- package/chart/monitoring/index.vue +52 -26
- package/chart/monitoring/prometheus/index.vue +39 -45
- package/chart/rancher-backup/S3.vue +11 -9
- package/chart/rancher-backup/index.vue +18 -15
- package/cloud-credential/__tests__/harvester.test.ts +18 -0
- package/cloud-credential/azure.vue +4 -17
- package/cloud-credential/generic.vue +18 -9
- package/cloud-credential/harvester.vue +11 -3
- package/components/AlertTable.vue +17 -7
- package/components/AppModal.vue +167 -0
- package/components/AssignTo.vue +7 -4
- package/components/AsyncButton.vue +27 -5
- package/components/BackLink.vue +4 -4
- package/components/BannerGraphic.vue +1 -0
- package/components/BrandImage.vue +47 -1
- package/components/Carousel.vue +15 -8
- package/components/Certificates.vue +161 -0
- package/components/ClusterBadge.vue +12 -3
- package/components/ClusterIconMenu.vue +55 -12
- package/components/ClusterProviderIcon.vue +14 -3
- package/components/CodeMirror.vue +111 -17
- package/components/CommunityLinks.vue +12 -8
- package/components/CopyCode.vue +6 -2
- package/components/CopyToClipboard.vue +2 -1
- package/components/CopyToClipboardText.vue +14 -9
- package/components/CreateDriver.vue +81 -0
- package/components/CruResource.vue +52 -27
- package/components/DetailTop.vue +2 -2
- package/components/Dialog.vue +6 -5
- package/components/DisableAuthProviderModal.vue +14 -8
- package/components/DraggableZone.vue +2 -2
- package/components/EtcdInfoBanner.vue +5 -5
- package/components/ExplorerMembers.vue +3 -3
- package/components/ExplorerProjectsNamespaces.vue +31 -7
- package/components/FixedBanner.vue +48 -36
- package/components/GlobalRoleBindings.vue +26 -0
- package/components/GrafanaDashboard.vue +6 -4
- package/components/IconOrSvg.vue +1 -1
- package/components/Import.vue +10 -6
- package/components/Inactivity.vue +1 -5
- package/components/KeyValueView.vue +14 -10
- package/components/Markdown.vue +16 -12
- package/components/MessageLink.vue +2 -2
- package/components/ModalWithCard.vue +5 -8
- package/components/MoveModal.vue +35 -33
- package/components/PodSecurityAdmission.vue +3 -3
- package/components/PromptChangePassword.vue +33 -33
- package/components/PromptModal.vue +11 -21
- package/components/PromptRemove.vue +12 -17
- package/components/PromptRestore.vue +18 -16
- package/components/Questions/__tests__/Boolean.test.ts +9 -19
- package/components/Questions/__tests__/Float.test.ts +9 -19
- package/components/Questions/__tests__/Int.test.ts +9 -19
- package/components/Questions/__tests__/String.test.ts +9 -19
- package/components/Questions/__tests__/Yaml.test.ts +9 -20
- package/components/Questions/__tests__/utils/questions-defaults.ts +20 -0
- package/components/Questions/index.vue +19 -3
- package/components/ResourceCancelModal.vue +34 -29
- package/components/ResourceDetail/Masthead.vue +48 -16
- package/components/ResourceDetail/index.vue +6 -4
- package/components/ResourceList/Masthead.vue +10 -9
- package/components/ResourceList/index.vue +65 -14
- package/components/ResourceTable.vue +87 -21
- package/components/ResourceYaml.vue +35 -5
- package/components/SelectIconGrid.vue +3 -3
- package/components/SideNav.vue +50 -94
- package/components/SingleClusterInfo.vue +4 -4
- package/components/SortableTable/THead.vue +33 -21
- package/components/SortableTable/filtering.js +9 -1
- package/components/SortableTable/grouping.js +8 -1
- package/components/SortableTable/index.vue +143 -44
- package/components/SortableTable/paging.js +36 -7
- package/components/SortableTable/selection.js +2 -1
- package/components/SortableTable/sorting.js +24 -7
- package/components/StatusTable.vue +5 -1
- package/components/Tabbed/index.vue +18 -1
- package/components/TableDataUserIcon.vue +47 -0
- package/components/TypeDescription.vue +1 -0
- package/components/Wizard.vue +1 -0
- package/components/YamlEditor.vue +1 -0
- package/components/__tests__/AppModal.test.ts +98 -0
- package/components/__tests__/AsyncButton.test.ts +1 -3
- package/components/__tests__/BackLink.test.ts +1 -1
- package/components/__tests__/ButtonGroup.test.ts +3 -6
- package/components/__tests__/Carousel.test.ts +43 -0
- package/components/__tests__/Certificates.test.ts +29 -0
- package/components/__tests__/CodeMirror.test.ts +87 -0
- package/components/__tests__/CopyCode.test.ts +5 -4
- package/components/__tests__/CruResource.test.ts +10 -9
- package/components/__tests__/EtcdInfoBanner.test.ts +37 -0
- package/components/__tests__/FixedBanner.test.ts +5 -20
- package/components/__tests__/NamespaceFilter.test.ts +9 -18
- package/components/__tests__/TabTitle.test.ts +129 -0
- package/components/auth/AzureWarning.vue +2 -2
- package/components/auth/RoleDetailEdit.vue +10 -0
- package/components/auth/__tests__/RoleDetailEdit.test.ts +3 -2
- package/components/auth/login/oidc.vue +7 -1
- package/components/fleet/FleetBundles.vue +5 -11
- package/components/fleet/FleetClusters.vue +9 -9
- package/components/fleet/FleetIntro.vue +11 -17
- package/components/fleet/FleetNoWorkspaces.vue +2 -2
- package/components/fleet/FleetRepos.vue +63 -27
- package/components/fleet/FleetResources.vue +6 -1
- package/components/fleet/FleetStatus.vue +3 -3
- package/components/fleet/FleetSummary.vue +35 -30
- package/components/fleet/ForceDirectedTreeChart/index.vue +9 -3
- package/components/fleet/__tests__/FleetSummary.test.ts +316 -0
- package/components/form/ArrayList.vue +22 -18
- package/components/form/ArrayListSelect.vue +5 -0
- package/components/form/BannerSettings.vue +3 -0
- package/components/form/ClusterAppearance.vue +132 -0
- package/components/form/ColorInput.vue +1 -0
- package/components/form/Error.vue +3 -3
- package/components/form/FileSelector.vue +1 -0
- package/components/form/Footer.vue +2 -2
- package/components/form/GitPicker.vue +83 -38
- package/components/form/KeyValue.vue +70 -48
- package/components/form/LabeledSelect.vue +145 -41
- package/components/form/Labels.vue +3 -1
- package/components/form/NameNsDescription.vue +26 -9
- package/components/form/Password.vue +3 -1
- package/components/form/ResourceLabeledSelect.vue +187 -0
- package/components/form/ResourceTabs/index.vue +31 -15
- package/components/form/SecretSelector.vue +93 -18
- package/components/form/SelectOrCreateAuthSecret.vue +132 -59
- package/components/form/SimpleSecretSelector.vue +88 -28
- package/components/form/Taints.vue +13 -7
- package/components/form/__tests__/BannerSettings.test.ts +53 -0
- package/components/form/__tests__/KeyValue.test.ts +120 -11
- package/components/form/__tests__/LabeledSelect.test.ts +0 -18
- package/components/form/__tests__/{NameNsDescription.ts → NameNsDescription.test.ts} +25 -15
- package/components/form/__tests__/Taints.test.ts +70 -0
- package/components/form/labeled-select-utils/labeled-select-pagination.ts +151 -0
- package/components/form/labeled-select-utils/labeled-select.utils.ts +122 -0
- package/components/formatter/AppSummaryGraph.vue +2 -2
- package/components/formatter/Checked.vue +11 -3
- package/components/formatter/CloudCredPublicData.vue +30 -0
- package/components/formatter/ClusterLink.vue +2 -2
- package/components/formatter/ClusterProvider.vue +1 -18
- package/components/formatter/FleetClusterSummaryGraph.vue +27 -0
- package/components/formatter/FleetSummaryGraph.vue +25 -12
- package/components/formatter/ImagePercentageBar.vue +0 -4
- package/components/formatter/IngressTarget.vue +18 -7
- package/components/formatter/Link.vue +2 -2
- package/components/formatter/LinkDetail.vue +2 -2
- package/components/formatter/LinkDetailImage.vue +2 -2
- package/components/formatter/LinkName.vue +2 -2
- package/components/formatter/LiveDuration.vue +1 -1
- package/components/formatter/PercentageBar.vue +1 -1
- package/components/formatter/PrincipalGroupBindings.vue +2 -2
- package/components/formatter/SecretType.vue +2 -2
- package/components/formatter/VirtualServiceGateways.vue +2 -2
- package/components/formatter/WorkloadDetailEndpoints.vue +12 -22
- package/components/formatter/__tests__/Checked.test.ts +19 -0
- package/components/formatter/__tests__/LinkDetail.test.ts +5 -5
- package/components/formatter/__tests__/WorkloadDetailEndpoints.test.ts +81 -0
- package/components/nav/Group.vue +9 -7
- package/components/nav/Header.vue +85 -46
- package/components/nav/Jump.vue +19 -9
- package/components/nav/NamespaceFilter.vue +8 -1
- package/components/nav/TopLevelMenu.vue +392 -136
- package/components/nav/Type.vue +71 -106
- package/components/nav/WindowManager/ContainerLogs.vue +120 -19
- package/components/nav/WindowManager/ContainerShell.vue +6 -1
- package/components/nav/WindowManager/__tests__/ContainerLogs.test.ts +186 -0
- package/components/nav/WindowManager/index.vue +11 -10
- package/components/nav/__tests__/TopLevelMenu.test.ts +400 -6
- package/components/nav/__tests__/Type.test.ts +322 -97
- package/components/nuxt/nuxt-child.js +9 -78
- package/components/nuxt/nuxt-error.vue +1 -1
- package/components/nuxt/nuxt-link.client.js +13 -95
- package/{layouts → components/templates}/blank.vue +1 -1
- package/{layouts → components/templates}/default.vue +11 -101
- package/{layouts → components/templates}/error.vue +13 -26
- package/{layouts → components/templates}/home.vue +4 -1
- package/{layouts → components/templates}/plain.vue +4 -1
- package/{layouts → components/templates}/standalone.vue +1 -5
- package/{layouts → components/templates}/unauthenticated.vue +2 -3
- package/composables/useCompactInput.test.ts +36 -0
- package/composables/useCompactInput.ts +20 -0
- package/composables/useLabeledFormElement.test.ts +135 -0
- package/composables/useLabeledFormElement.ts +138 -0
- package/config/harvester-manager-types.js +2 -0
- package/config/home-links.js +2 -1
- package/config/labels-annotations.js +2 -1
- package/config/middleware.js +0 -6
- package/config/pagination-table-headers.js +57 -0
- package/config/pod-security-admission.ts +1 -1
- package/config/private-label.js +21 -1
- package/config/product/auth.js +1 -0
- package/config/product/explorer.js +166 -45
- package/config/product/fleet.js +6 -1
- package/config/product/legacy.js +2 -11
- package/config/product/manager.js +51 -25
- package/config/query-params.js +2 -0
- package/config/roles.ts +23 -0
- package/config/router/index.js +23 -0
- package/config/router/navigation-guards/attempt-first-login.js +73 -0
- package/config/router/navigation-guards/authentication.js +63 -0
- package/config/router/navigation-guards/i18n.js +13 -0
- package/config/router/navigation-guards/index.js +16 -0
- package/config/router/navigation-guards/load-initial-settings.js +15 -0
- package/config/router/routes.js +487 -0
- package/config/settings.ts +31 -2
- package/config/store.js +8 -4
- package/config/system-namespaces.js +3 -0
- package/config/table-headers.js +66 -1
- package/config/types.js +35 -20
- package/config/uiplugins.js +10 -5
- package/core/plugin-helpers.js +4 -6
- package/core/plugin-routes.ts +56 -114
- package/core/plugin.ts +18 -11
- package/core/plugins-loader.js +7 -9
- package/core/plugins.js +289 -285
- package/core/types-provisioning.ts +7 -0
- package/creators/app/app.package.json +2 -1
- package/creators/app/files/.eslintignore +0 -2
- package/creators/app/files/.gitlab-ci.yml +14 -0
- package/creators/app/files/.vscode/settings.json +0 -1
- package/creators/app/init +19 -0
- package/creators/pkg/files/.github/workflows/build-extension-catalog.yml +2 -6
- package/creators/pkg/files/.github/workflows/build-extension-charts.yml +2 -6
- package/creators/pkg/init +32 -0
- package/detail/__tests__/provisioning.cattle.io.cluster.test.ts +119 -0
- package/detail/__tests__/service.test.ts +62 -0
- package/detail/catalog.cattle.io.app.vue +1 -1
- package/detail/cis.cattle.io.clusterscan.vue +14 -3
- package/detail/fleet.cattle.io.bundle.vue +1 -1
- package/detail/fleet.cattle.io.cluster.vue +11 -1
- package/detail/fleet.cattle.io.gitrepo.vue +15 -9
- package/detail/namespace.vue +2 -2
- package/detail/networking.k8s.io.ingress.vue +52 -19
- package/detail/node.vue +22 -3
- package/detail/provisioning.cattle.io.cluster.vue +31 -13
- package/detail/service.vue +1 -1
- package/detail/workload/index.vue +1 -0
- package/dialog/AddCustomBadgeDialog.vue +318 -161
- package/dialog/DeactivateDriverDialog.vue +137 -0
- package/dialog/RollbackWorkloadDialog.vue +2 -2
- package/dialog/RotateCertificatesDialog.vue +0 -21
- package/dialog/ScaleMachineDownDialog.vue +34 -17
- package/directives/clean-html.js +15 -0
- package/directives/clean-tooltip.js +32 -0
- package/directives/focus.js +41 -0
- package/directives/int-number.js +21 -0
- package/directives/positive-int-number.js +19 -0
- package/directives/trim-whitespace.js +19 -0
- package/edit/__tests__/fleet.cattle.io.gitrepo.test.ts +3 -2
- package/edit/__tests__/kontainerDriver.test.ts +107 -0
- package/edit/__tests__/management.cattle.io.clusterroletemplatebinding.test.ts +12 -1
- package/edit/__tests__/management.cattle.io.setting.test.ts +2 -1
- package/edit/__tests__/monitoring.coreos.com.prometheusrule.test.ts +2 -3
- package/edit/__tests__/nodeDriver.test.ts +107 -0
- package/edit/__tests__/service.test.ts +85 -0
- package/edit/__tests__/ui.cattle.io.navlink.test.ts +3 -1
- package/edit/auth/AuthProviderWarningBanners.vue +34 -0
- package/edit/auth/__tests__/AuthProviderWarningBanners.test.ts +19 -0
- package/edit/auth/__tests__/azuread.test.ts +241 -0
- package/edit/auth/__tests__/oidc.test.ts +137 -0
- package/edit/auth/azuread.vue +133 -31
- package/edit/auth/github.vue +5 -17
- package/edit/auth/googleoauth.vue +6 -23
- package/edit/auth/ldap/index.vue +5 -17
- package/edit/auth/oidc.vue +143 -42
- package/edit/auth/saml.vue +5 -14
- package/edit/catalog.cattle.io.clusterrepo.vue +177 -9
- package/edit/cis.cattle.io.clusterscan.vue +5 -2
- package/edit/cis.cattle.io.clusterscanbenchmark.vue +41 -9
- package/edit/cloudcredential.vue +28 -4
- package/edit/configmap.vue +10 -4
- package/edit/fleet.cattle.io.gitrepo.vue +3 -1
- package/edit/helm.cattle.io.projecthelmchart.vue +29 -19
- package/edit/kontainerDriver.vue +65 -0
- package/edit/logging-flow/Match.vue +10 -9
- package/edit/logging-flow/index.vue +4 -19
- package/edit/logging.banzaicloud.io.output/__tests__/logging.banzaicloud.io.output.test.ts +232 -2
- package/edit/logging.banzaicloud.io.output/index.vue +43 -26
- package/edit/management.cattle.io.podsecurityadmissionconfigurationtemplate.vue +3 -3
- package/edit/management.cattle.io.project.vue +3 -53
- package/edit/management.cattle.io.setting.vue +52 -2
- package/edit/management.cattle.io.user.vue +2 -1
- package/edit/monitoring.coreos.com.alertmanagerconfig/index.vue +10 -7
- package/edit/monitoring.coreos.com.alertmanagerconfig/receiverConfig.vue +21 -16
- package/edit/monitoring.coreos.com.alertmanagerconfig/types/opsgenie.vue +1 -1
- package/edit/monitoring.coreos.com.alertmanagerconfig/types/pagerduty.vue +2 -2
- package/edit/monitoring.coreos.com.alertmanagerconfig/types/slack.vue +1 -1
- package/edit/monitoring.coreos.com.prometheusrule/AlertingRule.vue +15 -3
- package/edit/monitoring.coreos.com.prometheusrule/GroupRules.vue +4 -1
- package/edit/monitoring.coreos.com.prometheusrule/RecordingRule.vue +2 -0
- package/edit/monitoring.coreos.com.prometheusrule/index.vue +2 -0
- package/edit/networking.k8s.io.ingress/Rules.vue +8 -3
- package/edit/networking.k8s.io.ingress/index.vue +64 -8
- package/edit/networking.k8s.io.networkpolicy/PolicyRule.vue +1 -0
- package/edit/networking.k8s.io.networkpolicy/PolicyRuleTarget.vue +6 -2
- package/edit/networking.k8s.io.networkpolicy/__tests__/{PolicyRuleTarget.spec.ts → PolicyRuleTarget.test.ts} +46 -7
- package/edit/networking.k8s.io.networkpolicy/__tests__/utils/{selectors.ts → selectors.test.ts} +1 -1
- package/edit/networking.k8s.io.networkpolicy/index.vue +2 -0
- package/edit/nodeDriver.vue +65 -0
- package/edit/persistentvolume/index.vue +2 -2
- package/edit/provisioning.cattle.io.cluster/SelectCredential.vue +33 -16
- package/edit/provisioning.cattle.io.cluster/__tests__/Advanced.test.ts +276 -0
- package/edit/provisioning.cattle.io.cluster/__tests__/Basics.test.ts +473 -0
- package/edit/provisioning.cattle.io.cluster/__tests__/{CustomCommand.tests.ts → CustomCommand.test.ts} +3 -0
- package/edit/provisioning.cattle.io.cluster/__tests__/DirectoryConfig.test.ts +228 -0
- package/edit/provisioning.cattle.io.cluster/__tests__/DrainOptions.test.ts +1 -1
- package/edit/provisioning.cattle.io.cluster/__tests__/index.test.ts +73 -0
- package/edit/provisioning.cattle.io.cluster/__tests__/rke2.test.ts +77 -13
- package/edit/provisioning.cattle.io.cluster/__tests__/utils/cluster.ts +391 -0
- package/edit/provisioning.cattle.io.cluster/import.vue +4 -4
- package/edit/provisioning.cattle.io.cluster/index.vue +126 -51
- package/edit/provisioning.cattle.io.cluster/rke2.vue +325 -791
- package/edit/provisioning.cattle.io.cluster/tabs/AddOnConfig.vue +137 -0
- package/edit/provisioning.cattle.io.cluster/tabs/Advanced.vue +217 -0
- package/edit/provisioning.cattle.io.cluster/{Basics.vue → tabs/Basics.vue} +123 -129
- package/edit/provisioning.cattle.io.cluster/tabs/DirectoryConfig.vue +132 -0
- package/edit/provisioning.cattle.io.cluster/{MachinePool.vue → tabs/MachinePool.vue} +1 -0
- package/edit/provisioning.cattle.io.cluster/{S3Config.vue → tabs/etcd/S3Config.vue} +1 -0
- package/edit/provisioning.cattle.io.cluster/tabs/etcd/index.vue +135 -0
- package/edit/provisioning.cattle.io.cluster/tabs/networking/index.vue +190 -0
- package/edit/provisioning.cattle.io.cluster/{RegistryConfigs.vue → tabs/registries/RegistryConfigs.vue} +3 -0
- package/edit/provisioning.cattle.io.cluster/tabs/registries/index.vue +148 -0
- package/edit/provisioning.cattle.io.cluster/tabs/upgrade/index.vue +76 -0
- package/edit/resources.cattle.io.backup.vue +139 -124
- package/edit/resources.cattle.io.restore.vue +146 -126
- package/edit/service.vue +13 -0
- package/edit/serviceaccount.vue +46 -4
- package/edit/token.vue +3 -1
- package/edit/workload/Upgrading.vue +3 -2
- package/edit/workload/__tests__/Job.test.ts +1 -3
- package/edit/workload/__tests__/Upgrading.test.ts +2 -2
- package/edit/workload/index.vue +2 -1
- package/edit/workload/mixins/workload.js +35 -2
- package/edit/workload/storage/emptyDir.vue +2 -2
- package/initialize/App.vue +75 -0
- package/initialize/app-extended.js +128 -0
- package/initialize/entry-helpers.js +546 -0
- package/initialize/entry.js +32 -0
- package/initialize/install-components.js +23 -0
- package/initialize/install-directives.js +59 -0
- package/initialize/install-plugins.js +123 -0
- package/list/__tests__/workload.test.ts +1 -1
- package/list/catalog.cattle.io.app.vue +1 -0
- package/list/cis.cattle.io.clusterscan.vue +16 -10
- package/list/group.principal.vue +2 -2
- package/list/management.cattle.io.feature.vue +16 -16
- package/list/management.cattle.io.setting.vue +1 -0
- package/list/management.cattle.io.user.vue +13 -4
- package/list/networking.k8s.io.ingress.vue +36 -0
- package/list/node.vue +212 -73
- package/list/provisioning.cattle.io.cluster.vue +17 -4
- package/list/ui.cattle.io.navlink.vue +2 -2
- package/list/workload.vue +22 -0
- package/machine-config/__tests__/vmwarevsphere-pool-config-merge.test.ts +30 -0
- package/machine-config/__tests__/vmwarevsphere.test.ts +1 -3
- package/machine-config/amazonec2.vue +1 -1
- package/machine-config/azure.vue +2 -1
- package/machine-config/generic.vue +11 -15
- package/machine-config/vmwarevsphere-pool-config-merge.ts +25 -0
- package/machine-config/vmwarevsphere.vue +31 -27
- package/middleware/authenticated.js +23 -399
- package/mixins/__tests__/chart.test.ts +48 -6
- package/mixins/__tests__/create-edit-view.test.ts +2 -3
- package/mixins/auth-config.js +5 -9
- package/mixins/brand.js +102 -96
- package/mixins/chart.js +27 -13
- package/mixins/create-edit-view/index.js +2 -2
- package/mixins/fetch.client.js +42 -48
- package/mixins/labeled-form-element.ts +27 -2
- package/mixins/page-actions.js +7 -5
- package/mixins/resource-fetch-api-pagination.js +304 -0
- package/mixins/resource-fetch-namespaced.js +1 -1
- package/mixins/resource-fetch.js +46 -5
- package/models/__tests__/cluster.test.ts +44 -0
- package/models/__tests__/fleet.cattle.io.cluster.test.ts +36 -0
- package/models/__tests__/management.cattle.io.cluster.test.ts +23 -0
- package/models/__tests__/management.cattle.io.node.ts +85 -0
- package/models/__tests__/management.cattle.io.nodepool.ts +83 -0
- package/models/__tests__/namespace.test.ts +49 -9
- package/models/__tests__/provisioning.cattle.io.cluster.test.ts +241 -0
- package/models/__tests__/schema.tests.ts +24 -0
- package/models/__tests__/secret.test.ts +37 -0
- package/models/__tests__/steve-schema.test.ts +73 -0
- package/models/__tests__/storage.k8s.io.storageclass.test.ts +22 -0
- package/models/__tests__/workload.test.ts +91 -0
- package/models/catalog.cattle.io.app.js +8 -0
- package/models/catalog.cattle.io.clusterrepo.js +9 -1
- package/models/catalog.cattle.io.uiplugin.js +7 -8
- package/models/cis.cattle.io.clusterscan.js +29 -8
- package/models/cloudcredential.js +9 -1
- package/models/cluster/node.js +8 -4
- package/models/cluster/schema.js +6 -0
- package/models/cluster.js +33 -0
- package/models/cluster.x-k8s.io.machine.js +1 -1
- package/models/cluster.x-k8s.io.machinedeployment.js +14 -0
- package/models/driver.js +63 -0
- package/models/fleet.cattle.io.cluster.js +27 -11
- package/models/fleet.cattle.io.gitrepo.js +66 -13
- package/models/helm.cattle.io.projecthelmchart.js +1 -1
- package/models/kontainerdriver.js +85 -0
- package/models/management/schema.js +6 -0
- package/models/management.cattle.io.authconfig.js +3 -2
- package/models/management.cattle.io.cluster.js +16 -7
- package/models/management.cattle.io.globalrole.js +2 -0
- package/models/management.cattle.io.kontainerdriver.js +1 -0
- package/models/management.cattle.io.node.js +18 -14
- package/models/management.cattle.io.nodepool.js +17 -0
- package/models/management.cattle.io.project.js +0 -36
- package/models/management.cattle.io.setting.js +11 -7
- package/models/management.cattle.io.user.js +2 -2
- package/models/monitoring.coreos.com.receiver.js +3 -1
- package/models/monitoring.coreos.com.route.js +1 -1
- package/models/namespace.js +1 -1
- package/models/networking.k8s.io.ingress.js +2 -1
- package/models/nodedriver.js +85 -0
- package/models/pod.js +20 -0
- package/models/provisioning.cattle.io.cluster.js +125 -10
- package/models/schema.js +28 -7
- package/models/secret.js +126 -18
- package/models/service.js +2 -0
- package/models/steve-schema.ts +254 -0
- package/models/storage.k8s.io.storageclass.js +1 -1
- package/models/workload.js +17 -0
- package/models/workload.service.js +18 -0
- package/package.json +18 -14
- package/pages/about.vue +12 -6
- package/pages/account/create-key.vue +0 -1
- package/pages/account/index.vue +7 -3
- package/pages/auth/login.vue +106 -103
- package/pages/auth/logout.vue +2 -4
- package/pages/auth/setup.vue +92 -66
- package/pages/auth/verify.vue +30 -24
- package/pages/c/_cluster/apps/charts/__tests__/install.helper.test.ts +2 -17
- package/pages/c/_cluster/apps/charts/chart.vue +54 -9
- package/pages/c/_cluster/apps/charts/index.vue +99 -69
- package/pages/c/_cluster/apps/charts/install.helpers.js +2 -13
- package/pages/c/_cluster/apps/charts/install.vue +12 -11
- package/pages/c/_cluster/auth/config/_id.vue +0 -6
- package/pages/c/_cluster/auth/config/index.vue +15 -9
- package/pages/c/_cluster/auth/roles/index.vue +8 -10
- package/pages/c/_cluster/ecm/index.vue +0 -2
- package/pages/c/_cluster/explorer/ConfigBadge.vue +13 -8
- package/pages/c/_cluster/explorer/EventsTable.vue +18 -0
- package/pages/c/_cluster/explorer/__tests__/index.test.ts +181 -0
- package/pages/c/_cluster/explorer/index.vue +253 -91
- package/pages/c/_cluster/explorer/tools/__tests__/index.test.ts +69 -0
- package/pages/c/_cluster/explorer/tools/index.vue +10 -6
- package/pages/c/_cluster/fleet/index.vue +89 -94
- package/pages/c/_cluster/longhorn/__tests__/longhorn.index.test.ts +89 -0
- package/pages/c/_cluster/longhorn/index.vue +52 -17
- package/pages/c/_cluster/manager/cloudCredential/index.vue +18 -25
- package/pages/c/_cluster/manager/drivers/kontainerDriver/_id.vue +12 -0
- package/pages/c/_cluster/manager/drivers/kontainerDriver/create.vue +15 -0
- package/pages/c/_cluster/manager/drivers/kontainerDriver/index.vue +91 -0
- package/pages/c/_cluster/manager/drivers/nodeDriver/_id.vue +12 -0
- package/pages/c/_cluster/manager/drivers/nodeDriver/create.vue +15 -0
- package/pages/c/_cluster/manager/drivers/nodeDriver/index.vue +60 -0
- package/pages/c/_cluster/manager/jwt.authentication/index.vue +235 -0
- package/pages/c/_cluster/manager/pages/_page.vue +4 -5
- package/pages/c/_cluster/monitoring/alertmanagerconfig/_alertmanagerconfigid/receiver.vue +4 -0
- package/pages/c/_cluster/monitoring/route-receiver/index.vue +2 -2
- package/pages/c/_cluster/neuvector/index.vue +1 -0
- package/pages/c/_cluster/settings/DefaultLinksEditor.vue +1 -0
- package/pages/c/_cluster/settings/banners.vue +86 -10
- package/pages/c/_cluster/settings/brand.vue +261 -38
- package/pages/c/_cluster/settings/index.vue +4 -6
- package/pages/c/_cluster/settings/links.vue +3 -2
- package/pages/c/_cluster/settings/performance.vue +71 -3
- package/pages/c/_cluster/uiplugins/AddExtensionRepos.vue +5 -2
- package/pages/c/_cluster/uiplugins/CatalogList/CatalogLoadDialog.vue +12 -8
- package/pages/c/_cluster/uiplugins/CatalogList/CatalogUninstallDialog.vue +9 -6
- package/pages/c/_cluster/uiplugins/CatalogList/index.vue +10 -46
- package/pages/c/_cluster/uiplugins/DeveloperInstallDialog.vue +11 -5
- package/pages/c/_cluster/uiplugins/InstallDialog.vue +55 -19
- package/pages/c/_cluster/uiplugins/SetupUIPlugins.vue +36 -301
- package/pages/c/_cluster/uiplugins/UninstallDialog.vue +14 -6
- package/pages/c/_cluster/uiplugins/__tests__/SetupUIPlugins.test.ts +52 -106
- package/pages/c/_cluster/uiplugins/index.vue +38 -54
- package/pages/diagnostic.vue +2 -2
- package/pages/fail-whale.vue +103 -42
- package/pages/home.vue +81 -24
- package/pages/prefs.vue +8 -4
- package/pages/support/index.vue +14 -10
- package/pkg/auto-import.js +1 -1
- package/plugins/axios.js +0 -36
- package/plugins/back-button.js +3 -5
- package/plugins/clean-html-directive.js +5 -30
- package/plugins/clean-html.js +53 -0
- package/plugins/clean-tooltip-directive.js +6 -31
- package/plugins/codemirror-loader.js +1 -1
- package/plugins/codemirror.js +41 -9
- package/plugins/dashboard-store/__tests__/mutations.test.ts +389 -0
- package/plugins/dashboard-store/__tests__/resource-class.test.ts +49 -0
- package/plugins/dashboard-store/__tests__/utils/store-mocks.ts +7 -0
- package/plugins/dashboard-store/actions.js +132 -25
- package/plugins/dashboard-store/classify.js +1 -18
- package/plugins/dashboard-store/getters.js +154 -44
- package/plugins/dashboard-store/index.js +0 -111
- package/plugins/dashboard-store/mutations.js +150 -52
- package/plugins/dashboard-store/resource-class.js +77 -127
- package/plugins/directives.js +6 -39
- package/plugins/ember-cookie.js +13 -0
- package/plugins/global-formatters.js +26 -5
- package/plugins/i18n.js +89 -55
- package/plugins/int-number.js +6 -20
- package/plugins/plugin.js +3 -3
- package/plugins/positive-int-number.js +6 -17
- package/plugins/steve/__tests__/{getters.spec.ts → getters.test.ts} +81 -10
- package/plugins/steve/__tests__/mutations.test.ts +49 -0
- package/plugins/steve/__tests__/resource-utils.test.ts +159 -0
- package/plugins/steve/__tests__/steve-class.test.ts +59 -0
- package/plugins/steve/__tests__/subscribe.spec.ts +4 -1
- package/plugins/steve/__tests__/utils/mutation.test.helpers.ts +105 -0
- package/plugins/steve/__tests__/utils/steve-mocks.ts +31 -0
- package/plugins/steve/accept-or-reject-socket-message.ts +103 -0
- package/plugins/steve/actions.js +3 -38
- package/plugins/steve/getters.js +164 -61
- package/plugins/steve/hybrid-class.js +5 -1
- package/plugins/steve/mutations.js +24 -3
- package/plugins/steve/norman-class.js +142 -2
- package/{utils → plugins/steve}/projectAndNamespaceFiltering.utils.ts +28 -10
- package/plugins/steve/resource-utils.ts +38 -0
- package/plugins/steve/schema.d.ts +22 -0
- package/plugins/steve/steve-class.js +22 -0
- package/plugins/steve/steve-pagination-utils.ts +368 -0
- package/plugins/steve/subscribe.js +17 -76
- package/plugins/trim-whitespace.js +6 -34
- package/plugins/vue-js-modal.js +1 -1
- package/promptRemove/pod.vue +15 -7
- package/public/index.html +1 -0
- package/rancher-components/Accordion/Accordion.test.ts +45 -0
- package/rancher-components/Accordion/Accordion.vue +86 -0
- package/rancher-components/Accordion/index.ts +1 -0
- package/rancher-components/BadgeState/BadgeState.vue +3 -3
- package/rancher-components/Banner/Banner.test.ts +1 -5
- package/rancher-components/Banner/Banner.vue +2 -2
- package/rancher-components/Card/Card.vue +4 -4
- package/rancher-components/Form/Checkbox/Checkbox.vue +4 -3
- package/rancher-components/Form/LabeledInput/LabeledInput.test.ts +18 -1
- package/rancher-components/Form/LabeledInput/LabeledInput.vue +57 -24
- package/rancher-components/Form/Radio/RadioButton.test.ts +1 -3
- package/rancher-components/Form/Radio/RadioButton.vue +13 -7
- package/rancher-components/Form/Radio/RadioGroup.vue +4 -3
- package/rancher-components/Form/TextArea/TextAreaAutoGrow.vue +6 -4
- package/rancher-components/Form/ToggleSwitch/ToggleSwitch.vue +7 -4
- package/rancher-components/LabeledTooltip/LabeledTooltip.vue +9 -4
- package/rancher-components/StringList/StringList.test.ts +270 -0
- package/rancher-components/StringList/StringList.vue +65 -26
- package/scripts/.gitlab/workflows/build-extension-catalog.gitlab-ci.yml +69 -0
- package/scripts/clean +1 -1
- package/scripts/extension/bundle +19 -7
- package/scripts/extension/helm/charts/ui-plugin-server/templates/_helpers.tpl +11 -0
- package/scripts/extension/helm/charts/ui-plugin-server/templates/cr.yaml +2 -0
- package/scripts/extension/helm/charts/ui-plugin-server/values.yaml +2 -0
- package/scripts/extension/helm/package/Dockerfile +1 -1
- package/scripts/extension/helm/scripts/package +11 -3
- package/scripts/extension/helm/scripts/patch +27 -0
- package/scripts/extension/parse-tag-name +4 -4
- package/scripts/extension/publish +25 -14
- package/scripts/publish-shell.sh +11 -1
- package/scripts/serve-pkgs +0 -2
- package/scripts/test-plugins-build.sh +87 -11
- package/scripts/vue-migrate.js +683 -0
- package/server/har-file.js +183 -0
- package/store/__tests__/catalog.test.ts +224 -0
- package/store/__tests__/type-map.test.ts +1122 -0
- package/store/auth.js +23 -4
- package/store/aws.js +53 -6
- package/store/catalog.js +22 -6
- package/store/cru-resource.ts +26 -0
- package/store/customisation.js +35 -0
- package/store/features.js +7 -4
- package/store/i18n.js +11 -0
- package/store/index.js +140 -49
- package/store/plugins.js +8 -4
- package/store/prefs.js +33 -38
- package/store/type-map.js +288 -213
- package/store/type-map.utils.ts +226 -0
- package/tsconfig.json +34 -9
- package/tsconfig.paths.json +21 -0
- package/types/components/labeledSelect.ts +50 -0
- package/types/resources/settings.d.ts +32 -0
- package/types/{userPreferences.d.ts → resources/userPreferences.d.ts} +0 -1
- package/types/shell/index.d.ts +1045 -770
- package/types/store/dashboard-store.types.ts +42 -0
- package/types/store/pagination.types.ts +457 -0
- package/types/store/type-map.ts +30 -0
- package/types/store/vuex.d.ts +9 -0
- package/types/vue-shim.d.ts +51 -0
- package/utils/__tests__/cluster.test.ts +20 -18
- package/utils/__tests__/create-yaml.test.ts +359 -2
- package/utils/__tests__/kontainer.test.ts +180 -0
- package/utils/__tests__/pod-security-admission.test.ts +1 -1
- package/utils/alertmanagerconfig.js +19 -0
- package/utils/array.ts +40 -1
- package/utils/async.ts +2 -0
- package/utils/auth.js +152 -4
- package/utils/axios.js +2 -21
- package/utils/azure.js +24 -0
- package/utils/banners.js +103 -0
- package/utils/clipboard.js +5 -0
- package/utils/cluster.js +1 -1
- package/utils/config.js +4 -0
- package/utils/create-yaml.js +59 -28
- package/utils/custom-validators.js +0 -2
- package/utils/error.js +41 -1
- package/utils/formatter.js +5 -3
- package/utils/git.ts +1 -1
- package/utils/install-redirect.js +1 -1
- package/utils/kontainer.ts +190 -0
- package/utils/object.js +24 -0
- package/utils/pagination-utils.ts +154 -0
- package/utils/pod-security-admission.ts +1 -1
- package/utils/router.js +86 -0
- package/utils/settings.ts +46 -0
- package/utils/time.js +2 -1
- package/utils/unit-tests/ChildRenderingRouterLinkStub.ts +36 -0
- package/utils/url.ts +1 -1
- package/utils/validators/formRules/__tests__/index.test.ts +70 -4
- package/utils/validators/formRules/index.ts +15 -9
- package/utils/validators/index.js +1 -0
- package/utils/validators/setting.js +6 -10
- package/utils/version.js +2 -1
- package/vue.config.js +377 -401
- package/.DS_Store +0 -0
- package/assets/images/providers/aks-black.svg +0 -28
- package/assets/images/providers/aks.svg +0 -31
- package/assets/styles/vendor/vue-js-modal.scss +0 -16
- package/components/ChartPsp.vue +0 -76
- package/components/EventsTable.vue +0 -67
- package/components/TabbedLinks/index.vue +0 -94
- package/components/__tests__/ChartPsp.test.ts +0 -75
- package/components/formatter/__tests__/ClusterProvider.test.ts +0 -28
- package/components/nuxt/nuxt-link.server.js +0 -16
- package/components/nuxt/nuxt.js +0 -101
- package/config/router.js +0 -408
- package/edit/provisioning.cattle.io.cluster/__tests__/Basics.tests.ts +0 -237
- package/initialize/App.js +0 -198
- package/initialize/client.js +0 -875
- package/initialize/index.js +0 -364
- package/initialize/layouts.ts +0 -26
- package/middleware/i18n.js +0 -10
- package/middleware/unauthenticated.js +0 -22
- package/mixins/fetch.server.js +0 -73
- package/pages/c/_cluster/apps/index.vue +0 -17
- package/pages/c/_cluster/auth/index.vue +0 -19
- package/pages/c/_cluster/index.vue +0 -17
- package/pages/c/_cluster/legacy/index.vue +0 -22
- package/pages/c/_cluster/manager/index.vue +0 -22
- package/pages/c/_cluster/mcapps/index.vue +0 -21
- package/pages/c/_cluster/uiplugins/RemoveUIPlugins.vue +0 -232
- package/pages/c/index.vue +0 -9
- package/pages/rio/mesh.vue +0 -508
- package/plugins/dashboard-store/__tests__/mutations.spec.ts +0 -406
- package/plugins/dashboard-store/rehydrate-all.js +0 -44
- package/plugins/portal-vue.js +0 -4
- package/plugins/portal.js +0 -4
- package/plugins/resize.js +0 -5
- package/plugins/shortkey.js +0 -4
- package/plugins/tooltip.js +0 -4
- package/plugins/transitions.js +0 -4
- package/plugins/v-select.js +0 -4
- package/plugins/vue-clipboard2.js +0 -4
- package/tsconfig.default.json +0 -46
- package/utils/group.js +0 -70
- package/utils/nuxt.js +0 -659
- package/utils/router.scrollBehavior.js +0 -80
- /package/components/__tests__/{Collapse.spec.ts → Collapse.test.ts} +0 -0
- /package/edit/provisioning.cattle.io.cluster/{AgentConfiguration.vue → tabs/AgentConfiguration.vue} +0 -0
- /package/edit/provisioning.cattle.io.cluster/{MemberRoles.vue → tabs/MemberRoles.vue} +0 -0
- /package/edit/provisioning.cattle.io.cluster/{ACE.vue → tabs/networking/ACE.vue} +0 -0
- /package/edit/provisioning.cattle.io.cluster/{RegistryMirrors.vue → tabs/registries/RegistryMirrors.vue} +0 -0
- /package/edit/provisioning.cattle.io.cluster/{DrainOptions.vue → tabs/upgrade/DrainOptions.vue} +0 -0
- /package/models/__tests__/{node.ts → node.test.ts} +0 -0
- /package/plugins/dashboard-store/__tests__/{actions.spec.ts → actions.test.ts} +0 -0
- /package/plugins/dashboard-store/__tests__/{getters.spec.ts → getters.test.ts} +0 -0
- /package/plugins/steve/__tests__/{header-warnings.spec.ts → header-warnings.test.ts} +0 -0
- /package/rancher-components/BadgeState/{BadgeState.spec.ts → BadgeState.test.ts} +0 -0
- /package/types/{pod-security-admission.ts → resources/pod-security-admission.ts} +0 -0
|
@@ -398,6 +398,276 @@ describe('stringList.vue', () => {
|
|
|
398
398
|
});
|
|
399
399
|
});
|
|
400
400
|
|
|
401
|
+
describe('bulk delimiter', () => {
|
|
402
|
+
const delimiter = /;/;
|
|
403
|
+
|
|
404
|
+
describe('add', () => {
|
|
405
|
+
const items: string[] = [];
|
|
406
|
+
|
|
407
|
+
beforeEach(() => {
|
|
408
|
+
wrapper = mount(StringList, {
|
|
409
|
+
propsData: {
|
|
410
|
+
items,
|
|
411
|
+
bulkAdditionDelimiter: delimiter,
|
|
412
|
+
errorMessages: { duplicate: 'error, item is duplicate.' },
|
|
413
|
+
}
|
|
414
|
+
});
|
|
415
|
+
});
|
|
416
|
+
|
|
417
|
+
it('should split values if delimiter set', async() => {
|
|
418
|
+
const value = 'test;test1;test2';
|
|
419
|
+
const result = ['test', 'test1', 'test2'];
|
|
420
|
+
|
|
421
|
+
// activate create mode
|
|
422
|
+
await wrapper.setData({ isCreateItem: true });
|
|
423
|
+
const inputField = wrapper.find('[data-testid="item-create"]');
|
|
424
|
+
|
|
425
|
+
await inputField.setValue(value);
|
|
426
|
+
|
|
427
|
+
// press enter
|
|
428
|
+
await inputField.trigger('keydown.enter');
|
|
429
|
+
await wrapper.vm.$nextTick();
|
|
430
|
+
|
|
431
|
+
const itemsResult = (wrapper.emitted('change') || [])[0][0];
|
|
432
|
+
|
|
433
|
+
expect(JSON.stringify(itemsResult)).toBe(JSON.stringify(result));
|
|
434
|
+
});
|
|
435
|
+
|
|
436
|
+
it('should show warning if one of the values is a duplicate', async() => {
|
|
437
|
+
const value = 'test;test1;test2';
|
|
438
|
+
|
|
439
|
+
await wrapper.setProps({ items: ['test1'] });
|
|
440
|
+
|
|
441
|
+
// activate create mode
|
|
442
|
+
await wrapper.setData({ isCreateItem: true });
|
|
443
|
+
const inputField = wrapper.find('[data-testid="item-create"]');
|
|
444
|
+
|
|
445
|
+
await inputField.setValue(value);
|
|
446
|
+
|
|
447
|
+
// press enter
|
|
448
|
+
await inputField.trigger('keydown.enter');
|
|
449
|
+
await wrapper.vm.$nextTick();
|
|
450
|
+
|
|
451
|
+
const isDuplicate = (wrapper.emitted('errors') || [])[0][0].duplicate;
|
|
452
|
+
|
|
453
|
+
expect(isDuplicate).toBe(true);
|
|
454
|
+
});
|
|
455
|
+
|
|
456
|
+
it('should show a warning if the new values are all duplicates', async() => {
|
|
457
|
+
const value = 'test;test';
|
|
458
|
+
|
|
459
|
+
// activate create mode
|
|
460
|
+
await wrapper.setData({ isCreateItem: true });
|
|
461
|
+
const inputField = wrapper.find('[data-testid="item-create"]');
|
|
462
|
+
|
|
463
|
+
await inputField.setValue(value);
|
|
464
|
+
|
|
465
|
+
// press enter
|
|
466
|
+
await inputField.trigger('keydown.enter');
|
|
467
|
+
await wrapper.vm.$nextTick();
|
|
468
|
+
|
|
469
|
+
const isDuplicate = (wrapper.emitted('errors') || [])[0][0].duplicate;
|
|
470
|
+
|
|
471
|
+
expect(isDuplicate).toBe(true);
|
|
472
|
+
});
|
|
473
|
+
|
|
474
|
+
it('should not consider empty strings at the beginning', async() => {
|
|
475
|
+
const value = ';test;test1;test2';
|
|
476
|
+
const result = ['test', 'test1', 'test2'];
|
|
477
|
+
|
|
478
|
+
// activate create mode
|
|
479
|
+
await wrapper.setData({ isCreateItem: true });
|
|
480
|
+
const inputField = wrapper.find('[data-testid="item-create"]');
|
|
481
|
+
|
|
482
|
+
await inputField.setValue(value);
|
|
483
|
+
|
|
484
|
+
// press enter
|
|
485
|
+
await inputField.trigger('keydown.enter');
|
|
486
|
+
await wrapper.vm.$nextTick();
|
|
487
|
+
|
|
488
|
+
const itemsResult = (wrapper.emitted('change') || [])[0][0];
|
|
489
|
+
|
|
490
|
+
expect(JSON.stringify(itemsResult)).toBe(JSON.stringify(result));
|
|
491
|
+
});
|
|
492
|
+
|
|
493
|
+
it('should not consider empty strings in the middle', async() => {
|
|
494
|
+
const value = 'test;test1;;test2';
|
|
495
|
+
const result = ['test', 'test1', 'test2'];
|
|
496
|
+
|
|
497
|
+
// activate create mode
|
|
498
|
+
await wrapper.setData({ isCreateItem: true });
|
|
499
|
+
const inputField = wrapper.find('[data-testid="item-create"]');
|
|
500
|
+
|
|
501
|
+
await inputField.setValue(value);
|
|
502
|
+
|
|
503
|
+
// press enter
|
|
504
|
+
await inputField.trigger('keydown.enter');
|
|
505
|
+
await wrapper.vm.$nextTick();
|
|
506
|
+
|
|
507
|
+
const itemsResult = (wrapper.emitted('change') || [])[0][0];
|
|
508
|
+
|
|
509
|
+
expect(JSON.stringify(itemsResult)).toBe(JSON.stringify(result));
|
|
510
|
+
});
|
|
511
|
+
|
|
512
|
+
it('should not consider empty strings at the end', async() => {
|
|
513
|
+
const value = 'test;test1;test2;';
|
|
514
|
+
const result = ['test', 'test1', 'test2'];
|
|
515
|
+
|
|
516
|
+
// activate create mode
|
|
517
|
+
await wrapper.setData({ isCreateItem: true });
|
|
518
|
+
const inputField = wrapper.find('[data-testid="item-create"]');
|
|
519
|
+
|
|
520
|
+
await inputField.setValue(value);
|
|
521
|
+
|
|
522
|
+
// press enter
|
|
523
|
+
await inputField.trigger('keydown.enter');
|
|
524
|
+
await wrapper.vm.$nextTick();
|
|
525
|
+
|
|
526
|
+
const itemsResult = (wrapper.emitted('change') || [])[0][0];
|
|
527
|
+
|
|
528
|
+
expect(JSON.stringify(itemsResult)).toBe(JSON.stringify(result));
|
|
529
|
+
});
|
|
530
|
+
});
|
|
531
|
+
|
|
532
|
+
describe('edit', () => {
|
|
533
|
+
const items = ['test1', 'test2'];
|
|
534
|
+
|
|
535
|
+
beforeEach(() => {
|
|
536
|
+
wrapper = mount(StringList, {
|
|
537
|
+
propsData: {
|
|
538
|
+
items,
|
|
539
|
+
bulkAdditionDelimiter: delimiter,
|
|
540
|
+
errorMessages: { duplicate: 'error, item is duplicate.' },
|
|
541
|
+
}
|
|
542
|
+
});
|
|
543
|
+
});
|
|
544
|
+
|
|
545
|
+
it('should split values if delimiter set', async() => {
|
|
546
|
+
const newValue = 'test1;new;values';
|
|
547
|
+
const result = ['test1', 'new', 'values', 'test2'];
|
|
548
|
+
|
|
549
|
+
await wrapper.setData({ editedItem: items[0] });
|
|
550
|
+
const inputField = wrapper.find('[data-testid^="item-edit"]');
|
|
551
|
+
|
|
552
|
+
await inputField.setValue(newValue);
|
|
553
|
+
|
|
554
|
+
// press enter
|
|
555
|
+
await inputField.trigger('keydown.enter');
|
|
556
|
+
await wrapper.vm.$nextTick();
|
|
557
|
+
|
|
558
|
+
const itemsResult = (wrapper.emitted('change') || [])[0][0];
|
|
559
|
+
|
|
560
|
+
expect(JSON.stringify(itemsResult)).toBe(JSON.stringify(result));
|
|
561
|
+
});
|
|
562
|
+
|
|
563
|
+
it('should show warning if one of the values is a duplicate', async() => {
|
|
564
|
+
const newValue = 'test1;test2';
|
|
565
|
+
|
|
566
|
+
await wrapper.setData({ editedItem: items[0] });
|
|
567
|
+
const inputField = wrapper.find('[data-testid^="item-edit"]');
|
|
568
|
+
|
|
569
|
+
await inputField.setValue(newValue);
|
|
570
|
+
|
|
571
|
+
// press enter
|
|
572
|
+
await inputField.trigger('keydown.enter');
|
|
573
|
+
await wrapper.vm.$nextTick();
|
|
574
|
+
|
|
575
|
+
const isDuplicate = (wrapper.emitted('errors') || [])[0][0].duplicate;
|
|
576
|
+
|
|
577
|
+
expect(isDuplicate).toBe(true);
|
|
578
|
+
});
|
|
579
|
+
|
|
580
|
+
it('should show a warning if the new values are all duplicates', async() => {
|
|
581
|
+
const newValue = 'test;test';
|
|
582
|
+
|
|
583
|
+
await wrapper.setData({ editedItem: items[0] });
|
|
584
|
+
const inputField = wrapper.find('[data-testid^="item-edit"]');
|
|
585
|
+
|
|
586
|
+
await inputField.setValue(newValue);
|
|
587
|
+
|
|
588
|
+
// press enter
|
|
589
|
+
await inputField.trigger('keydown.enter');
|
|
590
|
+
await wrapper.vm.$nextTick();
|
|
591
|
+
|
|
592
|
+
const isDuplicate = (wrapper.emitted('errors') || [])[0][0].duplicate;
|
|
593
|
+
|
|
594
|
+
expect(isDuplicate).toBe(true);
|
|
595
|
+
});
|
|
596
|
+
|
|
597
|
+
it('should not consider empty strings at the beginning', async() => {
|
|
598
|
+
const newValue = ';test1;new;value';
|
|
599
|
+
const result = ['test1', 'new', 'value', 'test2'];
|
|
600
|
+
|
|
601
|
+
await wrapper.setData({ editedItem: items[0] });
|
|
602
|
+
const inputField = wrapper.find('[data-testid^="item-edit"]');
|
|
603
|
+
|
|
604
|
+
await inputField.setValue(newValue);
|
|
605
|
+
|
|
606
|
+
// press enter
|
|
607
|
+
await inputField.trigger('keydown.enter');
|
|
608
|
+
await wrapper.vm.$nextTick();
|
|
609
|
+
|
|
610
|
+
const itemsResult = (wrapper.emitted('change') || [])[0][0];
|
|
611
|
+
|
|
612
|
+
expect(JSON.stringify(itemsResult)).toBe(JSON.stringify(result));
|
|
613
|
+
});
|
|
614
|
+
|
|
615
|
+
it('should not consider empty strings in the middle 1', async() => {
|
|
616
|
+
const newValue = 'test1; ;new;value';
|
|
617
|
+
const result = ['test1', 'new', 'value', 'test2'];
|
|
618
|
+
|
|
619
|
+
await wrapper.setData({ editedItem: items[0] });
|
|
620
|
+
const inputField = wrapper.find('[data-testid^="item-edit"]');
|
|
621
|
+
|
|
622
|
+
await inputField.setValue(newValue);
|
|
623
|
+
|
|
624
|
+
// press enter
|
|
625
|
+
await inputField.trigger('keydown.enter');
|
|
626
|
+
await wrapper.vm.$nextTick();
|
|
627
|
+
|
|
628
|
+
const itemsResult = (wrapper.emitted('change') || [])[0][0];
|
|
629
|
+
|
|
630
|
+
expect(JSON.stringify(itemsResult)).toBe(JSON.stringify(result));
|
|
631
|
+
});
|
|
632
|
+
|
|
633
|
+
it('should not consider empty strings in the middle 2', async() => {
|
|
634
|
+
const newValue = 'test1;;new;value';
|
|
635
|
+
const result = ['test1', 'new', 'value', 'test2'];
|
|
636
|
+
|
|
637
|
+
await wrapper.setData({ editedItem: items[0] });
|
|
638
|
+
const inputField = wrapper.find('[data-testid^="item-edit"]');
|
|
639
|
+
|
|
640
|
+
await inputField.setValue(newValue);
|
|
641
|
+
|
|
642
|
+
// press enter
|
|
643
|
+
await inputField.trigger('keydown.enter');
|
|
644
|
+
await wrapper.vm.$nextTick();
|
|
645
|
+
|
|
646
|
+
const itemsResult = (wrapper.emitted('change') || [])[0][0];
|
|
647
|
+
|
|
648
|
+
expect(JSON.stringify(itemsResult)).toBe(JSON.stringify(result));
|
|
649
|
+
});
|
|
650
|
+
|
|
651
|
+
it('should not consider empty strings at the end', async() => {
|
|
652
|
+
const newValue = 'test1;new;value;';
|
|
653
|
+
const result = ['test1', 'new', 'value', 'test2'];
|
|
654
|
+
|
|
655
|
+
await wrapper.setData({ editedItem: items[0] });
|
|
656
|
+
const inputField = wrapper.find('[data-testid^="item-edit"]');
|
|
657
|
+
|
|
658
|
+
await inputField.setValue(newValue);
|
|
659
|
+
|
|
660
|
+
// press enter
|
|
661
|
+
await inputField.trigger('keydown.enter');
|
|
662
|
+
await wrapper.vm.$nextTick();
|
|
663
|
+
|
|
664
|
+
const itemsResult = (wrapper.emitted('change') || [])[0][0];
|
|
665
|
+
|
|
666
|
+
expect(JSON.stringify(itemsResult)).toBe(JSON.stringify(result));
|
|
667
|
+
});
|
|
668
|
+
});
|
|
669
|
+
});
|
|
670
|
+
|
|
401
671
|
describe('errors handling', () => {
|
|
402
672
|
it('show duplicate warning icon when errorMessages is defined', async() => {
|
|
403
673
|
const items = ['test'];
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
<script lang="ts">
|
|
2
|
-
import Vue, { PropType } from 'vue';
|
|
2
|
+
import Vue, { PropType, defineComponent } from 'vue';
|
|
3
3
|
|
|
4
4
|
import LabeledInput from '@components/Form/LabeledInput/LabeledInput.vue';
|
|
5
5
|
import { findStringIndex, hasDuplicatedStrings } from '@shell/utils/array';
|
|
@@ -29,7 +29,7 @@ const CLASS = {
|
|
|
29
29
|
/**
|
|
30
30
|
* Manage a list of strings
|
|
31
31
|
*/
|
|
32
|
-
export default
|
|
32
|
+
export default defineComponent({
|
|
33
33
|
|
|
34
34
|
name: 'StringList',
|
|
35
35
|
components: { LabeledInput },
|
|
@@ -82,12 +82,19 @@ export default Vue.extend({
|
|
|
82
82
|
return {} as ErrorMessages;
|
|
83
83
|
},
|
|
84
84
|
},
|
|
85
|
+
/**
|
|
86
|
+
* Enables bulk addition and defines the delimiter to split the input string.
|
|
87
|
+
*/
|
|
88
|
+
bulkAdditionDelimiter: {
|
|
89
|
+
type: RegExp,
|
|
90
|
+
default: null,
|
|
91
|
+
}
|
|
85
92
|
},
|
|
86
93
|
data() {
|
|
87
94
|
return {
|
|
88
|
-
value:
|
|
95
|
+
value: undefined as string | undefined,
|
|
89
96
|
selected: null as string | null,
|
|
90
|
-
editedItem:
|
|
97
|
+
editedItem: undefined as string | undefined,
|
|
91
98
|
isCreateItem: false,
|
|
92
99
|
errors: { duplicate: false } as Record<Error, boolean>
|
|
93
100
|
};
|
|
@@ -125,13 +132,9 @@ export default Vue.extend({
|
|
|
125
132
|
},
|
|
126
133
|
|
|
127
134
|
methods: {
|
|
128
|
-
onChange(value: string) {
|
|
135
|
+
onChange(value: string, index?: number) {
|
|
129
136
|
this.value = value;
|
|
130
|
-
|
|
131
|
-
const items = [
|
|
132
|
-
...this.items,
|
|
133
|
-
this.value
|
|
134
|
-
];
|
|
137
|
+
const items = this.addValueToItems(this.items, value, index);
|
|
135
138
|
|
|
136
139
|
this.toggleError(
|
|
137
140
|
'duplicate',
|
|
@@ -278,7 +281,7 @@ export default Vue.extend({
|
|
|
278
281
|
this.isCreateItem = true;
|
|
279
282
|
this.setFocus(INPUT.create);
|
|
280
283
|
} else {
|
|
281
|
-
this.value =
|
|
284
|
+
this.value = undefined;
|
|
282
285
|
this.toggleError('duplicate', false);
|
|
283
286
|
this.onSelectLeave();
|
|
284
287
|
|
|
@@ -300,11 +303,11 @@ export default Vue.extend({
|
|
|
300
303
|
this.editedItem = item || '';
|
|
301
304
|
this.setFocus(INPUT.edit);
|
|
302
305
|
} else {
|
|
303
|
-
this.value =
|
|
306
|
+
this.value = undefined;
|
|
304
307
|
this.toggleError('duplicate', false);
|
|
305
308
|
this.onSelectLeave();
|
|
306
309
|
|
|
307
|
-
this.editedItem =
|
|
310
|
+
this.editedItem = undefined;
|
|
308
311
|
}
|
|
309
312
|
},
|
|
310
313
|
|
|
@@ -321,10 +324,7 @@ export default Vue.extend({
|
|
|
321
324
|
const value = this.value?.trim();
|
|
322
325
|
|
|
323
326
|
if (value) {
|
|
324
|
-
const items =
|
|
325
|
-
...this.items,
|
|
326
|
-
value,
|
|
327
|
-
];
|
|
327
|
+
const items = this.addValueToItems(this.items, value);
|
|
328
328
|
|
|
329
329
|
if (!hasDuplicatedStrings(items, this.caseSensitive)) {
|
|
330
330
|
this.updateItems(items);
|
|
@@ -343,12 +343,8 @@ export default Vue.extend({
|
|
|
343
343
|
const value = this.value?.trim();
|
|
344
344
|
|
|
345
345
|
if (value) {
|
|
346
|
-
const
|
|
347
|
-
const
|
|
348
|
-
|
|
349
|
-
if (index !== -1) {
|
|
350
|
-
items[index] = value;
|
|
351
|
-
}
|
|
346
|
+
const index = findStringIndex(this.items, item, false);
|
|
347
|
+
const items = index !== -1 ? this.addValueToItems(this.items, value, index) : this.items;
|
|
352
348
|
|
|
353
349
|
if (!hasDuplicatedStrings(items, this.caseSensitive)) {
|
|
354
350
|
this.updateItems(items);
|
|
@@ -360,6 +356,49 @@ export default Vue.extend({
|
|
|
360
356
|
}
|
|
361
357
|
},
|
|
362
358
|
|
|
359
|
+
/**
|
|
360
|
+
* Add a new or update an exiting item in the items list.
|
|
361
|
+
*
|
|
362
|
+
* @param items The current items list.
|
|
363
|
+
* @param value The new value to be added.
|
|
364
|
+
* @param index The list index of the item to be updated (optional).
|
|
365
|
+
* @returns Updated items list.
|
|
366
|
+
*/
|
|
367
|
+
addValueToItems(items: string[], value: string, index?: number): string[] {
|
|
368
|
+
const updatedItems = [...items];
|
|
369
|
+
|
|
370
|
+
// Add new item
|
|
371
|
+
if (index === undefined) {
|
|
372
|
+
if (this.bulkAdditionDelimiter && value.search(this.bulkAdditionDelimiter) >= 0) {
|
|
373
|
+
updatedItems.push(...this.splitBulkValue(value));
|
|
374
|
+
} else {
|
|
375
|
+
updatedItems.push(value);
|
|
376
|
+
}
|
|
377
|
+
} else { // Update existing item
|
|
378
|
+
if (this.bulkAdditionDelimiter && value.search(this.bulkAdditionDelimiter) >= 0) {
|
|
379
|
+
updatedItems.splice(index, 1, ...this.splitBulkValue(value));
|
|
380
|
+
} else {
|
|
381
|
+
updatedItems[index] = value;
|
|
382
|
+
}
|
|
383
|
+
}
|
|
384
|
+
|
|
385
|
+
return updatedItems;
|
|
386
|
+
},
|
|
387
|
+
|
|
388
|
+
/**
|
|
389
|
+
* Split the value by the defined delimiter and remove empty strings.
|
|
390
|
+
*
|
|
391
|
+
* @param value The value to be split.
|
|
392
|
+
* @returns Array containing split values.
|
|
393
|
+
*/
|
|
394
|
+
splitBulkValue(value: string): string[] {
|
|
395
|
+
return value
|
|
396
|
+
.split(this.bulkAdditionDelimiter)
|
|
397
|
+
.filter((item) => {
|
|
398
|
+
return item.trim().length > 0;
|
|
399
|
+
});
|
|
400
|
+
},
|
|
401
|
+
|
|
363
402
|
/**
|
|
364
403
|
* Remove an item from items list
|
|
365
404
|
*/
|
|
@@ -393,7 +432,7 @@ export default Vue.extend({
|
|
|
393
432
|
@dblclick="onClickEmptyBody()"
|
|
394
433
|
>
|
|
395
434
|
<div
|
|
396
|
-
v-for="item in items"
|
|
435
|
+
v-for="(item, index) in items"
|
|
397
436
|
:key="item"
|
|
398
437
|
:ref="item"
|
|
399
438
|
:class="{
|
|
@@ -421,7 +460,7 @@ export default Vue.extend({
|
|
|
421
460
|
:data-testid="`item-edit-${item}`"
|
|
422
461
|
class="edit-input static"
|
|
423
462
|
:value="value != null ? value : item"
|
|
424
|
-
@input="onChange($event)"
|
|
463
|
+
@input="onChange($event, index)"
|
|
425
464
|
@blur.prevent="updateItem(item)"
|
|
426
465
|
@keydown.native.enter="updateItem(item, !errors.duplicate)"
|
|
427
466
|
/>
|
|
@@ -463,7 +502,7 @@ export default Vue.extend({
|
|
|
463
502
|
<button
|
|
464
503
|
data-testid="button-add"
|
|
465
504
|
class="btn btn-sm role-tertiary add-button"
|
|
466
|
-
:disabled="isCreateItem || editedItem"
|
|
505
|
+
:disabled="!!isCreateItem || !!editedItem"
|
|
467
506
|
@click.prevent="onClickPlusButton"
|
|
468
507
|
>
|
|
469
508
|
<span class="icon icon-plus icon-sm" />
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
variables:
|
|
2
|
+
NODE_VERSION: "v16.20.2"
|
|
3
|
+
NODE_DISTRO: "node-${NODE_VERSION}-linux-x64"
|
|
4
|
+
YQ_VERSION: "v4.44.1"
|
|
5
|
+
YQ_URL: "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64"
|
|
6
|
+
|
|
7
|
+
.podman-setup: &podman-setup
|
|
8
|
+
# Install podman and jq
|
|
9
|
+
- zypper --non-interactive install jq podman
|
|
10
|
+
- usermod --add-subuids 100000-165535 --add-subgids 100000-165535 $(id -nu)
|
|
11
|
+
- podman login -u $REGISTRY_USER -p $REGISTRY_PASSWORD $REGISTRY
|
|
12
|
+
|
|
13
|
+
.node-setup: &node-setup
|
|
14
|
+
# Download, verify, and install Node.js, npm, and yarn
|
|
15
|
+
- curl -O https://nodejs.org/download/release/${NODE_VERSION}/${NODE_DISTRO}.tar.gz
|
|
16
|
+
- curl -O https://nodejs.org/download/release/${NODE_VERSION}/SHASUMS256.txt
|
|
17
|
+
- grep "${NODE_DISTRO}.tar.gz" SHASUMS256.txt | sha256sum -c -
|
|
18
|
+
- tar -xzf ${NODE_DISTRO}.tar.gz
|
|
19
|
+
- mv ${NODE_DISTRO} /usr/local/node
|
|
20
|
+
- ln -s /usr/local/node/bin/node /usr/local/bin/node
|
|
21
|
+
- ln -s /usr/local/node/bin/npm /usr/local/bin/npm
|
|
22
|
+
- npm install -g --unsafe-perm yarn
|
|
23
|
+
- export PATH="/usr/local/node/bin:/root/.npm-global/bin:$PATH"
|
|
24
|
+
|
|
25
|
+
check_version_collisions:
|
|
26
|
+
stage: check_version
|
|
27
|
+
rules:
|
|
28
|
+
- changes:
|
|
29
|
+
- package.json
|
|
30
|
+
script:
|
|
31
|
+
- *podman-setup
|
|
32
|
+
- |
|
|
33
|
+
PACKAGE_VERSION=`jq -r .version package.json`
|
|
34
|
+
PACKAGE_NAME=`jq -r .name package.json`
|
|
35
|
+
|
|
36
|
+
readarray -t VERSIONS < <(podman search $REGISTRY/$IMAGE_NAMESPACE/ui-extension-$PACKAGE_NAME --list-tags --format {{.Tag}})
|
|
37
|
+
|
|
38
|
+
echo -e "Checking for version collisions with Extension version: ${PACKAGE_VERSION}"
|
|
39
|
+
for version in ${VERSIONS[@]}; do
|
|
40
|
+
if [[ ${version} == ${PACKAGE_VERSION} ]]; then
|
|
41
|
+
echo "Cannot overwrite production image version ${version} since it already exists."
|
|
42
|
+
podman logout $REGISTRY
|
|
43
|
+
exit 1
|
|
44
|
+
fi
|
|
45
|
+
done
|
|
46
|
+
|
|
47
|
+
echo -e "Published image not found for version ${PACKAGE_VERSION}, continuing build..."
|
|
48
|
+
|
|
49
|
+
build_and_release:
|
|
50
|
+
stage: build_catalog
|
|
51
|
+
rules:
|
|
52
|
+
- changes:
|
|
53
|
+
- package.json
|
|
54
|
+
script:
|
|
55
|
+
- *podman-setup
|
|
56
|
+
- *node-setup
|
|
57
|
+
- zypper --non-interactive --no-gpg-checks refresh
|
|
58
|
+
- zypper --non-interactive install go git helm
|
|
59
|
+
|
|
60
|
+
# Download and install yq
|
|
61
|
+
- curl -sLf ${YQ_URL} -o /usr/bin/yq && chmod +x /usr/bin/yq
|
|
62
|
+
|
|
63
|
+
# Install dependencies and build extension catalog
|
|
64
|
+
- yarn
|
|
65
|
+
- yarn publish-pkgs -cl -r $REGISTRY -o $IMAGE_NAMESPACE
|
|
66
|
+
|
|
67
|
+
# Push all images except the base image
|
|
68
|
+
- podman push `podman images -f reference!=registry.suse.com/bci/bci-base --format "{{index .Names 0}}"`
|
|
69
|
+
- podman logout $REGISTRY
|
package/scripts/clean
CHANGED
package/scripts/extension/bundle
CHANGED
|
@@ -16,6 +16,7 @@ REGISTRY="${3}"
|
|
|
16
16
|
REGISTRY_ORG="${4}"
|
|
17
17
|
IMAGE_PREFIX="${5}"
|
|
18
18
|
PUSH="${6}"
|
|
19
|
+
PODMAN_CONTAINER="${7}"
|
|
19
20
|
|
|
20
21
|
PKG_NAME="${PKG}-${PKG_VERSION}"
|
|
21
22
|
|
|
@@ -48,12 +49,15 @@ for d in ${BASE_DIR}/dist-pkg/*; do
|
|
|
48
49
|
cp -R ${BASE_DIR}/dist-pkg/${pkg} ${TMP}/container/plugin
|
|
49
50
|
done
|
|
50
51
|
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
52
|
+
package() {
|
|
53
|
+
if [ "${PODMAN_CONTAINER}" == "true" ]; then
|
|
54
|
+
RUNTIME="podman"
|
|
55
|
+
else
|
|
56
|
+
RUNTIME="docker"
|
|
57
|
+
fi
|
|
58
|
+
echo -e "Container build: ${RUNTIME}"
|
|
54
59
|
|
|
55
|
-
|
|
56
|
-
REGISTRY=${REGISTRY} ORG=${REGISTRY_ORG} REPO=${IMAGE_PREFIX}${PKG} TAG=${PKG_VERSION} ./scripts/package
|
|
60
|
+
REGISTRY=${REGISTRY} ORG=${REGISTRY_ORG} REPO=${IMAGE_PREFIX}${PKG} TAG=${PKG_VERSION} RUNTIME=${RUNTIME} ./scripts/package
|
|
57
61
|
|
|
58
62
|
if [ "${PUSH}" == "--push" ]; then
|
|
59
63
|
echo -e "${CYAN}Pushing container image ...${RESET}"
|
|
@@ -61,14 +65,22 @@ if [ ! -z "${REGISTRY}" ]; then
|
|
|
61
65
|
# Ensure that you do not overwrite production images
|
|
62
66
|
if [[ "${REGISTRY_ORG}" == "rancher" ]]; then
|
|
63
67
|
IMAGE=${REGISTRY}${REGISTRY_ORG}/${IMAGE_PREFIX}${PKG}:${PKG_VERSION}
|
|
64
|
-
if
|
|
68
|
+
if ${RUNTIME} manifest inspect ${IMAGE} 2>&1 1>/dev/null; then
|
|
65
69
|
echo -e "${RED}${BOLD}Cannot overwrite production image ${IMAGE_PREFIX}${PKG} since it already exists${RESET}"
|
|
66
70
|
exit 1
|
|
67
71
|
fi
|
|
68
72
|
fi
|
|
69
73
|
|
|
70
|
-
|
|
74
|
+
${RUNTIME} push ${REGISTRY}${REGISTRY_ORG}/${IMAGE_PREFIX}${PKG}:${PKG_VERSION}
|
|
71
75
|
fi
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
# Build the container image
|
|
79
|
+
pushd ${TMP}/container > /dev/null
|
|
80
|
+
echo -e "${CYAN}Building container image ...${RESET}"
|
|
81
|
+
|
|
82
|
+
if [ ! -z "${REGISTRY}" ]; then
|
|
83
|
+
package
|
|
72
84
|
fi
|
|
73
85
|
|
|
74
86
|
popd > /dev/null
|
|
@@ -50,3 +50,14 @@ Selector labels
|
|
|
50
50
|
app.kubernetes.io/name: {{ include "extension-server.name" . }}
|
|
51
51
|
app.kubernetes.io/instance: {{ .Release.Name }}
|
|
52
52
|
{{- end }}
|
|
53
|
+
|
|
54
|
+
{{/*
|
|
55
|
+
Pkg annotations
|
|
56
|
+
*/}}
|
|
57
|
+
{{- define "extension-server.pluginMetadata" -}}
|
|
58
|
+
{{- with .Values.plugin.metadata }}
|
|
59
|
+
{{- range $key, $value := . }}
|
|
60
|
+
{{ $key }}: {{ $value | quote }}
|
|
61
|
+
{{- end }}
|
|
62
|
+
{{- end }}
|
|
63
|
+
{{- end }}
|
|
@@ -10,3 +10,5 @@ spec:
|
|
|
10
10
|
version: {{ (semver (default .Chart.AppVersion .Values.plugin.versionOverride)).Original }}
|
|
11
11
|
endpoint: http://{{ include "extension-server.fullname" . }}.{{ .Release.Namespace }}.svc
|
|
12
12
|
noCache: {{ .Values.plugin.noCache }}
|
|
13
|
+
noAuth: {{ .Values.plugin.noAuth }}
|
|
14
|
+
metadata: {{ include "extension-server.pluginMetadata" . | indent 6 }}
|
|
@@ -5,8 +5,8 @@ source $(dirname $0)/version
|
|
|
5
5
|
|
|
6
6
|
cd $(dirname $0)/..
|
|
7
7
|
|
|
8
|
-
if [[ -z ${ORG} ]] || [[ -z ${REPO} ]] || [[ -z ${TAG} ]]; then
|
|
9
|
-
echo "Usage: [REGISTRY=] ORG= REPO= TAG= ./scripts/package"
|
|
8
|
+
if [[ -z ${ORG} ]] || [[ -z ${REPO} ]] || [[ -z ${TAG} ]] || [[ -z ${RUNTIME} ]]; then
|
|
9
|
+
echo "Usage: [REGISTRY=] ORG= REPO= TAG= RUNTIME= ./scripts/package"
|
|
10
10
|
exit 1
|
|
11
11
|
fi
|
|
12
12
|
|
|
@@ -19,5 +19,13 @@ if [ -e ${DOCKERFILE}.${ARCH} ]; then
|
|
|
19
19
|
DOCKERFILE=${DOCKERFILE}.${ARCH}
|
|
20
20
|
fi
|
|
21
21
|
|
|
22
|
-
|
|
22
|
+
BUILD="${RUNTIME} build -f ${DOCKERFILE} -t ${IMAGE}"
|
|
23
|
+
|
|
24
|
+
if [[ ${RUNTIME} == "podman" ]]; then
|
|
25
|
+
BUILD="$BUILD -v /var/lib/containers:/var/lib/containers ."
|
|
26
|
+
else
|
|
27
|
+
BUILD="$BUILD ."
|
|
28
|
+
fi
|
|
29
|
+
|
|
30
|
+
$BUILD
|
|
23
31
|
echo Built ${IMAGE}
|
|
@@ -57,6 +57,18 @@ DESCRIPTION=$(cat ${PACKAGE_JSON} | jq ".description" | tr -d '"')
|
|
|
57
57
|
ICON=$(cat ${PACKAGE_JSON} | jq ".icon" | tr -d '"')
|
|
58
58
|
KEYWORDS=$(cat ${PACKAGE_JSON} | jq ".keywords")
|
|
59
59
|
HOME=$(cat ${PACKAGE_JSON} | jq ".homepage" | tr -d '"')
|
|
60
|
+
ANNOTATIONS=""
|
|
61
|
+
NO_AUTH="false"
|
|
62
|
+
|
|
63
|
+
if jq -e '.rancher.annotations | objects' ${PACKAGE_JSON} > /dev/null 2>&1; then
|
|
64
|
+
ANNOTATIONS=$(jq -r '.rancher.annotations | to_entries[] | @base64' < ${PACKAGE_JSON})
|
|
65
|
+
fi
|
|
66
|
+
|
|
67
|
+
# Check if the package file specifies noAuth
|
|
68
|
+
if jq -e '.rancher.noAuth' ${PACKAGE_JSON} > /dev/null 2>&1; then
|
|
69
|
+
NO_AUTH=$(jq -r '.rancher.noAuth' < ${PACKAGE_JSON})
|
|
70
|
+
echo "noAuth: ${NO_AUTH}"
|
|
71
|
+
fi
|
|
60
72
|
|
|
61
73
|
if [[ -z ${ORG} ]] || [[ -z ${REPO} ]] || [[ -z ${TAG} ]]; then
|
|
62
74
|
echo "Usage: [CHART=charts/ui-plugin-server] [REGISTRY=""] [ORG=rancher] [REPO=<override-repo>] [TAG=<override-tag>] [PACKAGE_JSON=plugin/package.json] ./scripts/patch <chart>"
|
|
@@ -99,3 +111,18 @@ if [[ -n "${HOME}" ]]; then
|
|
|
99
111
|
yq -i eval ".home = \"${HOME}\"" $CHART/Chart.yaml
|
|
100
112
|
fi
|
|
101
113
|
fi
|
|
114
|
+
|
|
115
|
+
if [[ -n "${ANNOTATIONS}" ]]; then
|
|
116
|
+
for ANNOTATION in ${ANNOTATIONS}; do
|
|
117
|
+
decoded_annotation=$(echo ${ANNOTATION} | base64 --decode)
|
|
118
|
+
key=$(echo ${decoded_annotation} | jq -r '.key')
|
|
119
|
+
value=$(echo ${decoded_annotation} | jq -r '.value')
|
|
120
|
+
|
|
121
|
+
yq -i eval ".plugin.metadata[\"${key}\"] = \"${value}\"" $CHART/values.yaml
|
|
122
|
+
done
|
|
123
|
+
fi
|
|
124
|
+
|
|
125
|
+
# If the extension has noAuth as true then patch this into the values.yaml to override the default of false
|
|
126
|
+
if [ "${NO_AUTH}" == "true" ]; then
|
|
127
|
+
yq -i eval ".plugin.noAuth=true" $CHART/values.yaml
|
|
128
|
+
fi
|