diff --git a/app/assets/ico/vendor/kubesolo.svg b/app/assets/ico/vendor/kubesolo.svg new file mode 100644 index 0000000000..ecda7b7e73 --- /dev/null +++ b/app/assets/ico/vendor/kubesolo.svg @@ -0,0 +1,985 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/react/edge/components/EdgeScriptForm/types.ts b/app/react/edge/components/EdgeScriptForm/types.ts index 472a0f3f8a..047d7b0ee2 100644 --- a/app/react/edge/components/EdgeScriptForm/types.ts +++ b/app/react/edge/components/EdgeScriptForm/types.ts @@ -3,7 +3,7 @@ import { EnvironmentGroupId } from '@/react/portainer/environments/types'; import { EdgeGroup } from '../../edge-groups/types'; -export type Platform = 'standalone' | 'swarm' | 'podman' | 'k8s'; +export type Platform = 'standalone' | 'swarm' | 'podman' | 'k8s' | 'kubesolo'; export type OS = 'win' | 'linux'; export interface ScriptFormValues { diff --git a/app/react/portainer/environments/wizard/EnvironmentTypeSelectView/environment-types.ts b/app/react/portainer/environments/wizard/EnvironmentTypeSelectView/environment-types.ts index c39bdc5156..372b929eea 100644 --- a/app/react/portainer/environments/wizard/EnvironmentTypeSelectView/environment-types.ts +++ b/app/react/portainer/environments/wizard/EnvironmentTypeSelectView/environment-types.ts @@ -2,8 +2,8 @@ import { FeatureId } from '@/react/portainer/feature-flags/enums'; import Docker from '@/assets/ico/vendor/docker.svg?c'; import Podman from '@/assets/ico/vendor/podman.svg?c'; import Kubernetes from '@/assets/ico/vendor/kubernetes.svg?c'; +import Kubesolo from '@/assets/ico/vendor/kubesolo.svg?c'; import Azure from '@/assets/ico/vendor/azure.svg?c'; -import KaaS from '@/assets/ico/vendor/kaas-icon.svg?c'; import InstallK8s from '@/assets/ico/vendor/install-kubernetes.svg?c'; import { BoxSelectorOption } from '@@/BoxSelector'; @@ -14,7 +14,7 @@ export type EnvironmentOptionValue = | 'podman' | 'kubernetes' | 'aci' - | 'kaas' + | 'kubesolo' | 'k8sInstall'; export interface EnvironmentOption extends BoxSelectorOption { @@ -66,14 +66,14 @@ export const existingEnvironmentTypes: EnvironmentOption[] = [ export const newEnvironmentTypes: EnvironmentOption[] = [ { - id: 'kaas', - value: 'kaas', - label: 'Provision KaaS Cluster (Deprecated)', + id: 'kubesolo', + value: 'kubesolo', + label: 'KubeSolo (Edge)', description: - "Provision a Kubernetes cluster via a cloud provider's Kubernetes as a Service", - icon: KaaS, + 'Deploy a single-node Kubernetes edge environment with KubeSolo', + icon: Kubesolo, iconType: 'logo', - feature: FeatureId.KAAS_PROVISIONING, + feature: FeatureId.KUBESOLO, disabledWhenLimited: true, }, { @@ -99,6 +99,6 @@ export const formTitles: Record = { podman: 'Connect to your Podman environment', kubernetes: 'Connect to your Kubernetes environment', aci: 'Connect to your ACI environment', - kaas: 'Provision a KaaS environment', + kubesolo: 'Deploy a kubesolo edge environment', k8sInstall: 'Create a Kubernetes cluster', }; diff --git a/app/react/portainer/environments/wizard/EnvironmentsCreationView/EnvironmentsCreationView.tsx b/app/react/portainer/environments/wizard/EnvironmentsCreationView/EnvironmentsCreationView.tsx index 70f8566e92..6fbc77529e 100644 --- a/app/react/portainer/environments/wizard/EnvironmentsCreationView/EnvironmentsCreationView.tsx +++ b/app/react/portainer/environments/wizard/EnvironmentsCreationView/EnvironmentsCreationView.tsx @@ -14,7 +14,6 @@ import { Widget, WidgetBody, WidgetTitle } from '@@/Widget'; import { PageHeader } from '@@/PageHeader'; import { Button } from '@@/buttons'; import { FormSection } from '@@/form-components/FormSection'; -import { Alert } from '@@/Alert'; import { StickyFooter } from '@@/StickyFooter/StickyFooter'; import { @@ -94,15 +93,6 @@ export function EnvironmentCreationView() { - {currentStep.id === 'kaas' && ( - - Provisioning a KaaS environment from Portainer is deprecated - and will be removed in a future release. You will still be - able to use any Kubernetes clusters provisioned using this - method but will no longer have access to any of the - KaaS-specific management functionality. - - )}