Skip to content

Commit

Permalink
Merge branch 'master' into DOC-2178/API_-_GKE_revert_to_preferred_par…
Browse files Browse the repository at this point in the history
…ameter
  • Loading branch information
yinnonbar authored Dec 18, 2024
2 parents 65d1c24 + 6bc3036 commit 68cb604
Show file tree
Hide file tree
Showing 13 changed files with 30 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pr-jira-validation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
echo "ACTOR_LOGIN - $ACTOR_LOGIN"
if [ "$ACTOR_LOGIN" != "jira[bot]" ]; then
echo "Branch was not created by jira[bot]."
exit 1
# exit 1
fi
- name: Validate PR body for Jira ticket link
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ properties:
type: string
description: |
The type of the data disk.
enum: [ Standard_LRS, Premium_LRS, StandardSSD_LRS, UltraSSD_LRS, StandardSSD_ZRS, Premium_ZRS ]
enum: [ Standard_LRS, Premium_LRS, StandardSSD_LRS, UltraSSD_LRS, StandardSSD_ZRS, Premium_ZRS, PremiumV2_LRS]
example: "Standard_LRS"
zone:
type: string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ properties:
type: string
description: |
The type of the disk.
enum: [ Standard_LRS, Premium_LRS, StandardSSD_LRS, UltraSSD_LRS, StandardSSD_ZRS, Premium_ZRS ]
enum: [ Standard_LRS, Premium_LRS, StandardSSD_LRS, UltraSSD_LRS, StandardSSD_ZRS, Premium_ZRS, PremiumV2_LRS ]
example: "Standard_LRS"
managedBy:
type: string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ properties:
type: string
description: |
The type of the data disk.
enum: [ Standard_LRS, Premium_LRS, StandardSSD_LRS, UltraSSD_LRS, StandardSSD_ZRS, Premium_ZRS ]
enum: [ Standard_LRS, Premium_LRS, StandardSSD_LRS, UltraSSD_LRS, StandardSSD_ZRS, Premium_ZRS, PremiumV2_LRS]
example: "Standard_LRS"
caching:
type: string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,15 +136,4 @@ properties:
description: |
Set the desired preference for the Spot market VM selection. (100- Availability, 0- cost)
type: integer
example: 100
vmAdmins:
type: array
description: |
* A list of strings. Defines Azure identities that are considered VM admins.
* If the list is empty, the defined behavior is "NONE".
* If the list is null, the defined behavior is "ALL”. This applies if the object is not defined.
* If an identity **contains** the string, it will be considered permitted to perform the following actions:
* Stop VM: VM admins can move the VM to a "stopped (deallocated)" state using the Azure console. If triggered by someone else, it is considered an interruption.
example: [ "@example1.com","@example2.com","service1" ]
items:
type: string
example: 100
Original file line number Diff line number Diff line change
Expand Up @@ -103,3 +103,9 @@ properties:
minimum: 0
maximum: 371
default: 96
shouldRevertToOd:
type: boolean
default: false
description: |
Indicates whether to change the stateful node's VM lifecycle to on-demand. Can be changed to true only when shouldTerminateVms is 'false'.
example: false
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@ properties:
type: string
description: |
The type of the data disk
enum: [ Standard_LRS, Premium_LRS, StandardSSD_LRS, UltraSSD_LRS, StandardSSD_ZRS, Premium_ZRS ]
enum: [ Standard_LRS, Premium_LRS, StandardSSD_LRS, UltraSSD_LRS, StandardSSD_ZRS, Premium_ZRS, PremiumV2_LRS ]
example: "Standard_LRS"
caching:
type: string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,15 +136,4 @@ properties:
description: |
Set the desired preference for the Spot market VM selection. (100- Availability, 0- cost)
type: integer
example: 100
vmAdmins:
type: array
description: |
* A list of strings. Defines Azure identities that are considered VM admins.
* If the list is empty, the defined behavior is "NONE".
* If the list is null, the defined behavior is "ALL”. This applies if the object is not defined.
* If an identity **contains** the string, it will be considered permitted to perform the following actions:
* Stop VM: VM admins can move the VM to a "stopped (deallocated)" state using the Azure console. If triggered by someone else, it is considered an interruption.
example: [ "@example1.com","@example2.com","service1" ]
items:
type: string
example: 100
9 changes: 9 additions & 0 deletions api/services/ocean/gke/schemas/ocean-autoUpdate.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
type: object
title: auto-update
description: The Ocean Kubernetes AutoUpdate object. If set to 'true', Ocean will ensure that your clusters have an up-to-date configuration according to the respective GKE cluster.
properties:
isEnabled:
type: boolean
description: Enable the Ocean Kubernetes AutoUpdate.
default: true
example: true
2 changes: 2 additions & 0 deletions api/services/ocean/gke/schemas/oceanCluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ properties:
example: us-central1-a
autoScaler:
$ref: "../schemas/ocean-autoScaler.yaml"
autoUpdate:
$ref: "../schemas/ocean-autoUpdate.yaml"
capacity:
$ref: "../schemas/ocean-capacity.yaml"
strategy:
Expand Down
2 changes: 2 additions & 0 deletions api/services/ocean/gke/schemas/oceanClusterCreate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ properties:
example: us-central1-a
autoScaler:
$ref: "../schemas/ocean-autoScaler.yaml"
autoUpdate:
$ref: "../schemas/ocean-autoUpdate.yaml"
capacity:
$ref: "../schemas/ocean-capacity.yaml"
strategy:
Expand Down
2 changes: 2 additions & 0 deletions api/services/ocean/gke/schemas/oceanClusterUpdate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ properties:
Add a name for the Ocean cluster.
autoScaler:
$ref: "../schemas/ocean-autoScaler.yaml"
autoUpdate:
$ref: "../schemas/ocean-autoUpdate.yaml"
capacity:
$ref: "../schemas/ocean-capacity.yaml"
strategy:
Expand Down
2 changes: 2 additions & 0 deletions api/services/ocean/gke/schemas/oceanGkeImportResponse.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ properties:
example: us-central1-a
autoScaler:
$ref: "../schemas/ocean-autoScaler.yaml"
autoUpdate:
$ref: "../schemas/ocean-autoUpdate.yaml"
capacity:
$ref: "../schemas/ocean-capacity.yaml"
compute:
Expand Down

0 comments on commit 68cb604

Please sign in to comment.