Skip to content

Commit 10c94a5

Browse files
jinyunmajinyunma
authored
[azure] add permission when installing cluster in existing vnet (#61374)
1 parent b4c8fe8 commit 10c94a5

File tree

130 files changed

+890
-587
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+890
-587
lines changed

‎ci-operator/config/openshift-priv/installer/openshift-priv-installer-main.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -553,9 +553,9 @@ tests:
553553
post:
554554
- chain: ipi-azure-post
555555
pre:
556-
- ref: azure-provision-service-principal-minimal-permission
557556
- ref: ipi-conf
558557
- ref: ipi-conf-azure-default
558+
- chain: azure-provision-service-principal-minimal-permission
559559
- chain: ipi-install
560560
timeout: 6h0m0s
561561
- as: e2e-azure-ovn
@@ -1159,7 +1159,6 @@ tests:
11591159
cluster_profile: azure4
11601160
env:
11611161
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
1162-
ENABLE_MIN_PERMISSION_FOR_MARKETPLACE: "true"
11631162
FAIL_ON_CORE_DUMP: "false"
11641163
OS_IMAGE_PLAN: NoPurchasePlan
11651164
OS_IMAGE_URN: azureopenshift:aro4:aro_417:417.94.20240701
@@ -1169,10 +1168,10 @@ tests:
11691168
- chain: ipi-deprovision
11701169
- ref: azure-deprovision-sp-and-custom-role
11711170
pre:
1172-
- ref: azure-provision-service-principal-minimal-permission
11731171
- chain: ipi-conf-azure
11741172
- ref: ipi-conf-azure-osimage
11751173
- ref: ovn-conf
1174+
- chain: azure-provision-service-principal-minimal-permission
11761175
- chain: ipi-install
11771176
- ref: ipi-azure-rbac
11781177
timeout: 6h0m0s

‎ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.18.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -559,9 +559,9 @@ tests:
559559
post:
560560
- chain: ipi-azure-post
561561
pre:
562-
- ref: azure-provision-service-principal-minimal-permission
563562
- ref: ipi-conf
564563
- ref: ipi-conf-azure-default
564+
- chain: azure-provision-service-principal-minimal-permission
565565
- chain: ipi-install
566566
timeout: 6h0m0s
567567
- as: e2e-azure-ovn
@@ -1155,7 +1155,6 @@ tests:
11551155
cluster_profile: azure4
11561156
env:
11571157
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
1158-
ENABLE_MIN_PERMISSION_FOR_MARKETPLACE: "true"
11591158
FAIL_ON_CORE_DUMP: "false"
11601159
OS_IMAGE_PLAN: NoPurchasePlan
11611160
OS_IMAGE_URN: azureopenshift:aro4:aro_417:417.94.20240701
@@ -1165,10 +1164,10 @@ tests:
11651164
- chain: ipi-deprovision
11661165
- ref: azure-deprovision-sp-and-custom-role
11671166
pre:
1168-
- ref: azure-provision-service-principal-minimal-permission
11691167
- chain: ipi-conf-azure
11701168
- ref: ipi-conf-azure-osimage
11711169
- ref: ovn-conf
1170+
- chain: azure-provision-service-principal-minimal-permission
11721171
- chain: ipi-install
11731172
- ref: ipi-azure-rbac
11741173
timeout: 6h0m0s

‎ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.19.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -554,9 +554,9 @@ tests:
554554
post:
555555
- chain: ipi-azure-post
556556
pre:
557-
- ref: azure-provision-service-principal-minimal-permission
558557
- ref: ipi-conf
559558
- ref: ipi-conf-azure-default
559+
- chain: azure-provision-service-principal-minimal-permission
560560
- chain: ipi-install
561561
timeout: 6h0m0s
562562
- as: e2e-azure-ovn
@@ -1160,7 +1160,6 @@ tests:
11601160
cluster_profile: azure4
11611161
env:
11621162
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
1163-
ENABLE_MIN_PERMISSION_FOR_MARKETPLACE: "true"
11641163
FAIL_ON_CORE_DUMP: "false"
11651164
OS_IMAGE_PLAN: NoPurchasePlan
11661165
OS_IMAGE_URN: azureopenshift:aro4:aro_417:417.94.20240701
@@ -1170,10 +1169,10 @@ tests:
11701169
- chain: ipi-deprovision
11711170
- ref: azure-deprovision-sp-and-custom-role
11721171
pre:
1173-
- ref: azure-provision-service-principal-minimal-permission
11741172
- chain: ipi-conf-azure
11751173
- ref: ipi-conf-azure-osimage
11761174
- ref: ovn-conf
1175+
- chain: azure-provision-service-principal-minimal-permission
11771176
- chain: ipi-install
11781177
- ref: ipi-azure-rbac
11791178
timeout: 6h0m0s

‎ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.20.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -553,9 +553,9 @@ tests:
553553
post:
554554
- chain: ipi-azure-post
555555
pre:
556-
- ref: azure-provision-service-principal-minimal-permission
557556
- ref: ipi-conf
558557
- ref: ipi-conf-azure-default
558+
- chain: azure-provision-service-principal-minimal-permission
559559
- chain: ipi-install
560560
timeout: 6h0m0s
561561
- as: e2e-azure-ovn
@@ -1159,7 +1159,6 @@ tests:
11591159
cluster_profile: azure4
11601160
env:
11611161
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
1162-
ENABLE_MIN_PERMISSION_FOR_MARKETPLACE: "true"
11631162
FAIL_ON_CORE_DUMP: "false"
11641163
OS_IMAGE_PLAN: NoPurchasePlan
11651164
OS_IMAGE_URN: azureopenshift:aro4:aro_417:417.94.20240701
@@ -1169,10 +1168,10 @@ tests:
11691168
- chain: ipi-deprovision
11701169
- ref: azure-deprovision-sp-and-custom-role
11711170
pre:
1172-
- ref: azure-provision-service-principal-minimal-permission
11731171
- chain: ipi-conf-azure
11741172
- ref: ipi-conf-azure-osimage
11751173
- ref: ovn-conf
1174+
- chain: azure-provision-service-principal-minimal-permission
11761175
- chain: ipi-install
11771176
- ref: ipi-azure-rbac
11781177
timeout: 6h0m0s

‎ci-operator/config/openshift/installer/openshift-installer-main.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -552,9 +552,9 @@ tests:
552552
post:
553553
- chain: ipi-azure-post
554554
pre:
555-
- ref: azure-provision-service-principal-minimal-permission
556555
- ref: ipi-conf
557556
- ref: ipi-conf-azure-default
557+
- chain: azure-provision-service-principal-minimal-permission
558558
- chain: ipi-install
559559
timeout: 6h0m0s
560560
- as: e2e-azure-ovn
@@ -1158,7 +1158,6 @@ tests:
11581158
cluster_profile: azure4
11591159
env:
11601160
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
1161-
ENABLE_MIN_PERMISSION_FOR_MARKETPLACE: "true"
11621161
FAIL_ON_CORE_DUMP: "false"
11631162
OS_IMAGE_PLAN: NoPurchasePlan
11641163
OS_IMAGE_URN: azureopenshift:aro4:aro_417:417.94.20240701
@@ -1168,10 +1167,10 @@ tests:
11681167
- chain: ipi-deprovision
11691168
- ref: azure-deprovision-sp-and-custom-role
11701169
pre:
1171-
- ref: azure-provision-service-principal-minimal-permission
11721170
- chain: ipi-conf-azure
11731171
- ref: ipi-conf-azure-osimage
11741172
- ref: ovn-conf
1173+
- chain: azure-provision-service-principal-minimal-permission
11751174
- chain: ipi-install
11761175
- ref: ipi-azure-rbac
11771176
timeout: 6h0m0s

‎ci-operator/config/openshift/installer/openshift-installer-release-4.18.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -558,9 +558,9 @@ tests:
558558
post:
559559
- chain: ipi-azure-post
560560
pre:
561-
- ref: azure-provision-service-principal-minimal-permission
562561
- ref: ipi-conf
563562
- ref: ipi-conf-azure-default
563+
- chain: azure-provision-service-principal-minimal-permission
564564
- chain: ipi-install
565565
timeout: 6h0m0s
566566
- as: e2e-azure-ovn
@@ -1154,7 +1154,6 @@ tests:
11541154
cluster_profile: azure4
11551155
env:
11561156
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
1157-
ENABLE_MIN_PERMISSION_FOR_MARKETPLACE: "true"
11581157
FAIL_ON_CORE_DUMP: "false"
11591158
OS_IMAGE_PLAN: NoPurchasePlan
11601159
OS_IMAGE_URN: azureopenshift:aro4:aro_417:417.94.20240701
@@ -1164,10 +1163,10 @@ tests:
11641163
- chain: ipi-deprovision
11651164
- ref: azure-deprovision-sp-and-custom-role
11661165
pre:
1167-
- ref: azure-provision-service-principal-minimal-permission
11681166
- chain: ipi-conf-azure
11691167
- ref: ipi-conf-azure-osimage
11701168
- ref: ovn-conf
1169+
- chain: azure-provision-service-principal-minimal-permission
11711170
- chain: ipi-install
11721171
- ref: ipi-azure-rbac
11731172
timeout: 6h0m0s

‎ci-operator/config/openshift/installer/openshift-installer-release-4.19.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -553,9 +553,9 @@ tests:
553553
post:
554554
- chain: ipi-azure-post
555555
pre:
556-
- ref: azure-provision-service-principal-minimal-permission
557556
- ref: ipi-conf
558557
- ref: ipi-conf-azure-default
558+
- chain: azure-provision-service-principal-minimal-permission
559559
- chain: ipi-install
560560
timeout: 6h0m0s
561561
- as: e2e-azure-ovn
@@ -1159,7 +1159,6 @@ tests:
11591159
cluster_profile: azure4
11601160
env:
11611161
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
1162-
ENABLE_MIN_PERMISSION_FOR_MARKETPLACE: "true"
11631162
FAIL_ON_CORE_DUMP: "false"
11641163
OS_IMAGE_PLAN: NoPurchasePlan
11651164
OS_IMAGE_URN: azureopenshift:aro4:aro_417:417.94.20240701
@@ -1169,10 +1168,10 @@ tests:
11691168
- chain: ipi-deprovision
11701169
- ref: azure-deprovision-sp-and-custom-role
11711170
pre:
1172-
- ref: azure-provision-service-principal-minimal-permission
11731171
- chain: ipi-conf-azure
11741172
- ref: ipi-conf-azure-osimage
11751173
- ref: ovn-conf
1174+
- chain: azure-provision-service-principal-minimal-permission
11761175
- chain: ipi-install
11771176
- ref: ipi-azure-rbac
11781177
timeout: 6h0m0s

‎ci-operator/config/openshift/installer/openshift-installer-release-4.20.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ tests:
552552
post:
553553
- chain: ipi-azure-post
554554
pre:
555-
- ref: azure-provision-service-principal-minimal-permission
555+
- chain: azure-provision-service-principal-minimal-permission
556556
- ref: ipi-conf
557557
- ref: ipi-conf-azure-default
558558
- chain: ipi-install
@@ -1158,7 +1158,6 @@ tests:
11581158
cluster_profile: azure4
11591159
env:
11601160
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
1161-
ENABLE_MIN_PERMISSION_FOR_MARKETPLACE: "true"
11621161
FAIL_ON_CORE_DUMP: "false"
11631162
OS_IMAGE_PLAN: NoPurchasePlan
11641163
OS_IMAGE_URN: azureopenshift:aro4:aro_417:417.94.20240701
@@ -1168,7 +1167,7 @@ tests:
11681167
- chain: ipi-deprovision
11691168
- ref: azure-deprovision-sp-and-custom-role
11701169
pre:
1171-
- ref: azure-provision-service-principal-minimal-permission
1170+
- chain: azure-provision-service-principal-minimal-permission
11721171
- chain: ipi-conf-azure
11731172
- ref: ipi-conf-azure-osimage
11741173
- ref: ovn-conf

‎ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.12__amd64-nightly.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1083,7 +1083,7 @@ tests:
10831083
steps:
10841084
cluster_profile: azure-qe
10851085
env:
1086-
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "true"
1086+
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
10871087
BASE_DOMAIN: qe.azure.devcluster.openshift.com
10881088
test:
10891089
- chain: openshift-e2e-test-qe-destructive
@@ -1093,7 +1093,7 @@ tests:
10931093
steps:
10941094
cluster_profile: azure-qe
10951095
env:
1096-
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "true"
1096+
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
10971097
BASE_DOMAIN: qe.azure.devcluster.openshift.com
10981098
test:
10991099
- chain: openshift-e2e-test-qe

‎ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.12__automated-release-stable-4.12-upgrade-from-stable-4.12.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ tests:
7373
allow_skip_on_success: true
7474
cluster_profile: azure-autorelease-qe
7575
env:
76-
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "true"
76+
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
7777
BASE_DOMAIN: qe.azure.devcluster.openshift.com
7878
FIPS_ENABLED: "true"
7979
test:

‎ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.12__automated-release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ tests:
8989
allow_skip_on_success: true
9090
cluster_profile: azure-autorelease-qe
9191
env:
92-
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "true"
92+
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
9393
BASE_DOMAIN: qe.azure.devcluster.openshift.com
9494
CATALOGSOURCE_NAME: auto-release-app-registry
9595
E2E_RUN_TAGS: '@level0'

‎ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.12__multi-nightly-4.12-upgrade-from-stable-4.12.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ tests:
213213
steps:
214214
cluster_profile: azure-qe
215215
env:
216-
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "true"
216+
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
217217
BASE_DOMAIN: qe.azure.devcluster.openshift.com
218218
COMPUTE_NODE_TYPE: Standard_D4ps_v5
219219
OCP_ARCH: arm64

‎ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.13__multi-nightly.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ tests:
578578
steps:
579579
cluster_profile: azure-qe
580580
env:
581-
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "true"
581+
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
582582
BASE_DOMAIN: qe.azure.devcluster.openshift.com
583583
test:
584584
- chain: openshift-e2e-test-qe-destructive
@@ -588,7 +588,7 @@ tests:
588588
steps:
589589
cluster_profile: azure-qe
590590
env:
591-
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "true"
591+
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
592592
BASE_DOMAIN: qe.azure.devcluster.openshift.com
593593
COMPUTE_NODE_TYPE: Standard_D4ps_v5
594594
OCP_ARCH: arm64

‎ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.14__amd64-nightly.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1301,9 +1301,8 @@ tests:
13011301
steps:
13021302
cluster_profile: azure-qe
13031303
env:
1304-
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "true"
1304+
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
13051305
BASE_DOMAIN: qe.azure.devcluster.openshift.com
1306-
ENABLE_MIN_PERMISSION_FOR_MARKETPLACE: "true"
13071306
OS_IMAGE_VERSION: 413.92.2023101700
13081307
test:
13091308
- chain: openshift-e2e-test-qe

‎ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.14__multi-nightly-4.14-upgrade-from-stable-4.14.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ tests:
317317
steps:
318318
cluster_profile: azure-qe
319319
env:
320-
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "true"
320+
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
321321
BASE_DOMAIN: qe.azure.devcluster.openshift.com
322322
COMPUTE_NODE_TYPE: Standard_D4ps_v5
323323
ENABLE_MIN_PERMISSION_FOR_STS: "true"

‎ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.14__multi-nightly.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ tests:
646646
steps:
647647
cluster_profile: azure-qe
648648
env:
649-
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "true"
649+
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
650650
BASE_DOMAIN: qe.azure.devcluster.openshift.com
651651
test:
652652
- chain: openshift-e2e-test-qe-destructive
@@ -656,7 +656,7 @@ tests:
656656
steps:
657657
cluster_profile: azure-qe
658658
env:
659-
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "true"
659+
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
660660
BASE_DOMAIN: qe.azure.devcluster.openshift.com
661661
COMPUTE_NODE_TYPE: Standard_D4ps_v5
662662
OCP_ARCH: arm64
@@ -690,7 +690,7 @@ tests:
690690
steps:
691691
cluster_profile: azure-qe
692692
env:
693-
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "true"
693+
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
694694
BASE_DOMAIN: qe.azure.devcluster.openshift.com
695695
ENABLE_MIN_PERMISSION_FOR_STS: "true"
696696
EXTRACT_MANIFEST_INCLUDED: "true"
@@ -702,7 +702,7 @@ tests:
702702
steps:
703703
cluster_profile: azure-qe
704704
env:
705-
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "true"
705+
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
706706
BASE_DOMAIN: qe.azure.devcluster.openshift.com
707707
COMPUTE_NODE_TYPE: Standard_D4ps_v5
708708
ENABLE_MIN_PERMISSION_FOR_STS: "true"
@@ -909,7 +909,7 @@ tests:
909909
steps:
910910
cluster_profile: azure-qe
911911
env:
912-
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "true"
912+
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
913913
BASE_DOMAIN: qe.azure.devcluster.openshift.com
914914
BOOTSTRAP_NODE_TYPE: Standard_D4ps_v5
915915
COMPUTE_NODE_TYPE: Standard_D4ps_v5
@@ -923,7 +923,7 @@ tests:
923923
steps:
924924
cluster_profile: azure-qe
925925
env:
926-
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "true"
926+
AZURE_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
927927
BASE_DOMAIN: qe.azure.devcluster.openshift.com
928928
test:
929929
- chain: openshift-e2e-test-qe-destructive

0 commit comments

Comments
 (0)