Skip to content

Commit

Permalink
add http probe info for nginx ingress
Browse files Browse the repository at this point in the history
  • Loading branch information
michaeljguarino committed Jan 6, 2024
1 parent d2402de commit 6a1be4e
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 25 deletions.
2 changes: 1 addition & 1 deletion charts/runtime/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: runtime
description: Sets up the basic dependencies needed to get a network stack running
type: application
version: 0.1.15
version: 0.1.16
appVersion: "0.1.0"
dependencies:
- name: external-dns
Expand Down
8 changes: 6 additions & 2 deletions charts/runtime/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ cert-manager:
fsGroup: 1000
runAsNonRoot: true

ingress-nginx:
ingress-nginx-private:
enabled: true
controller:
image:
Expand All @@ -70,6 +70,7 @@ ingress-nginx:
controllerValue: "k8s.io/internal-ingress-nginx"
service:
annotations:
service.beta.kubernetes.io/azure-load-balancer-health-probe-request-path: /healthz
networking.gke.io/load-balancer-type: "Internal"
service.beta.kubernetes.io/azure-load-balancer-internal: "true"
service.beta.kubernetes.io/aws-load-balancer-scheme: internal
Expand Down Expand Up @@ -139,14 +140,17 @@ ingress-nginx:
prometheusRule:
enabled: false

ingress-nginx-private:
ingress-nginx:
enabled: true
controller:
image:
digest: null
digestChroot: null
admissionWebhooks:
enabled: false
service:
annotations:
service.beta.kubernetes.io/azure-load-balancer-health-probe-request-path: /healthz
config:
worker-shutdown-timeout: 240s
proxy-body-size: '0'
Expand Down
45 changes: 23 additions & 22 deletions templates/setup/console.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,28 @@
// leave this resource static, if you want to modify console values, do it in the generated helm values directly instead.
resource "null_resource" "console" {
provisioner "local-exec" {
command = "plural cd control-plane-values --name {{ .Cluster }} --dsn \"${module.mgmt.db_url}\" --domain {{ .Subdomain }} --file console.yaml"
working_dir = "${path.module}/../helm-values"
}
}

data "local_sensitive_file" "certmanager" {
filename = "${path.module}/../helm-values/certmanager.yaml"
}

data "local_sensitive_file" "flux" {
filename = "${path.module}/../helm-values/flux.yaml"
}

data "local_sensitive_file" "runtime" {
filename = "${path.module}/../helm-values/runtime.yaml"
}

data "local_sensitive_file" "console" {
filename = "${path.module}/../helm-values/console.yaml"
depends_on = [ null_resource.console ]
}

resource "helm_release" "certmanager" {
name = "cert-manager"
namespace = "cert-manager"
Expand All @@ -18,10 +39,6 @@ resource "helm_release" "certmanager" {
depends_on = [ module.mgmt.cluster ]
}

data "local_sensitive_file" "flux" {
filename = "${path.module}/../helm-values/flux.yaml"
}

resource "helm_release" "flux" {
name = "flux"
namespace = "flux"
Expand All @@ -38,16 +55,12 @@ resource "helm_release" "flux" {
depends_on = [ module.mgmt.cluster ]
}

data "local_sensitive_file" "runtime" {
filename = "${path.module}/../helm-values/runtime.yaml"
}

resource "helm_release" "runtime" {
name = "runtime"
namespace = "plural-runtime"
chart = "runtime"
repository = "https://pluralsh.github.io/bootstrap"
version = "0.1.15"
version = "0.1.16"
create_namespace = true
timeout = 300
wait = false
Expand All @@ -58,26 +71,14 @@ resource "helm_release" "runtime" {
depends_on = [ module.mgmt.cluster, helm_release.certmanager, helm_release.flux ]
}

resource "null_resource" "console" {
provisioner "local-exec" {
command = "plural cd control-plane-values --name {{ .Cluster }} --dsn \"${module.mgmt.db_url}\" --domain {{ .Subdomain }} --file console.yaml"
working_dir = "${path.module}/../helm-values"
}
}

data "local_sensitive_file" "console" {
filename = "${path.module}/../helm-values/console.yaml"
depends_on = [ null_resource.console ]
}

resource "helm_release" "console" {
name = "console"
namespace = "plrl-console"
chart = "console"
repository = "https://pluralsh.github.io/console"
version = "0.1.21"
create_namespace = true
timeout = 300
timeout = 600
wait = true
values = [
data.local_sensitive_file.console.content
Expand Down
1 change: 1 addition & 0 deletions terraform/clouds/azure/aks.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@ module "aks" {
vnet_subnet_id = azurerm_subnet.network.id
node_pools = {for name, pool in var.node_pools : name => merge(pool, {name = name, vnet_subnet_id = azurerm_subnet.network.id})}

ebpf_data_plane = true
role_based_access_control_enabled = true
}

0 comments on commit 6a1be4e

Please sign in to comment.