Update to use metapkg and distro-specific repo. (#91)

Promote go versions to 1.19. Increase initial CSI startup timeout. Remove old check.
kubernetes-sigs · Feb 1, 2023 · e04a9ef · e04a9ef
1 parent d8a424a
commit e04a9ef
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 21 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -40,7 +40,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v2
       with:
-        go-version: ^1.18
+        go-version: ^1.19
       id: go
 
     - name: Checkout repository

diff --git a/.github/workflows/darwin.yaml b/.github/workflows/darwin.yaml
@@ -18,7 +18,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v2
         with:
-          go-version: ^1.17
+          go-version: ^1.19
         id: go
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2

diff --git a/.github/workflows/external_e2e.yaml b/.github/workflows/external_e2e.yaml
@@ -13,7 +13,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v2
         with:
-          go-version: ^1.17
+          go-version: ^1.19
         id: go
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2

diff --git a/.github/workflows/integration_test_aks.yaml b/.github/workflows/integration_test_aks.yaml
@@ -18,7 +18,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v2
         with:
-          go-version: ^1.17
+          go-version: ^1.19
         id: go
       - name: Check out code
         uses: actions/checkout@v2

diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml
@@ -18,7 +18,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v2
       with:
-        go-version: ^1.17
+        go-version: ^1.19
       id: go
 
     - name: Check out code into the Go module directory

diff --git a/.github/workflows/sanity_test_local.yaml b/.github/workflows/sanity_test_local.yaml
@@ -18,7 +18,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v2
       with:
-        go-version: ^1.17
+        go-version: ^1.19
       id: go
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2

diff --git a/deploy/csi-azurelustre-controller.yaml b/deploy/csi-azurelustre-controller.yaml
@@ -82,7 +82,7 @@ spec:
             httpGet:
               path: /healthz
               port: healthz
-            initialDelaySeconds: 30
+            initialDelaySeconds: 60
             timeoutSeconds: 10
             periodSeconds: 30
           env:

diff --git a/deploy/csi-azurelustre-node.yaml b/deploy/csi-azurelustre-node.yaml
@@ -103,7 +103,7 @@ spec:
             httpGet:
               path: /healthz
               port: healthz
-            initialDelaySeconds: 30
+            initialDelaySeconds: 60
             timeoutSeconds: 10
             periodSeconds: 30
           env:

diff --git a/pkg/azurelustreplugin/entrypoint.sh b/pkg/azurelustreplugin/entrypoint.sh
@@ -30,6 +30,12 @@ echo "installClientPackages: ${installClientPackages}"
 requiredLustreVersion=${LUSTRE_VERSION:-"2.15.1"}
 echo "requiredLustreVersion: ${requiredLustreVersion}"
 
+pkgVersion="${requiredLustreVersion}-24-gbaa21ca"
+echo "pkgVersion: ${pkgVersion}"
+
+pkgName="amlfs-lustre-client-${pkgVersion}"
+echo "pkgName: ${pkgName}"
+
 if [[ ! -z $(grep -R 'bionic' /etc/host-os-release) ]]; then
   osReleaseCodeName="bionic"
 elif [[ ! -z $(grep -R 'jammy' /etc/host-os-release) ]]; then
@@ -45,7 +51,7 @@ deb http://azure.archive.ubuntu.com/ubuntu/ jammy-security main restricted
 deb http://azure.archive.ubuntu.com/ubuntu/ jammy-security universe
 deb http://azure.archive.ubuntu.com/ubuntu/ jammy-security multiverse
 EOF
-  
+
   osReleaseCodeName="jammy"
 else
   echo "Unsupported Linux distro"
@@ -56,27 +62,19 @@ echo "$(date -u) Command line arguments: $@"
 
 if [[ "${installClientPackages}" == "yes" ]]; then
   kernelVersion=$(uname -r)
-  
+
   echo "$(date -u) Installing Lustre client packages for OS=${osReleaseCodeName}, kernel=${kernelVersion} "
 
   curl -sL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/microsoft.gpg > /dev/null
-  echo "deb [arch=amd64] https://packages.microsoft.com/repos/amlfs/ ${osReleaseCodeName} main" | tee /etc/apt/sources.list.d/amlfs.list
+  echo "deb [arch=amd64] https://packages.microsoft.com/repos/amlfs-${osReleaseCodeName}/ ${osReleaseCodeName} main" | tee /etc/apt/sources.list.d/amlfs.list
   apt-get update
 
-  # Install Lustre client module
-  lustreClientModulePackageVersion=$(apt list -a lustre-client-modules-${kernelVersion} | awk '{print $2}' | grep ^${requiredLustreVersion} | sort -u -V | tail -n 1  || true)
-
-  if [[ -z $lustreClientModulePackageVersion ]]; then
-    echo "can't find package lustre-client-modules-${kernelVersion} for Lustre version $requiredLustreVersion in Microsoft Linux Repo, exiting"
-    exit 1
-  fi
-
-  echo "$(date -u) Installing Lustre client modules: lustre-client-modules-${kernelVersion}=$lustreClientModulePackageVersion"
+  echo "$(date -u) Installing Lustre client modules: ${pkgName}=${kernelVersion}"
 
   # grub issue
   # https://stackoverflow.com/questions/40748363/virtual-machine-apt-get-grub-issue/40751712
   DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends -o DPkg::options::="--force-confdef" -o DPkg::options::="--force-confold" \
-    lustre-client-modules-${kernelVersion}=$lustreClientModulePackageVersion
+    ${pkgName}=${kernelVersion}
 
   echo "$(date -u) Installed Lustre client packages."