Skip to content

Commit 8ec5092

Browse files
authored
Merge pull request #19 from stackhpc/2024.10.0-sync
2024.10.0 sync
2 parents 1b00264 + 9d5d4ee commit 8ec5092

File tree

10 files changed

+75
-34
lines changed

10 files changed

+75
-34
lines changed

.github-deploy-prod.yml.sample

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# This example workflow can be used to perform manually-triggered Azimuth deployments targeting production environments.
22
# The workflow requires a GitHub environment (https://docs.github.com/en/actions/using-jobs/using-environments-for-jobs) to
3-
# be created in the site-specific config repo with a name which exactly matches the azimuth-config environment to be used
4-
# for production deployments. For security, this GitHub environment should also have a deployment protection rule which
5-
# restricts the environment workflows to only run on the main/default branch. This ensures that production deployments
3+
# be created in the site-specific config repo with a name which exactly matches the azimuth-config environment to be used
4+
# for production deployments. For security, this GitHub environment should also have a deployment protection rule which
5+
# restricts the environment workflows to only run on the main/default branch. This ensures that production deployments
66
# cannot be executed from arbitrary branches which could contain incorrect or unreviewed configuration.
77
#
8-
# A manually-triggered workflow is used here since GitHub does not allow deployment approval rules for environments in
8+
# A manually-triggered workflow is used here since GitHub does not allow deployment approval rules for environments in
99
# private GitHub repos without a GitHub Enterprise subscription. If the site-specific config repo is public, or if an enterprise
10-
# subscription is available, then triggering the workflow on push to main with additional approval rules in the environment is
10+
# subscription is available, then triggering the workflow on push to main with additional approval rules in the environment is
1111
# the recommended approach.
12-
#
12+
#
1313
# The site-specific config repo must also define a repository secret named GIT_CRYPT_KEY_B64 which contains the base64 encoded
1414
# git-crypt key which was used to encrypt the repository's secrets. This can be obtained by running `git-crypt export-key - | base64`
1515
# from within an unlocked checkout of the repository. For information on defining GitHub repo secrets, see:
@@ -18,7 +18,7 @@
1818
name: Azimuth deployment
1919
on:
2020
workflow_dispatch:
21-
inputs:
21+
inputs:
2222
environment:
2323
description: "The Azimuth config environment to deploy"
2424
type: environment
@@ -40,6 +40,8 @@ jobs:
4040

4141
- name: Deploy Azimuth
4242
shell: bash
43+
env:
44+
ANSIBLE_FORCE_COLOR: True
4345
# Here we just decrypt the repo checkout then follow the steps from the Azimuth deployment docs.
4446
# The GitHub repo should have an environment configured with a name which matches the Azimuth config environment.
4547
# This GitHub environment should also have a branch protection rule which only allows deployments on chosen production branch (e.g. main).

.github-deploy-staging.yml.sample

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This example workflow can be adapted to perform automated Azimuth deployments targeting staging or test environments.
22
# The `azimuth-config-env-name` variable in the `env` section below should be set to name of the Azimuth config environment
33
# to be deployed.
4-
#
4+
#
55
# The site-specific config repo must also define a repository secret named GIT_CRYPT_KEY_B64 which contains the base64 encoded
66
# git-crypt key which was used to encrypt the repository's secrets. This can be obtained by running `git-crypt export-key - | base64`
77
# from within an unlocked checkout of the repository. For information on defining GitHub repo secrets, see:
@@ -30,6 +30,8 @@ jobs:
3030

3131
- name: Deploy Azimuth
3232
shell: bash
33+
env:
34+
ANSIBLE_FORCE_COLOR: True
3335
# Here we just decrypt the repo checkout then follow the steps from the Azimuth deployment docs.
3436
run: |
3537
set -e

.github/workflows/test-upgrade.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,30 @@ jobs:
4545
target-cloud: ${{ inputs.target-cloud || vars.TARGET_CLOUD }}
4646
install-mode: ha
4747
environment-prefix: ci-upgrade
48+
# For Kubernetes, generate a single named test that can be referenced after the upgrade
49+
extra-vars: |
50+
upgrade_test_kubernetes_latest_available_version: >-
51+
{{-
52+
generate_tests_installed_kubernetes_templates |
53+
map(attribute = 'spec.values.kubernetesVersion') |
54+
community.general.version_sort(reverse = True) |
55+
first
56+
}}
57+
upgrade_test_kubernetes_latest_template_name: >-
58+
{{-
59+
generate_tests_installed_kubernetes_templates |
60+
selectattr('spec.values.kubernetesVersion', 'eq', upgrade_test_kubernetes_latest_available_version) |
61+
map(attribute = 'metadata.name') |
62+
first
63+
}}
64+
generate_tests_kubernetes_test_cases:
65+
- name: latest
66+
kubernetes_template: "{{ upgrade_test_kubernetes_latest_template_name }}"
67+
control_plane_size: "{{ generate_tests_kubernetes_test_case_control_plane_size }}"
68+
worker_size: "{{ generate_tests_kubernetes_test_case_worker_size }}"
69+
worker_count: "{{ generate_tests_kubernetes_test_case_worker_count }}"
70+
dashboard_enabled: "{{ generate_tests_kubernetes_test_case_dashboard_enabled }}"
71+
monitoring_enabled: "{{ generate_tests_kubernetes_test_case_monitoring_enabled }}"
4872
# GitHub terminates jobs after 6 hours
4973
# We don't want jobs to acquire the lock then get timed out before they can finish
5074
# So wait a maximum of 3 hours to acquire the lock, leaving 3 hours for other tasks in the job

Tiltfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ settings = deep_merge(
6565
"azimuth-schedule-operator": {
6666
"release_namespace": "azimuth",
6767
},
68+
"coral-credits": {
69+
"release_namespace": "coral-credits",
70+
},
6871
"cluster-api-addon-provider": {
6972
"release_namespace": "capi-addon-system",
7073
},

docs/configuration/04-target-cloud.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,12 @@ to discover the networks it should use, and the tags it looks for are `portal-in
110110
`portal-external` for the internal and external networks respectively. These tags must be applied
111111
by the cloud operator.
112112

113+
!!! tip
114+
115+
It is strongly recommended that you set the `portal-external` tag on an appropriate external network,
116+
even if you only have one external network, to avoid issues if new external networks are added to the
117+
cloud at a later date.
118+
113119
If it cannot find a tagged internal network, the default behaviour is for Azimuth to create an
114120
internal network to use (and the corresponding router to attach it to the external network).
115121

docs/repository/opentofu.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,15 +182,15 @@ terraform_s3_skip_credentials_validation: "true"
182182
183183
# Tell OpenTofu to use path-style URLs, e.g. <host>/<bucket>, instead of
184184
# subdomain-style URLs, e.g. <bucket>.<host>
185-
terraform_s3_force_path_style: "true"
185+
terraform_s3_use_path_style: "true"
186186
187187
terraform_backend_config:
188188
endpoint: "{{ terraform_s3_endpoint }}"
189189
region: "{{ terraform_s3_region }}"
190190
bucket: "{{ terraform_s3_bucket }}"
191191
key: "{{ terraform_s3_key }}"
192192
skip_credentials_validation: "{{ terraform_s3_skip_credentials_validation }}"
193-
force_path_style: "{{ terraform_s3_force_path_style }}"
193+
use_path_style: "{{ terraform_s3_use_path_style }}"
194194
skip_region_validation: "{{ terraform_s3_skip_region_validation }}"
195195
```
196196

environments/base/inventory/group_vars/all.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ cloud_metrics_enabled: no
5959
# Indicates whether to enable Velero for backup and restore
6060
velero_enabled: no
6161

62+
# Indicates whether to install coral credits
63+
coral_credits_enabled: no
64+
6265
# Azimuth features to enable
6366
azimuth_apps_enabled: yes
6467
azimuth_kubernetes_enabled: yes

environments/demo/inventory/group_vars/all/variables.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,6 @@ admin_dashboard_ingress_basic_auth_password: admin
6060
harbor_admin_password: admin
6161
harbor_secret_key: abcdefghijklmnop
6262
keycloak_admin_password: admin
63+
coral_credits_admin_password: admin
6364
zenith_registrar_subdomain_token_signing_key: abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789AA
6465
azimuth_secret_key: 9876543210ZYXWVUTSRQPONMLKJIHGFEDCBAzyxwvutsrqponmlkjihgfedcda00

environments/tav1/tls/tls.crt

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
-----BEGIN CERTIFICATE-----
2-
MIIHsjCCBZqgAwIBAgIQeZJJd4JCdlO0DyojmzyoJzANBgkqhkiG9w0BAQwFADBE
2+
MIIHrzCCBZegAwIBAgIQPIXhpUsS3ssUZlV4azue9jANBgkqhkiG9w0BAQwFADBE
33
MQswCQYDVQQGEwJOTDEZMBcGA1UEChMQR0VBTlQgVmVyZW5pZ2luZzEaMBgGA1UE
4-
AxMRR0VBTlQgT1YgUlNBIENBIDQwHhcNMjQwMzEzMDAwMDAwWhcNMjUwMzEzMjM1
4+
AxMRR0VBTlQgT1YgUlNBIENBIDQwHhcNMjQxMjE2MDAwMDAwWhcNMjYwMTE2MjM1
55
OTU5WjCBjTELMAkGA1UEBhMCR0IxEjAQBgNVBAgTCUJlcmtzaGlyZTE/MD0GA1UE
66
ChM2VGhlIEV1cm9wZWFuIENlbnRyZSBmb3IgTWVkaXVtLVJhbmdlIFdlYXRoZXIg
77
Rm9yZWNhc3RzMSkwJwYDVQQDDCAqLmF6aW11dGguY29tcHV0ZS50YXYxLmVjbXdm
@@ -11,7 +11,7 @@ qqmNl5I3JEyrzd+/q5SG+UuHjB73L+LpSF5iN2/1sA9FDKcrGAJi5EHN5kWa4/56
1111
hFui7+HfMLFZBmCcrxgsUkc1XxmHsiQFXuHJyaavDSzNiNd/sP7UHumX6MdJomeZ
1212
n+7qQsZ6f5yqvOTyjB7rCToKB993sRUUTUlYKoko3JQ5lDRwGrZXtSTpxbSnytI2
1313
ymG9yn8AG9Z/tmclUTuDLYR2S8iCj9uGOiUwLg7RrZNc78hRqKnswYkYp2uZ6ldD
14-
5aZnSOUCAwEAAaOCA1QwggNQMB8GA1UdIwQYMBaAFG8dNUkQbDL6WaCevIroH5W+
14+
5aZnSOUCAwEAAaOCA1EwggNNMB8GA1UdIwQYMBaAFG8dNUkQbDL6WaCevIroH5W+
1515
cXoMMB0GA1UdDgQWBBR4FiQAnmLQVPI5NZMJfOGj3R3ebjAOBgNVHQ8BAf8EBAMC
1616
BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
1717
SQYDVR0gBEIwQDA0BgsrBgEEAbIxAQICTzAlMCMGCCsGAQUFBwIBFhdodHRwczov
@@ -21,26 +21,26 @@ BgEFBQcBAQRpMGcwOgYIKwYBBQUHMAKGLmh0dHA6Ly9HRUFOVC5jcnQuc2VjdGln
2121
by5jb20vR0VBTlRPVlJTQUNBNC5jcnQwKQYIKwYBBQUHMAGGHWh0dHA6Ly9HRUFO
2222
VC5vY3NwLnNlY3RpZ28uY29tMEsGA1UdEQREMEKCICouYXppbXV0aC5jb21wdXRl
2323
LnRhdjEuZWNtd2YuaW50gh5hemltdXRoLmNvbXB1dGUudGF2MS5lY213Zi5pbnQw
24-
ggF/BgorBgEEAdZ5AgQCBIIBbwSCAWsBaQB3AM8RVu7VLnyv84db2Wkum+kacWdK
25-
sBfsrAHSW3fOzDsIAAABjjjt+QgAAAQDAEgwRgIhAITSrgeEhSC2ChfY96FNqfze
26-
xDIMoFWBb6ef4+Mm2xwOAiEA9ryut7tJYlcZa0wpilJp9qTkBQ99rPnYnOI8LvDD
27-
ysgAdgCi4wrkRe+9rZt+OO1HZ3dT14JbhJTXK14bLMS5UKRH5wAAAY447fjfAAAE
28-
AwBHMEUCIELllTn86PO5udSUspgpLwIZEnwnJzZDkrxgbP8oHNtZAiEA8f15LcKx
29-
nhj+7b51ChCiGy1mqGt9hMt4Ml3s3ByIP3kAdgBOdaMnXJoQwzhbbNTfP1LrHfDg
30-
jhuNacCx+mSxYpo53wAAAY447fjcAAAEAwBHMEUCIQCuuO31LQ4N7fOnc67S7GlD
31-
NRvWeEoEga052QZIMY/DJAIgfXKPQ26Tp+m/R1xIH6BiDQnM2XpM/lqs+kgsj+DS
32-
BxMwDQYJKoZIhvcNAQEMBQADggIBAAAqRIwda1t/vmpGzLmbyZfPfliwAtPNrYIe
33-
Rs/BI+ElqsgAyzR9JUVMqRSPaFoJm3SlWS0Bl7gdkVmmDRmbKlRs7ViK7zkTZG7l
34-
FnKQauZlwFJCbhErzh8YQzpFR2fwCW+uBHO57O0zFDbrBaOd1kLTY/LCjkExiNlU
35-
fEdeLclHE0rNFCE92yvnMLO80rDOcWoxSXQyfnt8RO9SdmwzRpoNJe+dIEh3DgUo
36-
mbCc8SiRPHA2lB0/q1JJL0/J7/9qFwsUp7ubYQbFG4I8l1sswawlYrMogFvkSrBB
37-
jgpOfvjE8e0tNGYbISAXEr5caDwEMMTgW03FfWGGPZRjaCRw7P+i3lMSUJENdFjP
38-
FQYw84tzAIReHgFDviyLibQRkilrQGP/Wj0sbrOKU2+w+bJvW4TMy6AG05fG2XKD
39-
dUhgZkio1y7IUCrT/U00TCK8VAk1Vv+pbA8F1ukuTVIARm/yqLBVc2fpSX5TbIaX
40-
xJM2i7lc++HoShizCbSSr4F5sMkV9Aja+SSrppM3ksZXym2dXefqAMwaoCLFN2ou
41-
Sm6YZAN+N2xBOtcE1YpX6Rr+/kiiAPgwVsilGIrjQes78751xuCprwDDN0LsKvWN
42-
zCz1mNt1Mku6aHMI/D6CpA2n9sHPp2oXv1GWA4vFlTYFK65Iw8d5F7YpDRbaB6Zx
43-
60LDgq51
24+
ggF8BgorBgEEAdZ5AgQCBIIBbASCAWgBZgB2AJaXZL9VWJet90OHaDcIQnfp8DrV
25+
9qTzNm5GpD8PyqnGAAABk9B/21EAAAQDAEcwRQIgfaloiOJAN1+uWypf+E5k2lyV
26+
RdGdXfhRFkBpzMRCMpwCIQDuGQxFa51XH93UO3pK+VtoqgZdwnA8rey997IwuWWf
27+
pgB1ABmG1Mcoqm/+ugNveCpNAZGqzi1yMQ+uzl1wQS0lTMfUAAABk9B/2uIAAAQD
28+
AEYwRAIgXTTXBnOeEtAVexug1EiGjsJY1DMa2FRoxtfm/vUYOfwCIFM3y5PHl65W
29+
MuUEzwh/Wa+O69dTzehHfWOzIm+SrQa3AHUAyzj3FYl8hKFEX1vB3fvJbvKaWc1H
30+
CmkFhbDLFMMUWOcAAAGT0H/bJgAABAMARjBEAiAqV/ynoLTRJ1fbJK+BiV+yrd3L
31+
8LJ9kXycxvd5jMx/egIgJyTDr5h+5IQ3qZYpGfPbMavEVYx0hhgM+igc4muvCP8w
32+
DQYJKoZIhvcNAQEMBQADggIBAFCLLiB0/3+m4Ztons2p5knAwiC15lZWA8yzy0J5
33+
zyWmfq54KKBy5WSbIsewNrs7ZC06bPaH9EgEq32yAg6qE5bxDzdlFu4G+ydAJmMI
34+
CJcU+I8wuwkr6yU+XHMnTkrMrjvw4Wv/7EC9YhT7k6zMVcuci8Tju9Z/bASfyhcR
35+
6RJ4fAccvRc+tDpYEfP6BEFPEqfQ3Nvf9gzODz75B+ksZea3RxkrWHNzDMwjppQ+
36+
zPUr5zvhDklLOWexQmV4xw0k316D6+gwPZh+fwc0UIsq+u5eUEsXNyPwyAfXORkz
37+
y2pThdDmV5bkIODfabauwu0rJ/eT0oc9vTh0EYwc2DhpabFhP/BgIxt0qUnb2/T5
38+
grjVQjrKCH5POSf2NcPSyTqeRzamnztA7ePU0accV/76u+TVNP3FeC4eNNQT7OUU
39+
QkLaNdpXpVKOE+ZlxHb2ngn/ugQXUkGuNFFK5Ft7pUVpj/bZTJGKPGPBtX5N5aNv
40+
iSPVcTfZ2ZePaa/3X9X+9q0QVhJ2gTlsVixJTp66cjQDc9gaQ5Cz4a2s9dJkNDcU
41+
dGz6jN8os+BxFKbrr6MnaL0FViPm8STkPPQV/DILJT2ryiRm6MeEnKjF/1SSnX60
42+
T2s1GzoFu1bOq0xC2BjRc0iOf+GUTcTV/zHHP1pBvTY2TuY0iVri9l3koob8J8JZ
43+
D5Uj
4444
-----END CERTIFICATE-----
4545
-----BEGIN CERTIFICATE-----
4646
MIIG5TCCBM2gAwIBAgIRANpDvROb0li7TdYcrMTz2+AwDQYJKoZIhvcNAQEMBQAw

requirements.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
collections:
44
- name: https://github.com/azimuth-cloud/ansible-collection-azimuth-ops.git
55
type: git
6-
version: 0.11.3
6+
version: 0.12.0
77
# For local development
88
# - type: dir
99
# source: ../ansible-collection-azimuth-ops

0 commit comments

Comments
 (0)