1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-05 13:55:21 +02:00

revert(azure): revert removal (#3890)

* Revert "fix(sidebar): show docker sidebar when needed (#3852)"

This reverts commit 59da17dde4.

* Revert "refactor(azure): remove Azure ACI endpoint support (#3803)"

This reverts commit 493de20540.
This commit is contained in:
Chaim Lev-Ari 2020-06-09 05:43:32 +03:00 committed by GitHub
parent 25ca036070
commit b58c2facfe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
65 changed files with 1793 additions and 50 deletions

View file

@ -254,7 +254,7 @@ paths:
- name: "EndpointType"
in: "formData"
type: "integer"
description: "Environment type. Value must be one of: 1 (Docker environment), 2 (Agent environment) or 4 (Edge agent environment)"
description: "Environment type. Value must be one of: 1 (Docker environment), 2 (Agent environment), 3 (Azure environment) or 4 (Edge agent environment)"
required: true
- name: "URL"
in: "formData"
@ -294,6 +294,18 @@ paths:
in: "formData"
type: "file"
description: "TLS client key file"
- name: "AzureApplicationID"
in: "formData"
type: "string"
description: "Azure application ID. Required if endpoint type is set to 3"
- name: "AzureTenantID"
in: "formData"
type: "string"
description: "Azure tenant ID. Required if endpoint type is set to 3"
- name: "AzureAuthenticationKey"
in: "formData"
type: "string"
description: "Azure authentication key. Required if endpoint type is set to 3"
responses:
200:
description: "Success"
@ -3209,6 +3221,21 @@ definitions:
type: "string"
example: "/data/tls/key.pem"
description: "Path to the TLS client key file"
AzureCredentials:
type: "object"
properties:
ApplicationID:
type: "string"
example: "eag7cdo9-o09l-9i83-9dO9-f0b23oe78db4"
description: "Azure application ID"
TenantID:
type: "string"
example: "34ddc78d-4fel-2358-8cc1-df84c8o839f5"
description: "Azure tenant ID"
AuthenticationKey:
type: "string"
example: "cOrXoK/1D35w8YQ8nH1/8ZGwzz45JIYD5jxHKXEQknk="
description: "Azure authentication key"
LDAPSearchSettings:
type: "object"
properties:
@ -3480,7 +3507,7 @@ definitions:
Type:
type: "integer"
example: 1
description: "Endpoint environment type. 1 for a Docker environment or 2 for an agent on Docker environment"
description: "Endpoint environment type. 1 for a Docker environment, 2 for an agent on Docker environment or 3 for an Azure environment."
URL:
type: "string"
example: "docker.mydomain.tld:2375"
@ -3509,6 +3536,8 @@ definitions:
description: "Team identifier"
TLSConfig:
$ref: "#/definitions/TLSConfiguration"
AzureCredentials:
$ref: "#/definitions/AzureCredentials"
EndpointSubset:
type: "object"
properties:
@ -3523,7 +3552,7 @@ definitions:
Type:
type: "integer"
example: 1
description: "Endpoint environment type. 1 for a Docker environment or 2 for an agent on Docker environment"
description: "Endpoint environment type. 1 for a Docker environment, 2 for an agent on Docker environment, 3 for an Azure environment."
URL:
type: "string"
example: "docker.mydomain.tld:2375"
@ -3703,6 +3732,18 @@ definitions:
type: "boolean"
example: false
description: "Skip client verification when using TLS"
ApplicationID:
type: "string"
example: "eag7cdo9-o09l-9i83-9dO9-f0b23oe78db4"
description: "Azure application ID"
TenantID:
type: "string"
example: "34ddc78d-4fel-2358-8cc1-df84c8o839f5"
description: "Azure tenant ID"
AuthenticationKey:
type: "string"
example: "cOrXoK/1D35w8YQ8nH1/8ZGwzz45JIYD5jxHKXEQknk="
description: "Azure authentication key"
UserAccessPolicies:
$ref: "#/definitions/UserAccessPolicies"
TeamAccessPolicies: