make generate

Azure · Apr 5, 2024 · 7698ea0 · 7698ea0
1 parent 3352d95
commit 7698ea0
Show file tree

Hide file tree

Showing 3 changed files with 89 additions and 119 deletions.
diff --git a/.pipelines/.vsts-vhd-builder-release.yaml b/.pipelines/.vsts-vhd-builder-release.yaml
@@ -760,35 +760,36 @@ stages:
         - template: ./templates/.builder-release-template.yaml
           parameters:
             artifactName: 2004-fips-containerd
-  - stage: build_vhd_2204_fips_containerd
+  - stage: build_vhd_2004_fips_gen2_containerd
     dependsOn: []
-    condition: eq('${{ parameters.build2204fipscontainerd }}', true)
+    condition: eq('${{ parameters.build2004fipsgen2containerd }}', true)
     jobs:
     - job: build
       timeoutInMinutes: 180
       steps:
         - bash: |
             echo '##vso[task.setvariable variable=DRY_RUN]${{parameters.dryrun}}'
             echo '##vso[task.setvariable variable=OS_SKU]Ubuntu'
-            echo '##vso[task.setvariable variable=OS_VERSION]22.04'
+            echo '##vso[task.setvariable variable=OS_VERSION]20.04'
             echo '##vso[task.setvariable variable=IMG_PUBLISHER]Canonical'
-            echo '##vso[task.setvariable variable=IMG_OFFER]0001-com-ubuntu-server-jammy'
-            echo '##vso[task.setvariable variable=IMG_SKU]22_04-lts'
-            echo '##vso[task.setvariable variable=HYPERV_GENERATION]V1'
-            echo '##vso[task.setvariable variable=AZURE_VM_SIZE]Standard_DS2_v2'
+            echo '##vso[task.setvariable variable=IMG_OFFER]0001-com-ubuntu-server-focal'
+            echo '##vso[task.setvariable variable=IMG_SKU]20_04-lts-gen2'
+            echo '##vso[task.setvariable variable=IMG_VERSION]latest'
+            echo '##vso[task.setvariable variable=HYPERV_GENERATION]V2'
+            echo '##vso[task.setvariable variable=AZURE_VM_SIZE]Standard_D16ds_v5'
             echo '##vso[task.setvariable variable=FEATURE_FLAGS]None'
             echo '##vso[task.setvariable variable=CONTAINER_RUNTIME]containerd'
             echo '##vso[task.setvariable variable=ARCHITECTURE]X86_64'
             echo '##vso[task.setvariable variable=ENABLE_FIPS]True'
             echo '##vso[task.setvariable variable=ENABLE_TRUSTED_LAUNCH]False'
-            echo '##vso[task.setvariable variable=SGX_INSTALL]False'
+            echo '##vso[task.setvariable variable=SGX_INSTALL]True'
           displayName: Setup Build Variables
         - template: ./templates/.builder-release-template.yaml
           parameters:
-            artifactName: 2204-fips-containerd
-  - stage: build_vhd_2204_fips_gen2_containerd
+            artifactName: 2004-fips-gen2-containerd
+  - stage: build_vhd_2204_fips_containerd
     dependsOn: []
-    condition: eq('${{ parameters.build2204fipsgen2containerd }}', true)
+    condition: eq('${{ parameters.build2204fipscontainerd }}', true)
     jobs:
     - job: build
       timeoutInMinutes: 180
@@ -799,8 +800,8 @@ stages:
             echo '##vso[task.setvariable variable=OS_VERSION]22.04'
             echo '##vso[task.setvariable variable=IMG_PUBLISHER]Canonical'
             echo '##vso[task.setvariable variable=IMG_OFFER]0001-com-ubuntu-server-jammy'
