Skip to content

Commit

Permalink
feat: schema and related logic grooming (#879)
Browse files Browse the repository at this point in the history
* feat: change hasCloudLB description
* feat: remove deprecated property

fixes redkubes/unassigned-issues#442

Co-authored-by: Maurice Faber <maurice.faber@redkubes.com>
  • Loading branch information
j-zimnowoda and Maurice Faber committed Aug 18, 2022
1 parent c2ce8f9 commit 9f04eb3
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 13 deletions.
1 change: 1 addition & 0 deletions .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@
"sysctls",
"testmode",
"textconv",
"unencrypted",
"untrusted",
"xlarge"
]
Expand Down
2 changes: 1 addition & 1 deletion .values/env/settings.yaml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version: 3
version: 4
3 changes: 1 addition & 2 deletions helmfile.d/snippets/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ environments:
values:
- azure:
appgw:
isManaged: true
isManaged: false
apps:
alertmanager:
enabled: false
Expand Down Expand Up @@ -155,7 +155,6 @@ environments:
hasExternalDNS: false
hasExternalIDP: false
isHomeMonitored: false
isManaged: true
isMultitenant: false
teamConfig: {}
letsencryptRootCA: |
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/env/cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ cluster:
k8sVersion: '1.22'
name: demo
owner: redkubes
provider: aws
provider: azure
region: eu-central-1
1 change: 0 additions & 1 deletion tests/fixtures/env/settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ otomi:
hasExternalIDP: true
hasExternalDNS: true
isHomeMonitored: true
isManaged: true
isMultitenant: true
version: main
nodeSelector:
Expand Down
1 change: 0 additions & 1 deletion tests/kind/env/settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ otomi:
hasExternalDNS: false
hasExternalIDP: false
isHomeMonitored: false
isManaged: false
isMultitenant: true
version: main
version: 3
3 changes: 3 additions & 0 deletions values-changes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,6 @@ changes:
relocations:
- apps.ingress-nginx.loadBalancerIP: ingress.platformClass.loadBalancerIP
- apps.ingress-nginx.loadBalancerRG: ingress.platformClass.loadBalancerRG
- version: 4
deletions:
- otomi.isManaged
10 changes: 3 additions & 7 deletions values-schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1193,8 +1193,8 @@ properties:
appgw:
properties:
isManaged:
default: true
description: Was the AKS cluster installed with appgw addon?
default: false
description: Indicates Azure Application Gateway Ingress Controller add-on is installed by AKS.
type: boolean
monitor:
$ref: '#/definitions/azure/definitions/monitor'
Expand Down Expand Up @@ -2579,7 +2579,7 @@ properties:
- password
hasCloudLB:
default: false
description: 'Set this to true when an external LB exists or needs to be started (AWS ALB, Azure AppGW, Google Apigee). This will then be configured through ingress controllers. Expects existing LBs to terminate https. Currently this is only working correctly for Azure, and not for AWS and Google. AWS is close to completion.'
description: "Set this to true when a cloud specific ingress controller is wanted/installed that terminates TLS and forwards traffic unencrypted. Otherwise Otomi's Nginx controller will create a loadbalancer that will take care of this."
type: boolean
hasExternalDNS:
description: Set this to true when an external dns zone is available to manage dns records. (Expects required `dns:` fields to be set.)
Expand All @@ -2593,10 +2593,6 @@ properties:
default: false
description: Whether this cluster is home monitored (like when under a Premium SLA). Sends criticals home.
type: boolean
isManaged:
default: true
description: Whether masters are managed and not under control. Set this to false for provider "custom".
type: boolean
isMultitenant:
default: false
description: Whether to separate team metrics and logs. Disabling this lets everybody be admin and see everything.
Expand Down

0 comments on commit 9f04eb3

Please sign in to comment.