Skip to content
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN apt-get update && apt-get upgrade -y \
&& update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 1

FROM baseline AS tool_builder
ARG kubectl_version=1.31.7
ARG kubectl_version=1.32.6

WORKDIR /build

Expand Down
4 changes: 2 additions & 2 deletions docs/CONFIG-VARS.md
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ Notes:
| CERT_MANAGER_NAMESPACE | cert-manager Helm installation namespace | string | cert-manager | false | | baseline |
| CERT_MANAGER_CHART_URL | cert-manager Helm chart URL | string | https://charts.jetstack.io/ | false | | baseline |
| CERT_MANAGER_CHART_NAME| cert-manager Helm chart name | string | cert-manager| false | | baseline |
| CERT_MANAGER_CHART_VERSION | cert-manager Helm chart version | string | 1.16.2 | false | | baseline |
| CERT_MANAGER_CHART_VERSION | cert-manager Helm chart version | string | 1.18.2 | false | | baseline |
| CERT_MANAGER_CONFIG | cert-manager Helm values | string | See [this file](../roles/baseline/defaults/main.yml) for more information. | false | | baseline |

Notes:
Expand Down Expand Up @@ -414,7 +414,7 @@ By default, two block storage StorageClasses are created using the driver, one f
| INGRESS_NGINX_NAMESPACE | NGINX Ingress Helm installation namespace | string | ingress-nginx | false | | baseline |
| INGRESS_NGINX_CHART_URL | NGINX Ingress Helm chart URL | string | See [this document](https://kubernetes.github.io/ingress-nginx) for more information. | false | | baseline |
| INGRESS_NGINX_CHART_NAME | NGINX Ingress Helm chart name | string | ingress-nginx | false | | baseline |
| INGRESS_NGINX_CHART_VERSION | NGINX Ingress Helm chart version | string | "" | false | If left as "" (empty string), version `4.12.1` is used for Kubernetes clusters whose version is >= 1.28.X, for Kubernetes clusters whose version is <= 1.27.X you must set this variable to avoid errors. See [Supported Versions table](https://github.com/kubernetes/ingress-nginx/?tab=readme-ov-file#supported-versions-table) for the supported versions list. | baseline |
| INGRESS_NGINX_CHART_VERSION | NGINX Ingress Helm chart version | string | "" | false | If left as "" (empty string), version `4.13.0` is used for Kubernetes clusters whose version is >= 1.29.X, for Kubernetes clusters whose version is <= 1.28.X you must set this variable to avoid errors. See [Supported Versions table](https://github.com/kubernetes/ingress-nginx/?tab=readme-ov-file#supported-versions-table) for the supported versions list. | baseline |
| INGRESS_NGINX_CONFIG | NGINX Ingress Helm values | string | See [this file](../roles/baseline/defaults/main.yml) for more information. Altering this value will affect the cluster. | false | | baseline |

### Metrics Server
Expand Down
2 changes: 1 addition & 1 deletion docs/user/Dependencies.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ As described in the [Docker Installation](./DockerUsage.md) section add addition
```bash
# Override kubectl version
docker build \
--build-arg kubectl_version=1.31.7 \
--build-arg kubectl_version=1.32.6 \
-t viya4-deployment .
```

Expand Down
15 changes: 10 additions & 5 deletions roles/baseline/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ CERT_MANAGER_NAME: cert-manager
CERT_MANAGER_NAMESPACE: cert-manager
CERT_MANAGER_CHART_NAME: cert-manager
CERT_MANAGER_CHART_URL: https://charts.jetstack.io/
CERT_MANAGER_CHART_VERSION: 1.16.2
CERT_MANAGER_CHART_VERSION: 1.18.2
CERT_MANAGER_CONFIG:
crds:
enabled: true
Expand All @@ -35,9 +35,9 @@ METRICS_SERVER_CONFIG:
## Ingress-nginx - Defaults
ingressVersions:
k8sMinorVersion:
value: 28
value: 29
api:
chartVersion: 4.12.1
chartVersion: 4.13.0
chartVersionMin: 4.0.17

## Ingress-nginx - Ingress
Expand Down Expand Up @@ -68,7 +68,12 @@ INGRESS_NGINX_CONFIG:
lifecycle:
preStop:
exec:
command: [/bin/sh, -c, sleep 5; /usr/local/nginx/sbin/nginx -c /etc/nginx/nginx.conf -s quit; while pgrep -x nginx; do sleep 1; done]
command:
[
/bin/sh,
-c,
sleep 5; /usr/local/nginx/sbin/nginx -c /etc/nginx/nginx.conf -s quit; while pgrep -x nginx; do sleep 1; done,
]
terminationGracePeriodSeconds: 600

# Add annotation to include Azure load-balancer health probe request path
Expand Down Expand Up @@ -204,7 +209,7 @@ CLUSTER_AUTOSCALER_NAME: cluster-autoscaler
CLUSTER_AUTOSCALER_NAMESPACE: kube-system
CLUSTER_AUTOSCALER_CHART_NAME: cluster-autoscaler
CLUSTER_AUTOSCALER_CHART_URL: https://kubernetes.github.io/autoscaler
CLUSTER_AUTOSCALER_CHART_VERSION: 9.46.6
CLUSTER_AUTOSCALER_CHART_VERSION: 9.48.0
CLUSTER_AUTOSCALER_ACCOUNT: null
CLUSTER_AUTOSCALER_LOCATION: us-east-1
CLUSTER_AUTOSCALER_CONFIG:
Expand Down
7 changes: 4 additions & 3 deletions roles/multi-tenancy/tasks/multi-tenant-setup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,10 @@
- name: Create tenant password list
set_fact:
# Build a list of tenant-specific provider password variable names
tenant_password_list: "{{ tenant_password_list | default([]) + ['V4MT_PROVIDER_PASSWORD_'] | product([item]) | map('join') }}"
with_items: '{{ V4MT_TENANT_IDS | split(",") | replace(" ", "") | upper }}'
when: not V4MT_PROVIDER_PASSWORD
tenant_password_list: >-
{{ (tenant_password_list | default([])) + (['V4MT_PROVIDER_PASSWORD_'] | product([item | default('')]) | map('join') | list) }}
with_items: "{{ V4MT_TENANT_IDS | default('') | replace(' ', '') | upper | split(',') }}"
when: V4MT_PROVIDER_PASSWORD is not defined
tags:
- onboard

Expand Down
5 changes: 3 additions & 2 deletions roles/orchestration-common/tasks/orchestration_tooling.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,9 @@
register: orchestration_path
- name: Orchestration tooling - Prepend path with tooling directory
set_fact:
path_list: "{{ path_list | default([]) + [''.join((ORCHESTRATION_TOOLING_DIRECTORY, item))] }}"
loop: "{{ orchestration_path.stdout.split(':') | list }}"
path_list: >-
{{ (path_list | default([])) + [ (ORCHESTRATION_TOOLING_DIRECTORY | default('') ~ (item | default(''))) ] }}
loop: "{{ orchestration_path.stdout | default('') | split(':') }}"
- name: Orchestration tooling - Set orchestration tooling path
set_fact:
ORCHESTRATION_TOOLING_PATH: "{{ path_list | join(':') }}"
Expand Down