github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

feat(gpu): remove GPU lightbubble EE-5254 (#10096)

pull/10182/head
Dakota Walsh 2023-08-25 15:32:08 +12:00 committed by GitHub
parent c0ba221021
commit 2953848b9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 8 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/docker/react/components/index.ts
View File

@ -13,7 +13,6 @@ import { withUIRouter } from '@/react-tools/withUIRouter';
import { DockerfileDetails } from '@/react/docker/images/ItemView/DockerfileDetails';
import { HealthStatus } from '@/react/docker/containers/ItemView/HealthStatus';
import { GpusList } from '@/react/docker/host/SetupView/GpusList';
import { GpusInsights } from '@/react/docker/host/SetupView/GpusInsights';
import { InsightsBox } from '@/react/components/InsightsBox';
import { BetaAlert } from '@/react/portainer/environments/update-schedules/common/BetaAlert';
import { ImagesDatatable } from '@/react/docker/images/ListView/ImagesDatatable/ImagesDatatable';
@ -71,7 +70,6 @@ const ngModule = angular
])
)
.component('betaAlert', r2a(BetaAlert, ['className', 'message', 'isHtml']))
.component('gpusInsights', r2a(GpusInsights, []))
.component(
'dockerImagesDatatable',
r2a(withUIRouter(withCurrentUser(ImagesDatatable)), [

5
app/portainer/views/endpoints/edit/endpoint.html
View File

@ -211,11 +211,6 @@
</div>
</div>
<!-- !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="col-sm-12">
<button

29
app/react/docker/host/SetupView/GpusInsights.tsx
View File

@ -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 -&gt; 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"
/>
);
}

34
app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/APITab/APIForm.tsx
View File

@ -13,7 +13,6 @@ import { TLSFieldset } from '@/react/components/TLSFieldset/TLSFieldset';
import { LoadingButton } from '@@/buttons/LoadingButton';
import { FormControl } from '@@/form-components/FormControl';
import { Input } from '@@/form-components/Input';
import { InsightsBox } from '@@/InsightsBox';
import { NameField } from '../../shared/NameField';
import { MoreSettingsSection } from '../../shared/MoreSettingsSection';
@ -23,10 +22,9 @@ import { FormValues } from './types';
interface Props {
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 initialValues: FormValues = {
url: '',
@ -83,35 +81,7 @@ export function APIForm({ onCreate, isDockerStandalone }: Props) {
errors={errors.tlsConfig}
/>
<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 -&gt; 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>
<MoreSettingsSection />
<div className="form-group">
<div className="col-sm-12">

5
app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/APITab/APITab.tsx
View File

@ -4,13 +4,12 @@ import { APIForm } from './APIForm';
interface Props {
onCreate(environment: Environment): void;
isDockerStandalone?: boolean;
}
export function APITab({ onCreate, isDockerStandalone }: Props) {
export function APITab({ onCreate }: Props) {
return (
<div className="mt-5">
<APIForm onCreate={onCreate} isDockerStandalone={isDockerStandalone} />
<APIForm onCreate={onCreate} />
</div>
);
}

34
app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/SocketTab/SocketForm.tsx
View File

@ -10,7 +10,6 @@ import { LoadingButton } from '@@/buttons/LoadingButton';
import { FormControl } from '@@/form-components/FormControl';
import { Input } from '@@/form-components/Input';
import { SwitchField } from '@@/form-components/SwitchField';
import { InsightsBox } from '@@/InsightsBox';
import { NameField } from '../../shared/NameField';
import { MoreSettingsSection } from '../../shared/MoreSettingsSection';
@ -20,10 +19,9 @@ import { FormValues } from './types';
interface Props {
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 initialValues: FormValues = {
name: '',
@ -49,35 +47,7 @@ export function SocketForm({ onCreate, isDockerStandalone }: Props) {
<OverrideSocketFieldset />
<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 -&gt; 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>
<MoreSettingsSection />
<div className="form-group">
<div className="col-sm-12">

8
app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/SocketTab/SocketTab.tsx
View File

@ -6,19 +6,15 @@ import { SocketForm } from './SocketForm';
interface Props {
onCreate(environment: Environment): void;
isDockerStandalone?: boolean;
}
export function SocketTab({ onCreate, isDockerStandalone }: Props) {
export function SocketTab({ onCreate }: Props) {
return (
<>
<DeploymentScripts />
<div className="mt-5">
<SocketForm
onCreate={onCreate}
isDockerStandalone={isDockerStandalone}
/>
<SocketForm onCreate={onCreate} />
</div>
</>
);

2
app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/WizardDocker.tsx
View File

@ -101,14 +101,12 @@ export function WizardDocker({ onCreate, isDockerStandalone }: Props) {
return (
<APITab
onCreate={(environment) => onCreate(environment, 'dockerApi')}
isDockerStandalone={isDockerStandalone}
/>
);
case 'socket':
return (
<SocketTab
onCreate={(environment) => onCreate(environment, 'localEndpoint')}
isDockerStandalone={isDockerStandalone}
/>
);
case 'edgeAgentStandard':