Skip to content

publish updates from main #22448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 17, 2025
Merged

publish updates from main #22448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a996f87
Fixed typo in kubectl path (#22447)
IanLee1521 Apr 17, 2025
060688a
admin: clarification for company owner seats (#22440)
sarahsanders-docker Apr 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions content/manuals/admin/company/owners.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,14 @@ A company can have multiple owners. Company owners have company-wide
observability and can manage company-wide settings that apply to all associated
organizations. In addition, company owners have the same access as organization
owners for all associated organizations. Unlike organization owners, company
owners don't need to be member of an organization. When company owners aren't a
member in an organization, they don't occupy a seat.
owners don't need to be member of an organization.

> [!NOTE]
>
> Company owners do not occupy a seat unless one of the following is true:
>
> - They are added as a member of an organization under your company
> - SSO is enabled

## Add a company owner

Expand Down
24 changes: 16 additions & 8 deletions content/manuals/admin/faqs/company-faqs.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,22 @@ You can add a maximum of 10 company owners to a single company account.

### Do company owners occupy a subscription seat?

Company owners don't occupy a seat in any organization unless they are added as a
member of the organization. Since company owners have the same access as
organization owners for all organizations associated with the company, it is not
necessary to add company owners to an organization.

Note that when you first create a company, your account will be both a company
owner and an organization owner. Your account will occupy a seat as long as
you're an organization owner.
Company owners do not occupy a seat unless one of the following is true:

- They are added as a member of an organization under your company
- SSO is enabled

Although company owners have the same access as organization owners across all
organizations in the company, it's not necessary to add them to any
organization. Doing so will cause them to occupy a seat.

When you first create a company, your account is both a company owner and an
organization owner. In that case, your account will occupy a seat as long as
you remain an organization owner.

To avoid occupying a seat, [assign another user as the organization owner](/manuals/admin/organization/members.md#update-a-member-role) and remove yourself from the organization.
You'll retain full administrative access as a company owner without using a
subscription seat.

### What permissions does the company owner have in the associated/nested organizations?

Expand Down
2 changes: 1 addition & 1 deletion content/manuals/desktop/features/kubernetes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Turning the Kubernetes server on or off in Docker Desktop does not affect your o
4. Choose your [cluster provisioning method](#cluster-provisioning-method).
5. Select **Apply & Restart** to save the settings.

This sets up the images required to run the Kubernetes server as containers, and installs the `kubectl` command-line tool on your system at `/usr/local/bin/kubectl` (Mac) or `C:\Program Files\Docker\Docker\Resources\bin\kubectl.exe` (Windows).
This sets up the images required to run the Kubernetes server as containers, and installs the `kubectl` command-line tool on your system at `/usr/local/bin/kubectl` (Mac) or `C:\Program Files\Docker\Docker\resources\bin\kubectl.exe` (Windows).

> [!NOTE]
>
Expand Down