Skip to content

Commit 7d9a7ee

Browse files
m-bullm-bull
committed
Fix registry mirrors config
1 parent 1425ea3 commit 7d9a7ee

File tree

3 files changed

+35
-35
lines changed

3 files changed

+35
-35
lines changed

‎charts/openstack-cluster/templates/_helpers.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ files:
273273
{{- range $registry, $registrySpec := . }}
274274
- path: /etc/containerd/certs.d/{{ $registry }}/hosts.toml
275275
content: |
276-
{{- include "openstack-cluster.registryFile" (list $registry $registrySpec) | nindent 6 }}
276+
{{- include "openstack-cluster.registryFile" (list $registry $registrySpec) | indent 6 }}
277277
owner: root:root
278278
permissions: "0644"
279279
{{- end }}

‎charts/openstack-cluster/tests/__snapshot__/snapshot_base_test.yaml.snap‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -820,7 +820,7 @@ templated manifests should match snapshot:
820820
owner: root:root
821821
path: /etc/containerd/certs.d/.keepdir
822822
permissions: "0644"
823-
- content: |2
823+
- content: |
824824
server = "https://registry-1.docker.io"
825825
[host."https://quay.io/v2/azimuth/docker.io"]
826826
capabilities = ["pull", "resolve"]
@@ -829,7 +829,7 @@ templated manifests should match snapshot:
829829
owner: root:root
830830
path: /etc/containerd/certs.d/docker.io/hosts.toml
831831
permissions: "0644"
832-
- content: |2
832+
- content: |
833833
server = "https://ghcr.io"
834834
[host."https://quay.io/v2/azimuth/ghcr.io"]
835835
capabilities = ["pull", "resolve"]
@@ -838,7 +838,7 @@ templated manifests should match snapshot:
838838
owner: root:root
839839
path: /etc/containerd/certs.d/ghcr.io/hosts.toml
840840
permissions: "0644"
841-
- content: |2
841+
- content: |
842842
server = "https://nvcr.io"
843843
[host."https://quay.io/v2/azimuth/nvcr.io"]
844844
capabilities = ["pull", "resolve"]
@@ -847,7 +847,7 @@ templated manifests should match snapshot:
847847
owner: root:root
848848
path: /etc/containerd/certs.d/nvcr.io/hosts.toml
849849
permissions: "0644"
850-
- content: |2
850+
- content: |
851851
server = "https://quay.io"
852852
[host."https://quay.io/v2/azimuth/quay.io"]
853853
capabilities = ["pull", "resolve"]
@@ -856,7 +856,7 @@ templated manifests should match snapshot:
856856
owner: root:root
857857
path: /etc/containerd/certs.d/quay.io/hosts.toml
858858
permissions: "0644"
859-
- content: |2
859+
- content: |
860860
server = "https://registry.k8s.io"
861861
[host."https://quay.io/v2/azimuth/registry.k8s.io"]
862862
capabilities = ["pull", "resolve"]
@@ -995,7 +995,7 @@ templated manifests should match snapshot:
995995
kind: KubeadmConfigTemplate
996996
metadata:
997997
annotations:
998-
capi.stackhpc.com/template-checksum: 8316175f7413504139fb05d9adda0a8eea8c0effca39bca15060cdf7a804a2d1
998+
capi.stackhpc.com/template-checksum: c8e20309a264ffa642f909594d0726d6155cef467f05e575d96e2d4b40f5618b
999999
helm.sh/resource-policy: keep
10001000
labels:
10011001
capi.stackhpc.com/cluster: RELEASE-NAME
@@ -1004,7 +1004,7 @@ templated manifests should match snapshot:
10041004
capi.stackhpc.com/managed-by: Helm
10051005
capi.stackhpc.com/node-group: group-1
10061006
helm.sh/chart: openstack-cluster-0.1.0
1007-
name: RELEASE-NAME-group-1-8316175f
1007+
name: RELEASE-NAME-group-1-c8e20309
10081008
spec:
10091009
template:
10101010
spec:
@@ -1019,7 +1019,7 @@ templated manifests should match snapshot:
10191019
owner: root:root
10201020
path: /etc/containerd/certs.d/.keepdir
10211021
permissions: "0644"
1022-
- content: |2
1022+
- content: |
10231023
server = "https://registry-1.docker.io"
10241024
[host."https://quay.io/v2/azimuth/docker.io"]
10251025
capabilities = ["pull", "resolve"]
@@ -1028,7 +1028,7 @@ templated manifests should match snapshot:
10281028
owner: root:root
10291029
path: /etc/containerd/certs.d/docker.io/hosts.toml
10301030
permissions: "0644"
1031-
- content: |2
1031+
- content: |
10321032
server = "https://ghcr.io"
10331033
[host."https://quay.io/v2/azimuth/ghcr.io"]
10341034
capabilities = ["pull", "resolve"]
@@ -1037,7 +1037,7 @@ templated manifests should match snapshot:
10371037
owner: root:root
10381038
path: /etc/containerd/certs.d/ghcr.io/hosts.toml
10391039
permissions: "0644"
1040-
- content: |2
1040+
- content: |
10411041
server = "https://nvcr.io"
10421042
[host."https://quay.io/v2/azimuth/nvcr.io"]
10431043
capabilities = ["pull", "resolve"]
@@ -1046,7 +1046,7 @@ templated manifests should match snapshot:
10461046
owner: root:root
10471047
path: /etc/containerd/certs.d/nvcr.io/hosts.toml
10481048
permissions: "0644"
1049-
- content: |2
1049+
- content: |
10501050
server = "https://quay.io"
10511051
[host."https://quay.io/v2/azimuth/quay.io"]
10521052
capabilities = ["pull", "resolve"]
@@ -1055,7 +1055,7 @@ templated manifests should match snapshot:
10551055
owner: root:root
10561056
path: /etc/containerd/certs.d/quay.io/hosts.toml
10571057
permissions: "0644"
1058-
- content: |2
1058+
- content: |
10591059
server = "https://registry.k8s.io"
10601060
[host."https://quay.io/v2/azimuth/registry.k8s.io"]
10611061
capabilities = ["pull", "resolve"]
@@ -1123,7 +1123,7 @@ templated manifests should match snapshot:
11231123
configRef:
11241124
apiGroup: bootstrap.cluster.x-k8s.io
11251125
kind: KubeadmConfigTemplate
1126-
name: RELEASE-NAME-group-1-8316175f
1126+
name: RELEASE-NAME-group-1-c8e20309
11271127
clusterName: RELEASE-NAME
11281128
deletion:
11291129
nodeDeletionTimeoutSeconds: 300

