mirror of https://github.com/portainer/portainer
feat(gpu): remove GPU lightbubble EE-5254 (#10096)
parent
c0ba221021
commit
2953848b9a
|
@ -13,7 +13,6 @@ import { withUIRouter } from '@/react-tools/withUIRouter';
|
||||||
import { DockerfileDetails } from '@/react/docker/images/ItemView/DockerfileDetails';
|
import { DockerfileDetails } from '@/react/docker/images/ItemView/DockerfileDetails';
|
||||||
import { HealthStatus } from '@/react/docker/containers/ItemView/HealthStatus';
|
import { HealthStatus } from '@/react/docker/containers/ItemView/HealthStatus';
|
||||||
import { GpusList } from '@/react/docker/host/SetupView/GpusList';
|
import { GpusList } from '@/react/docker/host/SetupView/GpusList';
|
||||||
import { GpusInsights } from '@/react/docker/host/SetupView/GpusInsights';
|
|
||||||
import { InsightsBox } from '@/react/components/InsightsBox';
|
import { InsightsBox } from '@/react/components/InsightsBox';
|
||||||
import { BetaAlert } from '@/react/portainer/environments/update-schedules/common/BetaAlert';
|
import { BetaAlert } from '@/react/portainer/environments/update-schedules/common/BetaAlert';
|
||||||
import { ImagesDatatable } from '@/react/docker/images/ListView/ImagesDatatable/ImagesDatatable';
|
import { ImagesDatatable } from '@/react/docker/images/ListView/ImagesDatatable/ImagesDatatable';
|
||||||
|
@ -71,7 +70,6 @@ const ngModule = angular
|
||||||
])
|
])
|
||||||
)
|
)
|
||||||
.component('betaAlert', r2a(BetaAlert, ['className', 'message', 'isHtml']))
|
.component('betaAlert', r2a(BetaAlert, ['className', 'message', 'isHtml']))
|
||||||
.component('gpusInsights', r2a(GpusInsights, []))
|
|
||||||
.component(
|
.component(
|
||||||
'dockerImagesDatatable',
|
'dockerImagesDatatable',
|
||||||
r2a(withUIRouter(withCurrentUser(ImagesDatatable)), [
|
r2a(withUIRouter(withCurrentUser(ImagesDatatable)), [
|
||||||
|
|
|
@ -211,11 +211,6 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- !open-amt info -->
|
<!-- !open-amt info -->
|
||||||
<!-- gpus info -->
|
|
||||||
<div class="mb-4" ng-if="isDockerStandaloneEnv">
|
|
||||||
<gpus-insights></gpus-insights>
|
|
||||||
</div>
|
|
||||||
<!-- gpus info -->
|
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<div class="col-sm-12">
|
<div class="col-sm-12">
|
||||||
<button
|
<button
|
||||||
|
|
|
@ -1,29 +0,0 @@
|
||||||
import { InsightsBox } from '@@/InsightsBox';
|
|
||||||
|
|
||||||
export function GpusInsights() {
|
|
||||||
return (
|
|
||||||
<InsightsBox
|
|
||||||
content={
|
|
||||||
<>
|
|
||||||
<p>
|
|
||||||
From 2.18 on, the set-up of available GPUs for a Docker Standalone
|
|
||||||
environment has been shifted from Add environment and Environment
|
|
||||||
details to Host -> Setup, so as to align with other settings.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
A toggle has been introduced for enabling/disabling management of
|
|
||||||
GPU settings in the Portainer UI - to alleviate the performance
|
|
||||||
impact of showing those settings.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
The UI has been updated to clarify that GPU settings support is only
|
|
||||||
for Docker Standalone (and not Docker Swarm, which was never
|
|
||||||
supported in the UI).
|
|
||||||
</p>
|
|
||||||
</>
|
|
||||||
}
|
|
||||||
header="GPU settings update"
|
|
||||||
insightCloseId="gpu-settings-update-closed"
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
}
|
|
|
@ -13,7 +13,6 @@ import { TLSFieldset } from '@/react/components/TLSFieldset/TLSFieldset';
|
||||||
import { LoadingButton } from '@@/buttons/LoadingButton';
|
import { LoadingButton } from '@@/buttons/LoadingButton';
|
||||||
import { FormControl } from '@@/form-components/FormControl';
|
import { FormControl } from '@@/form-components/FormControl';
|
||||||
import { Input } from '@@/form-components/Input';
|
import { Input } from '@@/form-components/Input';
|
||||||
import { InsightsBox } from '@@/InsightsBox';
|
|
||||||
|
|
||||||
import { NameField } from '../../shared/NameField';
|
import { NameField } from '../../shared/NameField';
|
||||||
import { MoreSettingsSection } from '../../shared/MoreSettingsSection';
|
import { MoreSettingsSection } from '../../shared/MoreSettingsSection';
|
||||||
|
@ -23,10 +22,9 @@ import { FormValues } from './types';
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
onCreate(environment: Environment): void;
|
onCreate(environment: Environment): void;
|
||||||
isDockerStandalone?: boolean;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export function APIForm({ onCreate, isDockerStandalone }: Props) {
|
export function APIForm({ onCreate }: Props) {
|
||||||
const [formKey, clearForm] = useReducer((state) => state + 1, 0);
|
const [formKey, clearForm] = useReducer((state) => state + 1, 0);
|
||||||
const initialValues: FormValues = {
|
const initialValues: FormValues = {
|
||||||
url: '',
|
url: '',
|
||||||
|
@ -83,35 +81,7 @@ export function APIForm({ onCreate, isDockerStandalone }: Props) {
|
||||||
errors={errors.tlsConfig}
|
errors={errors.tlsConfig}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<MoreSettingsSection>
|
<MoreSettingsSection />
|
||||||
{isDockerStandalone && (
|
|
||||||
<InsightsBox
|
|
||||||
content={
|
|
||||||
<>
|
|
||||||
<p>
|
|
||||||
From 2.18 on, the set-up of available GPUs for a Docker
|
|
||||||
Standalone environment has been shifted from Add
|
|
||||||
environment and Environment details to Host -> Setup,
|
|
||||||
so as to align with other settings.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
A toggle has been introduced for enabling/disabling
|
|
||||||
management of GPU settings in the Portainer UI - to
|
|
||||||
alleviate the performance impact of showing those
|
|
||||||
settings.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
The UI has been updated to clarify that GPU settings
|
|
||||||
support is only for Docker Standalone (and not Docker
|
|
||||||
Swarm, which was never supported in the UI).
|
|
||||||
</p>
|
|
||||||
</>
|
|
||||||
}
|
|
||||||
header="GPU settings update"
|
|
||||||
insightCloseId="gpu-settings-update-closed"
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</MoreSettingsSection>
|
|
||||||
|
|
||||||
<div className="form-group">
|
<div className="form-group">
|
||||||
<div className="col-sm-12">
|
<div className="col-sm-12">
|
||||||
|
|
|
@ -4,13 +4,12 @@ import { APIForm } from './APIForm';
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
onCreate(environment: Environment): void;
|
onCreate(environment: Environment): void;
|
||||||
isDockerStandalone?: boolean;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export function APITab({ onCreate, isDockerStandalone }: Props) {
|
export function APITab({ onCreate }: Props) {
|
||||||
return (
|
return (
|
||||||
<div className="mt-5">
|
<div className="mt-5">
|
||||||
<APIForm onCreate={onCreate} isDockerStandalone={isDockerStandalone} />
|
<APIForm onCreate={onCreate} />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,7 +10,6 @@ import { LoadingButton } from '@@/buttons/LoadingButton';
|
||||||
import { FormControl } from '@@/form-components/FormControl';
|
import { FormControl } from '@@/form-components/FormControl';
|
||||||
import { Input } from '@@/form-components/Input';
|
import { Input } from '@@/form-components/Input';
|
||||||
import { SwitchField } from '@@/form-components/SwitchField';
|
import { SwitchField } from '@@/form-components/SwitchField';
|
||||||
import { InsightsBox } from '@@/InsightsBox';
|
|
||||||
|
|
||||||
import { NameField } from '../../shared/NameField';
|
import { NameField } from '../../shared/NameField';
|
||||||
import { MoreSettingsSection } from '../../shared/MoreSettingsSection';
|
import { MoreSettingsSection } from '../../shared/MoreSettingsSection';
|
||||||
|
@ -20,10 +19,9 @@ import { FormValues } from './types';
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
onCreate(environment: Environment): void;
|
onCreate(environment: Environment): void;
|
||||||
isDockerStandalone?: boolean;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export function SocketForm({ onCreate, isDockerStandalone }: Props) {
|
export function SocketForm({ onCreate }: Props) {
|
||||||
const [formKey, clearForm] = useReducer((state) => state + 1, 0);
|
const [formKey, clearForm] = useReducer((state) => state + 1, 0);
|
||||||
const initialValues: FormValues = {
|
const initialValues: FormValues = {
|
||||||
name: '',
|
name: '',
|
||||||
|
@ -49,35 +47,7 @@ export function SocketForm({ onCreate, isDockerStandalone }: Props) {
|
||||||
|
|
||||||
<OverrideSocketFieldset />
|
<OverrideSocketFieldset />
|
||||||
|
|
||||||
<MoreSettingsSection>
|
<MoreSettingsSection />
|
||||||
{isDockerStandalone && (
|
|
||||||
<InsightsBox
|
|
||||||
content={
|
|
||||||
<>
|
|
||||||
<p>
|
|
||||||
From 2.18 on, the set-up of available GPUs for a Docker
|
|
||||||
Standalone environment has been shifted from Add
|
|
||||||
environment and Environment details to Host -> Setup,
|
|
||||||
so as to align with other settings.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
A toggle has been introduced for enabling/disabling
|
|
||||||
management of GPU settings in the Portainer UI - to
|
|
||||||
alleviate the performance impact of showing those
|
|
||||||
settings.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
The UI has been updated to clarify that GPU settings
|
|
||||||
support is only for Docker Standalone (and not Docker
|
|
||||||
Swarm, which was never supported in the UI).
|
|
||||||
</p>
|
|
||||||
</>
|
|
||||||
}
|
|
||||||
header="GPU settings update"
|
|
||||||
insightCloseId="gpu-settings-update-closed"
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</MoreSettingsSection>
|
|
||||||
|
|
||||||
<div className="form-group">
|
<div className="form-group">
|
||||||
<div className="col-sm-12">
|
<div className="col-sm-12">
|
||||||
|
|
|
@ -6,19 +6,15 @@ import { SocketForm } from './SocketForm';
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
onCreate(environment: Environment): void;
|
onCreate(environment: Environment): void;
|
||||||
isDockerStandalone?: boolean;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export function SocketTab({ onCreate, isDockerStandalone }: Props) {
|
export function SocketTab({ onCreate }: Props) {
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<DeploymentScripts />
|
<DeploymentScripts />
|
||||||
|
|
||||||
<div className="mt-5">
|
<div className="mt-5">
|
||||||
<SocketForm
|
<SocketForm onCreate={onCreate} />
|
||||||
onCreate={onCreate}
|
|
||||||
isDockerStandalone={isDockerStandalone}
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|
|
@ -101,14 +101,12 @@ export function WizardDocker({ onCreate, isDockerStandalone }: Props) {
|
||||||
return (
|
return (
|
||||||
<APITab
|
<APITab
|
||||||
onCreate={(environment) => onCreate(environment, 'dockerApi')}
|
onCreate={(environment) => onCreate(environment, 'dockerApi')}
|
||||||
isDockerStandalone={isDockerStandalone}
|
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
case 'socket':
|
case 'socket':
|
||||||
return (
|
return (
|
||||||
<SocketTab
|
<SocketTab
|
||||||
onCreate={(environment) => onCreate(environment, 'localEndpoint')}
|
onCreate={(environment) => onCreate(environment, 'localEndpoint')}
|
||||||
isDockerStandalone={isDockerStandalone}
|
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
case 'edgeAgentStandard':
|
case 'edgeAgentStandard':
|
||||||
|
|
Loading…
Reference in New Issue