-            echo '##vso[task.setvariable variable=IMG_SKU]22_04-lts-gen2'
-            echo '##vso[task.setvariable variable=HYPERV_GENERATION]V2'
+            echo '##vso[task.setvariable variable=IMG_SKU]22_04-lts'
+            echo '##vso[task.setvariable variable=HYPERV_GENERATION]V1'
             echo '##vso[task.setvariable variable=AZURE_VM_SIZE]Standard_DS2_v2'
             echo '##vso[task.setvariable variable=FEATURE_FLAGS]None'
             echo '##vso[task.setvariable variable=CONTAINER_RUNTIME]containerd'
@@ -811,34 +812,33 @@ stages:
           displayName: Setup Build Variables
         - template: ./templates/.builder-release-template.yaml
           parameters:
-            artifactName: 2204-fips-gen2-containerd
-  - stage: build_vhd_2004_fips_gen2_containerd
+            artifactName: 2204-fips-containerd
+  - stage: build_vhd_2204_fips_gen2_containerd
     dependsOn: []
-    condition: eq('${{ parameters.build2004fipsgen2containerd }}', true)
+    condition: eq('${{ parameters.build2204fipsgen2containerd }}', true)
     jobs:
     - job: build
       timeoutInMinutes: 180
       steps:
         - bash: |
             echo '##vso[task.setvariable variable=DRY_RUN]${{parameters.dryrun}}'
             echo '##vso[task.setvariable variable=OS_SKU]Ubuntu'
-            echo '##vso[task.setvariable variable=OS_VERSION]20.04'
+            echo '##vso[task.setvariable variable=OS_VERSION]22.04'
             echo '##vso[task.setvariable variable=IMG_PUBLISHER]Canonical'
-            echo '##vso[task.setvariable variable=IMG_OFFER]0001-com-ubuntu-server-focal'
-            echo '##vso[task.setvariable variable=IMG_SKU]20_04-lts-gen2'
-            echo '##vso[task.setvariable variable=IMG_VERSION]latest'
+            echo '##vso[task.setvariable variable=IMG_OFFER]0001-com-ubuntu-server-jammy'
+            echo '##vso[task.setvariable variable=IMG_SKU]22_04-lts-gen2'
             echo '##vso[task.setvariable variable=HYPERV_GENERATION]V2'
-            echo '##vso[task.setvariable variable=AZURE_VM_SIZE]Standard_D16ds_v5'
+            echo '##vso[task.setvariable variable=AZURE_VM_SIZE]Standard_DS2_v2'
             echo '##vso[task.setvariable variable=FEATURE_FLAGS]None'
             echo '##vso[task.setvariable variable=CONTAINER_RUNTIME]containerd'
             echo '##vso[task.setvariable variable=ARCHITECTURE]X86_64'
             echo '##vso[task.setvariable variable=ENABLE_FIPS]True'
             echo '##vso[task.setvariable variable=ENABLE_TRUSTED_LAUNCH]False'
-            echo '##vso[task.setvariable variable=SGX_INSTALL]True'
+            echo '##vso[task.setvariable variable=SGX_INSTALL]False'
           displayName: Setup Build Variables
         - template: ./templates/.builder-release-template.yaml
           parameters:
-            artifactName: 2004-fips-gen2-containerd
+            artifactName: 2204-fips-gen2-containerd
   - stage: build_vhd_2204_arm64_gen2_containerd
     dependsOn: []
     condition: eq('${{ parameters.build2204arm64gen2containerd }}', true)

diff --git a/parts/linux/cloud-init/artifacts/sshd_config_2204_fips b/parts/linux/cloud-init/artifacts/sshd_config_2204_fips
@@ -1,4 +1,4 @@
-# This file is a copy of the default sshd_config file, but relaxes used encryption 
+# This file is a copy of the default sshd_config file, but relaxes used encryption
 # for sshd to work with 5.15.0-1059-azure-fips
 
 # What ports, IPs and protocols we listen for

diff --git a/pkg/templates/templates_generated.go b/pkg/templates/templates_generated.go