remove Unixcompleters and Linkerd (#380)

* remove completers * update * update
Azure · Feb 21, 2024 · f6c0cc9 · f6c0cc9
1 parent e56ebe9
commit f6c0cc9
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 32 deletions.
diff --git a/linux/base.Dockerfile b/linux/base.Dockerfile
@@ -210,12 +210,6 @@ RUN curl -sSL https://git.io/getLatestIstio | sh - \
   && chmod -R 755 $ISTIO_ROOT
 ENV PATH $PATH:$ISTIO_ROOT/bin
 
-# Install latest version of Linkerd
-RUN export INSTALLROOT=/usr/local/linkerd \
-  && mkdir -p $INSTALLROOT \
-  && curl -sSL https://run.linkerd.io/install | sh - 
-ENV PATH $PATH:/usr/local/linkerd/bin
-
 ENV GOROOT="/usr/lib/golang"
 ENV PATH="$PATH:$GOROOT/bin:/opt/mssql-tools18/bin"
 

diff --git a/linux/powershell/Invoke-PreparePowerShell.ps1 b/linux/powershell/Invoke-PreparePowerShell.ps1
@@ -19,7 +19,6 @@ $moduleList = @(
     "MicrosoftPowerBIMgmt",
     "Az",
     "GuestConfiguration",
-    "Microsoft.PowerShell.UnixCompleters",
     "Microsoft.PowerShell.SecretManagement",
     "Microsoft.PowerShell.SecretStore"
 )

diff --git a/linux/powershell/PSCloudShellStartup.ps1 b/linux/powershell/PSCloudShellStartup.ps1
@@ -374,19 +374,6 @@ finally
 # Set PSDefaultParameterValues for cmdlets
 $PSDefaultParameterValues = @{'Install-Module:Scope' = 'CurrentUser'; 'Install-Script:Scope' = 'CurrentUser'}
 
-#Initialize Microsoft.PowerShell.UnixCompleters module
-
-$startLoadingMicrosoftPowerShellUnixCompleters = [System.DateTime]::Now
-try
-{
-    Microsoft.PowerShell.Core\Import-Module -Name Microsoft.PowerShell.UnixCompleters -ErrorAction SilentlyContinue
-}
-finally
-{
-    Invoke-CloudShellTelemetry -LogLabel "LOADMicrosoftPowerShellUnixCompleters" -StartTime $startLoadingMicrosoftPowerShellUnixCompleters
-}
-#endregion
-
 #region Initialize AzurePSDrive
 
 $startLoadingModules = [System.DateTime]::Now

diff --git a/linux/powershell/PSCloudShellUtility/PSCloudShellUtility.psm1 b/linux/powershell/PSCloudShellUtility/PSCloudShellUtility.psm1
@@ -1807,7 +1807,6 @@ function Get-PackageVersion() {
         @{displayname = "Batch Shipyard"; command = "shipyard"; args = "--version"; match = "shipyard.py, version (.*)"},
         @{displayname = "Ansible"; command = "ansible"; args = "--version"; match = "ansible \[core ([\d\.]+)\]"},
         @{displayname = "Istio"; command = "istioctl"; args = "version -s --remote=false"; match = "(.+)"},
-        @{displayname = "Linkerd"; command = "linkerd"; args = "version --client --short"; match = "(stable-[\d\.]+)"},
         @{displayname = "Go"; command = "go"; args = "version"; match = "go version go(\S+) .*"},
         @{displayname = "Packer"; command = "packer"; args = "version"; match = "Packer v(.+)"},
         @{displayname = "DC/OS CLI"; command = "dcos"; args = "--version"; match = "dcoscli.version=(.*)"},

diff --git a/linux/powershell/setupPowerShell.ps1 b/linux/powershell/setupPowerShell.ps1
@@ -147,7 +147,6 @@ try {
         Write-Output "Installing modules from production gallery"    
         PowerShellGet\Install-Module -Name AzurePSDrive @prodAllUsers   
         PowerShellGet\Install-Module -Name GuestConfiguration -MaximumVersion $script:dockerfileDataObject.GuestConfigurationMaxVersion -ErrorAction SilentlyContinue @prodAllUsers
-        PowerShellGet\Install-Module -Name Microsoft.PowerShell.UnixCompleters @prodAllUsers
         PowerShellGet\Install-Module -Force PSReadLine @prodAllUsers
         PowerShellGet\Install-Module -Name Az.Tools.Predictor @prodAllUsers
         PowerShellGet\Install-Module -Name ExchangeOnlineManagement @prodAllUsers

diff --git a/tests/PSinLinuxCloudShellImage.Tests.ps1 b/tests/PSinLinuxCloudShellImage.Tests.ps1
@@ -58,7 +58,6 @@ Describe "Various programs installed with expected versions" {
             "python3m-config", 
             "x86_64-linux-gnu-python3-config", 
             "x86_64-linux-gnu-python3m-config",
-            "linkerd-stable.*",
             "pwsh-preview"
         )
 
@@ -189,12 +188,6 @@ Describe "PowerShell Modules" {
         # MicrosoftTeams module should have at least one command
         (Get-Command * -Module MicrosoftTeams).Count -ge 1 | Should -Be $true        
     }
-
-    It "Microsoft.PowerShell.UnixCompleters PowerShell Module" {
-        $module = Get-Module -Name Microsoft.PowerShell.UnixCompleters -ListAvailable
-        $module | Should -Not -BeNullOrEmpty
-
-    }
 
     It "Microsoft.PowerShell.SecretManagement PowerShell Module" {
 
@@ -219,7 +212,6 @@ Describe "PowerShell Modules" {
         @{ ModuleName = "MicrosoftPowerBIMgmt" }
         @{ ModuleName = "GuestConfiguration" }
         @{ ModuleName = "MicrosoftTeams" }
-        @{ ModuleName = "Microsoft.PowerShell.UnixCompleters" }
         @{ ModuleName = "Microsoft.PowerShell.SecretManagement" }
         @{ ModuleName = "Microsoft.PowerShell.SecretStore" }
     )

diff --git a/tests/command_list b/tests/command_list
@@ -688,8 +688,6 @@ libssl.so.1.0.0
 libtool
 libtoolize
 link
-linkerd
-linkerd-stable-2.14.1
 linux32
 linux64
 lkbib