Skip to content

Commit

Permalink
microsoft#1640 Simplify packaging for Kubernetes
Browse files Browse the repository at this point in the history
  • Loading branch information
dpbevin committed Apr 9, 2022
1 parent cf6233e commit 46a3745
Show file tree
Hide file tree
Showing 188 changed files with 86 additions and 107,831 deletions.
119 changes: 0 additions & 119 deletions reverse-proxy.sln
Original file line number Diff line number Diff line change
Expand Up @@ -60,22 +60,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReverseProxy.Direct", "test
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yarp.Kubernetes.Controller", "src\Kubernetes.Controller\Yarp.Kubernetes.Controller.csproj", "{5C8E9658-39DA-4C27-A939-68F94B62110B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OperatorFramework", "OperatorFramework", "{3A8C7CF8-1F32-474E-B68A-B548A3384BB4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E96BB4D7-EECC-4A78-BC7D-E167663FD6F2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Kubernetes.Core", "src\OperatorFramework\src\Core\Microsoft.Kubernetes.Core.csproj", "{EC716F93-C710-4D0E-BEB2-EB29BBD5F426}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Kubernetes.Controller", "src\OperatorFramework\src\Controller\Microsoft.Kubernetes.Controller.csproj", "{E6A1D5FD-F7E2-4683-9384-F30A1981953C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Kubernetes.CustomResources", "src\OperatorFramework\src\CustomResource\Microsoft.Kubernetes.CustomResources.csproj", "{85EE0BDC-6962-448A-B317-041441513124}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Kubernetes.Operator", "src\OperatorFramework\src\Operator\Microsoft.Kubernetes.Operator.csproj", "{B7BAB851-42BA-474A-9F48-ED74F88B610D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Kubernetes.ResourceKinds.OpenApi", "src\OperatorFramework\src\ResourceKinds.OpenApi\Microsoft.Kubernetes.ResourceKinds.OpenApi.csproj", "{EF2D9D76-C230-4880-8B6A-2286F48D868A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Kubernetes.Testing", "src\OperatorFramework\src\Testing\Microsoft.Kubernetes.Testing.csproj", "{A91475F7-6CF0-4564-A585-071D95CDC3A1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yarp.Kubernetes.Tests", "test\Kubernetes.Tests\Yarp.Kubernetes.Tests.csproj", "{46E9889F-7355-433A-98D8-972D8D90C6D0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReverseProxy.ConfigFilter.Sample", "samples\ReverseProxy.ConfigFilter.Sample\ReverseProxy.ConfigFilter.Sample.csproj", "{A1DE5B8D-25D2-4E57-B18D-5E64D879BE7E}"
Expand All @@ -96,22 +80,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "backend", "samples\Kuberene
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReverseProxy.Minimal.Sample", "samples\ReverseProxy.Minimal.Sample\ReverseProxy.Minimal.Sample.csproj", "{AA34BE13-7193-4036-A886-A7EE6CD36940}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Kubernetes.UnitTests", "src\OperatorFramework\test\UnitTests\Microsoft.Kubernetes.UnitTests.csproj", "{D6599484-5A3F-471C-87B0-7014C56F14CE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HttpSys.Sample", "HttpSys.Sample", "{34CB3C61-2F42-49FB-ACDC-2B0EC9EE8746}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleHttpSysServer", "samples\ReverseProxy.HttpSysDelegation.Sample\SampleHttpSysServer\SampleHttpSysServer.csproj", "{4A298B67-E7B5-4010-A6F2-5CFBB82BFBB1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReverseProxy.HttpSysDelegation.Sample", "samples\ReverseProxy.HttpSysDelegation.Sample\ReverseProxy\ReverseProxy.HttpSysDelegation.Sample.csproj", "{7AA90031-4644-4F38-9790-60E7A7609F58}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasicOperator", "src\OperatorFramework\examples\BasicOperator\BasicOperator.csproj", "{95C5E95F-D5BB-46C8-84F8-D478A360BDA2}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{300457D7-2FBF-4D10-926F-46A44A517851}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PodStatusConditions", "src\OperatorFramework\examples\PodStatusConditions\PodStatusConditions.csproj", "{76A6BC0C-6895-4763-BB0D-E3BA99C55EC5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UsingCustomResources", "src\OperatorFramework\examples\UsingCustomResources\UsingCustomResources.csproj", "{B1E26FA9-E66B-44BD-BFEB-1F412AC09BB9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -280,54 +254,6 @@ Global
{5C8E9658-39DA-4C27-A939-68F94B62110B}.Release|Any CPU.Build.0 = Release|Any CPU
{5C8E9658-39DA-4C27-A939-68F94B62110B}.Release|x64.ActiveCfg = Release|Any CPU
{5C8E9658-39DA-4C27-A939-68F94B62110B}.Release|x64.Build.0 = Release|Any CPU
{EC716F93-C710-4D0E-BEB2-EB29BBD5F426}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EC716F93-C710-4D0E-BEB2-EB29BBD5F426}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EC716F93-C710-4D0E-BEB2-EB29BBD5F426}.Debug|x64.ActiveCfg = Debug|Any CPU
{EC716F93-C710-4D0E-BEB2-EB29BBD5F426}.Debug|x64.Build.0 = Debug|Any CPU
{EC716F93-C710-4D0E-BEB2-EB29BBD5F426}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EC716F93-C710-4D0E-BEB2-EB29BBD5F426}.Release|Any CPU.Build.0 = Release|Any CPU
{EC716F93-C710-4D0E-BEB2-EB29BBD5F426}.Release|x64.ActiveCfg = Release|Any CPU
{EC716F93-C710-4D0E-BEB2-EB29BBD5F426}.Release|x64.Build.0 = Release|Any CPU
{E6A1D5FD-F7E2-4683-9384-F30A1981953C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E6A1D5FD-F7E2-4683-9384-F30A1981953C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E6A1D5FD-F7E2-4683-9384-F30A1981953C}.Debug|x64.ActiveCfg = Debug|Any CPU
{E6A1D5FD-F7E2-4683-9384-F30A1981953C}.Debug|x64.Build.0 = Debug|Any CPU
{E6A1D5FD-F7E2-4683-9384-F30A1981953C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E6A1D5FD-F7E2-4683-9384-F30A1981953C}.Release|Any CPU.Build.0 = Release|Any CPU
{E6A1D5FD-F7E2-4683-9384-F30A1981953C}.Release|x64.ActiveCfg = Release|Any CPU
{E6A1D5FD-F7E2-4683-9384-F30A1981953C}.Release|x64.Build.0 = Release|Any CPU
{85EE0BDC-6962-448A-B317-041441513124}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{85EE0BDC-6962-448A-B317-041441513124}.Debug|Any CPU.Build.0 = Debug|Any CPU
{85EE0BDC-6962-448A-B317-041441513124}.Debug|x64.ActiveCfg = Debug|Any CPU
{85EE0BDC-6962-448A-B317-041441513124}.Debug|x64.Build.0 = Debug|Any CPU
{85EE0BDC-6962-448A-B317-041441513124}.Release|Any CPU.ActiveCfg = Release|Any CPU
{85EE0BDC-6962-448A-B317-041441513124}.Release|Any CPU.Build.0 = Release|Any CPU
{85EE0BDC-6962-448A-B317-041441513124}.Release|x64.ActiveCfg = Release|Any CPU
{85EE0BDC-6962-448A-B317-041441513124}.Release|x64.Build.0 = Release|Any CPU
{B7BAB851-42BA-474A-9F48-ED74F88B610D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B7BAB851-42BA-474A-9F48-ED74F88B610D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B7BAB851-42BA-474A-9F48-ED74F88B610D}.Debug|x64.ActiveCfg = Debug|Any CPU
{B7BAB851-42BA-474A-9F48-ED74F88B610D}.Debug|x64.Build.0 = Debug|Any CPU
{B7BAB851-42BA-474A-9F48-ED74F88B610D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B7BAB851-42BA-474A-9F48-ED74F88B610D}.Release|Any CPU.Build.0 = Release|Any CPU
{B7BAB851-42BA-474A-9F48-ED74F88B610D}.Release|x64.ActiveCfg = Release|Any CPU
{B7BAB851-42BA-474A-9F48-ED74F88B610D}.Release|x64.Build.0 = Release|Any CPU
{EF2D9D76-C230-4880-8B6A-2286F48D868A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EF2D9D76-C230-4880-8B6A-2286F48D868A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EF2D9D76-C230-4880-8B6A-2286F48D868A}.Debug|x64.ActiveCfg = Debug|Any CPU
{EF2D9D76-C230-4880-8B6A-2286F48D868A}.Debug|x64.Build.0 = Debug|Any CPU
{EF2D9D76-C230-4880-8B6A-2286F48D868A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EF2D9D76-C230-4880-8B6A-2286F48D868A}.Release|Any CPU.Build.0 = Release|Any CPU
{EF2D9D76-C230-4880-8B6A-2286F48D868A}.Release|x64.ActiveCfg = Release|Any CPU
{EF2D9D76-C230-4880-8B6A-2286F48D868A}.Release|x64.Build.0 = Release|Any CPU
{A91475F7-6CF0-4564-A585-071D95CDC3A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A91475F7-6CF0-4564-A585-071D95CDC3A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A91475F7-6CF0-4564-A585-071D95CDC3A1}.Debug|x64.ActiveCfg = Debug|Any CPU
{A91475F7-6CF0-4564-A585-071D95CDC3A1}.Debug|x64.Build.0 = Debug|Any CPU
{A91475F7-6CF0-4564-A585-071D95CDC3A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A91475F7-6CF0-4564-A585-071D95CDC3A1}.Release|Any CPU.Build.0 = Release|Any CPU
{A91475F7-6CF0-4564-A585-071D95CDC3A1}.Release|x64.ActiveCfg = Release|Any CPU
{A91475F7-6CF0-4564-A585-071D95CDC3A1}.Release|x64.Build.0 = Release|Any CPU
{46E9889F-7355-433A-98D8-972D8D90C6D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{46E9889F-7355-433A-98D8-972D8D90C6D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{46E9889F-7355-433A-98D8-972D8D90C6D0}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -384,14 +310,6 @@ Global
{AA34BE13-7193-4036-A886-A7EE6CD36940}.Release|Any CPU.Build.0 = Release|Any CPU
{AA34BE13-7193-4036-A886-A7EE6CD36940}.Release|x64.ActiveCfg = Release|Any CPU
{AA34BE13-7193-4036-A886-A7EE6CD36940}.Release|x64.Build.0 = Release|Any CPU
{D6599484-5A3F-471C-87B0-7014C56F14CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D6599484-5A3F-471C-87B0-7014C56F14CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D6599484-5A3F-471C-87B0-7014C56F14CE}.Debug|x64.ActiveCfg = Debug|Any CPU
{D6599484-5A3F-471C-87B0-7014C56F14CE}.Debug|x64.Build.0 = Debug|Any CPU
{D6599484-5A3F-471C-87B0-7014C56F14CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D6599484-5A3F-471C-87B0-7014C56F14CE}.Release|Any CPU.Build.0 = Release|Any CPU
{D6599484-5A3F-471C-87B0-7014C56F14CE}.Release|x64.ActiveCfg = Release|Any CPU
{D6599484-5A3F-471C-87B0-7014C56F14CE}.Release|x64.Build.0 = Release|Any CPU
{4A298B67-E7B5-4010-A6F2-5CFBB82BFBB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4A298B67-E7B5-4010-A6F2-5CFBB82BFBB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4A298B67-E7B5-4010-A6F2-5CFBB82BFBB1}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand All @@ -408,30 +326,6 @@ Global
{7AA90031-4644-4F38-9790-60E7A7609F58}.Release|Any CPU.Build.0 = Release|Any CPU
{7AA90031-4644-4F38-9790-60E7A7609F58}.Release|x64.ActiveCfg = Release|Any CPU
{7AA90031-4644-4F38-9790-60E7A7609F58}.Release|x64.Build.0 = Release|Any CPU
{95C5E95F-D5BB-46C8-84F8-D478A360BDA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{95C5E95F-D5BB-46C8-84F8-D478A360BDA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{95C5E95F-D5BB-46C8-84F8-D478A360BDA2}.Debug|x64.ActiveCfg = Debug|Any CPU
{95C5E95F-D5BB-46C8-84F8-D478A360BDA2}.Debug|x64.Build.0 = Debug|Any CPU
{95C5E95F-D5BB-46C8-84F8-D478A360BDA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{95C5E95F-D5BB-46C8-84F8-D478A360BDA2}.Release|Any CPU.Build.0 = Release|Any CPU
{95C5E95F-D5BB-46C8-84F8-D478A360BDA2}.Release|x64.ActiveCfg = Release|Any CPU
{95C5E95F-D5BB-46C8-84F8-D478A360BDA2}.Release|x64.Build.0 = Release|Any CPU
{76A6BC0C-6895-4763-BB0D-E3BA99C55EC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{76A6BC0C-6895-4763-BB0D-E3BA99C55EC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{76A6BC0C-6895-4763-BB0D-E3BA99C55EC5}.Debug|x64.ActiveCfg = Debug|Any CPU
{76A6BC0C-6895-4763-BB0D-E3BA99C55EC5}.Debug|x64.Build.0 = Debug|Any CPU
{76A6BC0C-6895-4763-BB0D-E3BA99C55EC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{76A6BC0C-6895-4763-BB0D-E3BA99C55EC5}.Release|Any CPU.Build.0 = Release|Any CPU
{76A6BC0C-6895-4763-BB0D-E3BA99C55EC5}.Release|x64.ActiveCfg = Release|Any CPU
{76A6BC0C-6895-4763-BB0D-E3BA99C55EC5}.Release|x64.Build.0 = Release|Any CPU
{B1E26FA9-E66B-44BD-BFEB-1F412AC09BB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B1E26FA9-E66B-44BD-BFEB-1F412AC09BB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B1E26FA9-E66B-44BD-BFEB-1F412AC09BB9}.Debug|x64.ActiveCfg = Debug|Any CPU
{B1E26FA9-E66B-44BD-BFEB-1F412AC09BB9}.Debug|x64.Build.0 = Debug|Any CPU
{B1E26FA9-E66B-44BD-BFEB-1F412AC09BB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B1E26FA9-E66B-44BD-BFEB-1F412AC09BB9}.Release|Any CPU.Build.0 = Release|Any CPU
{B1E26FA9-E66B-44BD-BFEB-1F412AC09BB9}.Release|x64.ActiveCfg = Release|Any CPU
{B1E26FA9-E66B-44BD-BFEB-1F412AC09BB9}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -457,14 +351,6 @@ Global
{AE06F9BE-0B8D-4D02-9DC6-FE5A41FA4B5D} = {CDB73246-0A7E-4116-81E0-828228ECADDD}
{6FE9874A-87B9-42C6-B19C-065A97CC6360} = {CDB73246-0A7E-4116-81E0-828228ECADDD}
{5C8E9658-39DA-4C27-A939-68F94B62110B} = {6CBE18D4-64E9-492B-BB02-58CD57126C10}
{3A8C7CF8-1F32-474E-B68A-B548A3384BB4} = {6CBE18D4-64E9-492B-BB02-58CD57126C10}
{E96BB4D7-EECC-4A78-BC7D-E167663FD6F2} = {3A8C7CF8-1F32-474E-B68A-B548A3384BB4}
{EC716F93-C710-4D0E-BEB2-EB29BBD5F426} = {E96BB4D7-EECC-4A78-BC7D-E167663FD6F2}
{E6A1D5FD-F7E2-4683-9384-F30A1981953C} = {E96BB4D7-EECC-4A78-BC7D-E167663FD6F2}
{85EE0BDC-6962-448A-B317-041441513124} = {E96BB4D7-EECC-4A78-BC7D-E167663FD6F2}
{B7BAB851-42BA-474A-9F48-ED74F88B610D} = {E96BB4D7-EECC-4A78-BC7D-E167663FD6F2}
{EF2D9D76-C230-4880-8B6A-2286F48D868A} = {E96BB4D7-EECC-4A78-BC7D-E167663FD6F2}
{A91475F7-6CF0-4564-A585-071D95CDC3A1} = {E96BB4D7-EECC-4A78-BC7D-E167663FD6F2}
{46E9889F-7355-433A-98D8-972D8D90C6D0} = {0631147E-34BB-456D-B214-5B202C516D5C}
{A1DE5B8D-25D2-4E57-B18D-5E64D879BE7E} = {149C61A2-D9F8-49B9-9F9B-3C953FEF53AA}
{A19FDE35-C2BB-4326-BA29-C77975FAD4A9} = {149C61A2-D9F8-49B9-9F9B-3C953FEF53AA}
Expand All @@ -475,14 +361,9 @@ Global
{84B920E2-A501-457D-8F1A-9CC7AF8B5F2D} = {04E87669-7E7B-4217-83A4-EF80B534D14B}
{EB5663B9-31BA-4930-A302-4B87B8DEB74A} = {32B6B967-6EAF-42A1-9FD6-A59F752FF76B}
{AA34BE13-7193-4036-A886-A7EE6CD36940} = {149C61A2-D9F8-49B9-9F9B-3C953FEF53AA}
{D6599484-5A3F-471C-87B0-7014C56F14CE} = {E96BB4D7-EECC-4A78-BC7D-E167663FD6F2}
{34CB3C61-2F42-49FB-ACDC-2B0EC9EE8746} = {149C61A2-D9F8-49B9-9F9B-3C953FEF53AA}
{4A298B67-E7B5-4010-A6F2-5CFBB82BFBB1} = {34CB3C61-2F42-49FB-ACDC-2B0EC9EE8746}
{7AA90031-4644-4F38-9790-60E7A7609F58} = {34CB3C61-2F42-49FB-ACDC-2B0EC9EE8746}
{95C5E95F-D5BB-46C8-84F8-D478A360BDA2} = {300457D7-2FBF-4D10-926F-46A44A517851}
{300457D7-2FBF-4D10-926F-46A44A517851} = {3A8C7CF8-1F32-474E-B68A-B548A3384BB4}
{76A6BC0C-6895-4763-BB0D-E3BA99C55EC5} = {300457D7-2FBF-4D10-926F-46A44A517851}
{B1E26FA9-E66B-44BD-BFEB-1F412AC09BB9} = {300457D7-2FBF-4D10-926F-46A44A517851}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {31F6924A-E427-4830-96E9-B47CEB7BFE78}
Expand Down
2 changes: 0 additions & 2 deletions samples/KuberenetesIngress.Sample/Ingress/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ WORKDIR /src

# Copy csproj files and other files needed for restoring (to build a nuget cache layer to speed up rebuilds)
COPY ["samples/KuberenetesIngress.Sample/Ingress/Yarp.Kubernetes.Ingress.csproj", "samples/KuberenetesIngress.Sample/Ingress/"]
COPY ["src/OperatorFramework/src/Controller/Microsoft.Kubernetes.Controller.csproj", "src/OperatorFramework/src/Controller/"]
COPY ["src/OperatorFramework/src/Core/Microsoft.Kubernetes.Core.csproj", "src/OperatorFramework/src/Core/"]
COPY ["src/ReverseProxy/Yarp.ReverseProxy.csproj", "src/ReverseProxy/"]
COPY ["src/Kubernetes.Controller/Yarp.Kubernetes.Controller.csproj", "src/Kubernetes.Controller/"]
COPY ["src/Directory.Build.props", "src/"]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Microsoft Corporation.
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using Microsoft.Extensions.Hosting;
Expand Down Expand Up @@ -32,6 +32,7 @@ public abstract class BackgroundHostedService : IHostedService, IDisposable
/// Initializes a new instance of the <see cref="BackgroundHostedService"/> class.
/// </summary>
/// <param name="hostApplicationLifetime">The host application lifetime.</param>
/// <param name="logger">The logger.</param>
protected BackgroundHostedService(
IHostApplicationLifetime hostApplicationLifetime,
ILogger logger)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Microsoft Corporation.
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using k8s;
Expand Down Expand Up @@ -283,7 +283,7 @@ private async Task WatchAsync(CancellationToken cancellationToken)
resourceVersion: _lastResourceVersion,
cancellationToken: cancellationToken);

DateTime lastEventUtc = DateTime.UtcNow;
var lastEventUtc = DateTime.UtcNow;
using var watcher = watchWithHttpMessage.Watch<TResource, KubernetesList<TResource>>(
(watchEventType, item) =>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
// Copyright (c) Microsoft Corporation.
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using k8s;
using Microsoft.Extensions.Options;
using Microsoft.Kubernetes;
using Microsoft.Kubernetes.Client;
using Microsoft.Kubernetes.ResourceKinds;
using Microsoft.Kubernetes.Resources;
using System.Linq;

namespace Microsoft.Extensions.DependencyInjection
Expand Down Expand Up @@ -41,16 +40,6 @@ public static IServiceCollection AddKubernetesCore(this IServiceCollection servi
});
}

if (!services.Any(serviceDescriptor => serviceDescriptor.ServiceType == typeof(IResourceSerializers)))
{
services = services.AddTransient<IResourceSerializers, ResourceSerializers>();
}

if (!services.Any(serviceDescriptor => serviceDescriptor.ServiceType == typeof(IResourcePatcher)))
{
services = services.AddTransient<IResourcePatcher, ResourcePatcher>();
}

if (!services.Any(serviceDescriptor => serviceDescriptor.ServiceType == typeof(IResourceKindManager)))
{
services = services.AddSingleton<IResourceKindManager, ResourceKindManager>();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Microsoft Corporation.
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using k8s;
Expand Down Expand Up @@ -73,9 +73,9 @@ public NamespacedName(string name)
}

/// <summary>
/// Gets key values from the specified metadata.
/// Gets key values from the specified resource.
/// </summary>
/// <param name="metadata">The metadata.</param>
/// <param name="resource">The resource.</param>
/// <returns>NamespacedName.</returns>
public static NamespacedName From(IKubernetesObject<V1ObjectMeta> resource)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Microsoft Corporation.
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using Microsoft.Extensions.Internal;
Expand All @@ -23,6 +23,7 @@ public class Reservation
/// <summary>
/// Initializes a new instance of the <see cref="Reservation"/> class.
/// </summary>
/// <param name="clock">A system clock.</param>
/// <param name="limiter">The limiter.</param>
/// <param name="ok">if set to <c>true</c> [ok].</param>
/// <param name="tokens">The tokens.</param>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Microsoft Corporation.
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

namespace Microsoft.Kubernetes.Resources;
Expand Down Expand Up @@ -36,7 +36,6 @@ public interface IResourceSerializers
/// <summary>
/// Serializes to json string.
/// </summary>
/// <typeparam name="TResource">The resource model to serialize.</typeparam>
/// <param name="resource">The resource object to serialize.</param>
/// <returns>System.String.</returns>
string SerializeJson(object resource);
Expand Down
2 changes: 1 addition & 1 deletion src/Kubernetes.Controller/Services/IngressController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace Yarp.Kubernetes.Controller.Services;
/// <summary>
/// Controller receives notifications from informers. The data which is needed for processing is
/// saved in a <see cref="ICache"/> instance and resources which need to be reconciled are
/// added to an <see cref="IRateLimitingQueue{QueueItem}"/>. The background task dequeues
/// added to an <see cref="ProcessingRateLimitedQueue{QueueItem}"/>. The background task dequeues
/// items and passes them to an <see cref="IReconciler"/> service for processing.
/// </summary>
public class IngressController : BackgroundHostedService
Expand Down
Loading

0 comments on commit 46a3745

Please sign in to comment.