‎charts/openstack-cluster/tests/__snapshot__/snapshot_full_test.yaml.snap‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2147,7 +2147,7 @@ templated manifests should match snapshot:
21472147
owner: root:root
21482148
path: /etc/containerd/certs.d/.keepdir
21492149
permissions: "0644"
2150-
- content: |2
2150+
- content: |
21512151
server = "https://registry-1.docker.io"
21522152
[host."https://quay.io/v2/azimuth/docker.io"]
21532153
capabilities = ["pull", "resolve"]
@@ -2156,7 +2156,7 @@ templated manifests should match snapshot:
21562156
owner: root:root
21572157
path: /etc/containerd/certs.d/docker.io/hosts.toml
21582158
permissions: "0644"
2159-
- content: |2
2159+
- content: |
21602160
server = "https://ghcr.io"
21612161
[host."https://quay.io/v2/azimuth/ghcr.io"]
21622162
capabilities = ["pull", "resolve"]
@@ -2165,7 +2165,7 @@ templated manifests should match snapshot:
21652165
owner: root:root
21662166
path: /etc/containerd/certs.d/ghcr.io/hosts.toml
21672167
permissions: "0644"
2168-
- content: |2
2168+
- content: |
21692169
server = "https://nvcr.io"
21702170
[host."https://quay.io/v2/azimuth/nvcr.io"]
21712171
capabilities = ["pull", "resolve"]
@@ -2174,7 +2174,7 @@ templated manifests should match snapshot:
21742174
owner: root:root
21752175
path: /etc/containerd/certs.d/nvcr.io/hosts.toml
21762176
permissions: "0644"
2177-
- content: |2
2177+
- content: |
21782178
server = "https://quay.io"
21792179
[host."https://quay.io/v2/azimuth/quay.io"]
21802180
capabilities = ["pull", "resolve"]
@@ -2183,7 +2183,7 @@ templated manifests should match snapshot:
21832183
owner: root:root
21842184
path: /etc/containerd/certs.d/quay.io/hosts.toml
21852185
permissions: "0644"
2186-
- content: |2
2186+
- content: |
21872187
server = "https://registry.k8s.io"
21882188
[host."https://quay.io/v2/azimuth/registry.k8s.io"]
21892189
capabilities = ["pull", "resolve"]
@@ -2322,7 +2322,7 @@ templated manifests should match snapshot:
23222322
kind: KubeadmConfigTemplate
23232323
metadata:
23242324
annotations:
2325-
capi.stackhpc.com/template-checksum: 8316175f7413504139fb05d9adda0a8eea8c0effca39bca15060cdf7a804a2d1
2325+
capi.stackhpc.com/template-checksum: c8e20309a264ffa642f909594d0726d6155cef467f05e575d96e2d4b40f5618b
23262326
helm.sh/resource-policy: keep
23272327
labels:
23282328
capi.stackhpc.com/cluster: RELEASE-NAME
@@ -2331,7 +2331,7 @@ templated manifests should match snapshot:
23312331
capi.stackhpc.com/managed-by: Helm
23322332
capi.stackhpc.com/node-group: group-1
23332333
helm.sh/chart: openstack-cluster-0.1.0
2334-
name: RELEASE-NAME-group-1-8316175f
2334+
name: RELEASE-NAME-group-1-c8e20309
23352335
spec:
23362336
template:
23372337
spec:
@@ -2346,7 +2346,7 @@ templated manifests should match snapshot:
23462346
owner: root:root
23472347
path: /etc/containerd/certs.d/.keepdir
23482348
permissions: "0644"
2349-
- content: |2
2349+
- content: |
23502350
server = "https://registry-1.docker.io"
23512351
[host."https://quay.io/v2/azimuth/docker.io"]
23522352
capabilities = ["pull", "resolve"]
@@ -2355,7 +2355,7 @@ templated manifests should match snapshot:
23552355
owner: root:root
23562356
path: /etc/containerd/certs.d/docker.io/hosts.toml
23572357
permissions: "0644"
2358-
- content: |2
2358+
- content: |
23592359
server = "https://ghcr.io"
23602360
[host."https://quay.io/v2/azimuth/ghcr.io"]
23612361
capabilities = ["pull", "resolve"]
@@ -2364,7 +2364,7 @@ templated manifests should match snapshot:
23642364
owner: root:root
23652365
path: /etc/containerd/certs.d/ghcr.io/hosts.toml
23662366
permissions: "0644"
2367-
- content: |2
2367+
- content: |
23682368
server = "https://nvcr.io"
23692369
[host."https://quay.io/v2/azimuth/nvcr.io"]
23702370
capabilities = ["pull", "resolve"]
@@ -2373,7 +2373,7 @@ templated manifests should match snapshot:
23732373
owner: root:root
23742374
path: /etc/containerd/certs.d/nvcr.io/hosts.toml
23752375
permissions: "0644"
2376-
- content: |2
2376+
- content: |
23772377
server = "https://quay.io"
23782378
[host."https://quay.io/v2/azimuth/quay.io"]
23792379
capabilities = ["pull", "resolve"]
@@ -2382,7 +2382,7 @@ templated manifests should match snapshot:
23822382
owner: root:root
23832383
path: /etc/containerd/certs.d/quay.io/hosts.toml
23842384
permissions: "0644"
2385-
- content: |2
2385+
- content: |
23862386
server = "https://registry.k8s.io"
23872387
[host."https://quay.io/v2/azimuth/registry.k8s.io"]
23882388
capabilities = ["pull", "resolve"]
@@ -2414,7 +2414,7 @@ templated manifests should match snapshot:
24142414
kind: KubeadmConfigTemplate
24152415
metadata:
24162416
annotations:
2417-
capi.stackhpc.com/template-checksum: 012dfd0f8dd9f0b5cfabddc20428b0d499a8c03ca33e4a631d28cf620f03959d
2417+
capi.stackhpc.com/template-checksum: fa4874fbaed7594d52e7cdb46ecef14911802f995057be2c68d31dbbbf3e8ced
24182418
helm.sh/resource-policy: keep
24192419
labels:
24202420
capi.stackhpc.com/cluster: RELEASE-NAME
@@ -2423,7 +2423,7 @@ templated manifests should match snapshot:
24232423
capi.stackhpc.com/managed-by: Helm
24242424
capi.stackhpc.com/node-group: group-2
24252425
helm.sh/chart: openstack-cluster-0.1.0
2426-
name: RELEASE-NAME-group-2-012dfd0f
2426+
name: RELEASE-NAME-group-2-fa4874fb
24272427
spec:
24282428
template:
24292429
spec:
@@ -2438,7 +2438,7 @@ templated manifests should match snapshot:
24382438
owner: root:root
24392439
path: /etc/containerd/certs.d/.keepdir
24402440
permissions: "0644"
2441-
- content: |2
2441+
- content: |
24422442
server = "https://registry-1.docker.io"
24432443
[host."https://quay.io/v2/azimuth/docker.io"]
24442444
capabilities = ["pull", "resolve"]
@@ -2447,7 +2447,7 @@ templated manifests should match snapshot:
24472447
owner: root:root
24482448
path: /etc/containerd/certs.d/docker.io/hosts.toml
24492449
permissions: "0644"
2450-
- content: |2
2450+
- content: |
24512451
server = "https://ghcr.io"
24522452
[host."https://quay.io/v2/azimuth/ghcr.io"]
24532453
capabilities = ["pull", "resolve"]
@@ -2456,7 +2456,7 @@ templated manifests should match snapshot:
24562456
owner: root:root
24572457
path: /etc/containerd/certs.d/ghcr.io/hosts.toml
24582458
permissions: "0644"
2459-
- content: |2
2459+
- content: |
24602460
server = "https://nvcr.io"
24612461
[host."https://quay.io/v2/azimuth/nvcr.io"]
24622462
capabilities = ["pull", "resolve"]
@@ -2465,7 +2465,7 @@ templated manifests should match snapshot:
24652465
owner: root:root
24662466
path: /etc/containerd/certs.d/nvcr.io/hosts.toml
24672467
permissions: "0644"
2468-
- content: |2
2468+
- content: |
24692469
server = "https://quay.io"
24702470
[host."https://quay.io/v2/azimuth/quay.io"]
24712471
capabilities = ["pull", "resolve"]
@@ -2474,7 +2474,7 @@ templated manifests should match snapshot:
24742474
owner: root:root
24752475
path: /etc/containerd/certs.d/quay.io/hosts.toml
24762476
permissions: "0644"
2477-
- content: |2
2477+
- content: |
24782478
server = "https://registry.k8s.io"
24792479
[host."https://quay.io/v2/azimuth/registry.k8s.io"]
24802480
capabilities = ["pull", "resolve"]
@@ -2542,7 +2542,7 @@ templated manifests should match snapshot:
25422542
configRef:
25432543
apiGroup: bootstrap.cluster.x-k8s.io
25442544
kind: KubeadmConfigTemplate
2545-
name: RELEASE-NAME-group-1-8316175f
2545+
name: RELEASE-NAME-group-1-c8e20309
25462546
clusterName: RELEASE-NAME
25472547
deletion:
25482548
nodeDeletionTimeoutSeconds: 300
@@ -2595,7 +2595,7 @@ templated manifests should match snapshot:
25952595
configRef:
25962596
apiGroup: bootstrap.cluster.x-k8s.io
25972597
kind: KubeadmConfigTemplate
2598-
name: RELEASE-NAME-group-2-012dfd0f
2598+
name: RELEASE-NAME-group-2-fa4874fb
25992599
clusterName: RELEASE-NAME
26002600
deletion:
26012601
nodeDeletionTimeoutSeconds: 300

0 commit comments

Comments
 (0)