Update k8s client (#504)

Azure · Feb 21, 2024 · 5537b6c · 5537b6c
1 parent ea387a3
commit 5537b6c
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 61 deletions.
diff --git a/src/common/common.csproj b/src/common/common.csproj
@@ -51,9 +51,7 @@
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Autofac" Version="8.0.0" />
-    <PackageReference Include="KubernetesClient" Version="11.0.9" />
-    <PackageReference Include="KubernetesClient.Basic" Version="11.0.9" />
-    <PackageReference Include="KubernetesClient.Models" Version="11.0.9" />
+    <PackageReference Include="KubernetesClient" Version="13.0.11" />
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.22.0" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="8.0.1" />

diff --git a/src/library/Client/ManagementClients/RoutingManagementClient.cs b/src/library/Client/ManagementClients/RoutingManagementClient.cs
@@ -420,9 +420,9 @@ private V1RoleBinding PrepareV1RoleBinding()
                     NamespaceProperty = _namespaceName,
                     Labels = new Dictionary<string, string>() { { Routing.RoutingComponentLabel, Routing.RoutingManagerNameLower } }
                 },
-                Subjects = new List<V1Subject>()
+                Subjects = new List<Rbacv1Subject>()
                 {
-                    new V1Subject()
+                    new()
                     {
                         Kind = "ServiceAccount",
                         Name = RoutingManagerServiceAccountName,

diff --git a/src/routingmanager/routingmanager.csproj b/src/routingmanager/routingmanager.csproj
@@ -1,56 +1,56 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <TieredCompilation>true</TieredCompilation>
-    <AssemblyName>Microsoft.BridgeToKubernetes.RoutingManager</AssemblyName>
-    <RootNamespace>Microsoft.BridgeToKubernetes.RoutingManager</RootNamespace>
-    <RuntimeIdentifiers>win-x64;win-arm64;osx-x64;osx-arm64;linux-x64;linux-arm64</RuntimeIdentifiers>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>portable</DebugType>
-    <SignAssembly>true</SignAssembly>
-    <DelaySign>true</DelaySign>
-    <AssemblyOriginatorKeyFile>..\..\build\FinalPublicKey.snk</AssemblyOriginatorKeyFile>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <TrimUnusedDependencies>true</TrimUnusedDependencies>
-    <AssemblyVersion>1.0</AssemblyVersion>
-    <ServerGarbageCollection>false</ServerGarbageCollection>
-    <HighEntropyVA>True</HighEntropyVA>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <NoWarn>8002</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\common\common.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
-    <PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="1.0.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="YamlDotNet" Version="13.1.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
-  <Import Project="$(MSBuildThisFileDirectory)\..\..\build\AssemblyVersion.proj" />
-</Project>
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <TieredCompilation>true</TieredCompilation>
+    <AssemblyName>Microsoft.BridgeToKubernetes.RoutingManager</AssemblyName>
+    <RootNamespace>Microsoft.BridgeToKubernetes.RoutingManager</RootNamespace>
+    <RuntimeIdentifiers>win-x64;win-arm64;osx-x64;osx-arm64;linux-x64;linux-arm64</RuntimeIdentifiers>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>portable</DebugType>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+    <AssemblyOriginatorKeyFile>..\..\build\FinalPublicKey.snk</AssemblyOriginatorKeyFile>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <TrimUnusedDependencies>true</TrimUnusedDependencies>
+    <AssemblyVersion>1.0</AssemblyVersion>
+    <ServerGarbageCollection>false</ServerGarbageCollection>
+    <HighEntropyVA>True</HighEntropyVA>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <NoWarn>8002</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\common\common.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="1.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="YamlDotNet" Version="15.1.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\build\AssemblyVersion.proj" />
+</Project>