Skip to content

Commit

Permalink
chore: rename namespaces
Browse files Browse the repository at this point in the history
  • Loading branch information
buehler committed May 8, 2020
1 parent b6f1f37 commit 22d707f
Show file tree
Hide file tree
Showing 53 changed files with 101 additions and 104 deletions.
4 changes: 2 additions & 2 deletions DotnetOperatorSdk.sln
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{95F3A6DD-B421-441D-B263-1B34A1465FF5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dos", "src\Dos\Dos.csproj", "{D7AB6CB9-94B6-4FEB-B7D8-D8AA793BD2A4}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KubeOps", "src\KubeOps\KubeOps.csproj", "{D7AB6CB9-94B6-4FEB-B7D8-D8AA793BD2A4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{50E9B964-68F7-4B9F-BEA8-165CE45BC5C6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dos.Test", "tests\Dos.Test\Dos.Test.csproj", "{A33D30D0-AC1B-48F8-8A5A-36E569981793}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KubeOps.Test", "tests\KubeOps.Test\KubeOps.Test.csproj", "{A33D30D0-AC1B-48F8-8A5A-36E569981793}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "build\_build.csproj", "{D47717CB-A02E-4B12-BAA8-1D7F8BAE9BBD}"
EndProject
Expand Down
4 changes: 2 additions & 2 deletions src/KubeOps/Build/Program.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Threading.Tasks;
using Dos.Operator;
using KubeOps.Operator;

namespace Dos.Build
namespace KubeOps.Build
{
internal static class Program
{
Expand Down
1 change: 0 additions & 1 deletion src/KubeOps/KubeOps.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<Authors>Christoph Bühler</Authors>
<Company>smartive AG</Company>
<Owner>cbuehler</Owner>
<RootNamespace>Dos</RootNamespace>
</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/KubeOps/Operator/Caching/CacheComparisonResult.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Dos.Operator.Caching
namespace KubeOps.Operator.Caching
{
internal enum CacheComparisonResult
{
Expand Down
4 changes: 2 additions & 2 deletions src/KubeOps/Operator/Caching/EntityCache.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using System.Collections.Generic;
using System.Linq;
using Dos.Operator.Entities;
using k8s;
using k8s.Models;
using KellermanSoftware.CompareNetObjects;
using KubeOps.Operator.Entities;

namespace Dos.Operator.Caching
namespace KubeOps.Operator.Caching
{
internal class EntityCache<TEntity>
where TEntity : IKubernetesObject<V1ObjectMeta>
Expand Down
2 changes: 1 addition & 1 deletion src/KubeOps/Operator/Client/ClientUrlFixer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Threading;
using System.Threading.Tasks;

namespace Dos.Operator.Client
namespace KubeOps.Operator.Client
{
internal class ClientUrlFixer : DelegatingHandler
{
Expand Down
4 changes: 2 additions & 2 deletions src/KubeOps/Operator/Client/IKubernetesClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using Dos.Operator.Client.LabelSelectors;
using k8s;
using k8s.Models;
using KubeOps.Operator.Client.LabelSelectors;

namespace Dos.Operator.Client
namespace KubeOps.Operator.Client
{
public interface IKubernetesClient
{
Expand Down
6 changes: 3 additions & 3 deletions src/KubeOps/Operator/Client/KubernetesClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
using System.Net;
using System.Threading;
using System.Threading.Tasks;
using Dos.Operator.Client.LabelSelectors;
using Dos.Operator.Entities;
using k8s;
using k8s.Models;
using KubeOps.Operator.Client.LabelSelectors;
using KubeOps.Operator.Entities;
using Microsoft.Rest;
using Newtonsoft.Json.Linq;

namespace Dos.Operator.Client
namespace KubeOps.Operator.Client
{
internal class KubernetesClient : IKubernetesClient
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Collections.Generic;

namespace Dos.Operator.Client.LabelSelectors
namespace KubeOps.Operator.Client.LabelSelectors
{
public class EqualsSelector : ILabelSelector
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Dos.Operator.Client.LabelSelectors
namespace KubeOps.Operator.Client.LabelSelectors
{
public class ExistsSelector : ILabelSelector
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Dos.Operator.Client.LabelSelectors
namespace KubeOps.Operator.Client.LabelSelectors
{
public interface ILabelSelector
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Collections.Generic;

namespace Dos.Operator.Client.LabelSelectors
namespace KubeOps.Operator.Client.LabelSelectors
{
public class NotEqualsSelector : ILabelSelector
{
Expand Down
2 changes: 1 addition & 1 deletion src/KubeOps/Operator/Commands/ExitCodes.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Dos.Operator.Commands
namespace KubeOps.Operator.Commands
{
internal static class ExitCodes
{
Expand Down
10 changes: 5 additions & 5 deletions src/KubeOps/Operator/Commands/Generators/CrdGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using Dos.Operator.Entities;
using Dos.Operator.Entities.Kustomize;
using Dos.Operator.KubernetesEntities;
using Dos.Operator.Serialization;
using k8s.Models;
using KubeOps.Operator.Entities;
using KubeOps.Operator.Entities.Kustomize;
using KubeOps.Operator.KubernetesEntities;
using KubeOps.Operator.Serialization;
using McMaster.Extensions.CommandLineUtils;
using V1JSONSchemaProps = k8s.Models.V1JSONSchemaProps;

namespace Dos.Operator.Commands.Generators
namespace KubeOps.Operator.Commands.Generators
{
[Command("crd", "crds", Description = "Generates the needed CRD for kubernetes.")]
internal class CrdGenerator : GeneratorBase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Threading.Tasks;
using McMaster.Extensions.CommandLineUtils;

namespace Dos.Operator.Commands.Generators
namespace KubeOps.Operator.Commands.Generators
{
[Command("docker", Description = "Generates the docker file for building.")]
internal class DockerGenerator : GeneratorBase
Expand Down
2 changes: 1 addition & 1 deletion src/KubeOps/Operator/Commands/Generators/Generator.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Threading.Tasks;
using McMaster.Extensions.CommandLineUtils;

namespace Dos.Operator.Commands.Generators
namespace KubeOps.Operator.Commands.Generators
{
[Command("generator", "gen", "g", Description = "Generates elements related to this operator.")]
[Subcommand(typeof(CrdGenerator))]
Expand Down
4 changes: 2 additions & 2 deletions src/KubeOps/Operator/Commands/Generators/GeneratorBase.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Dos.Operator.Serialization;
using KubeOps.Operator.Serialization;
using McMaster.Extensions.CommandLineUtils;

namespace Dos.Operator.Commands.Generators
namespace KubeOps.Operator.Commands.Generators
{
internal abstract class GeneratorBase
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
using System.IO;
using System.Text;
using System.Threading.Tasks;
using Dos.Operator.Entities.Kustomize;
using Dos.Operator.Serialization;
using k8s.Models;
using KubeOps.Operator.Entities.Kustomize;
using KubeOps.Operator.Serialization;
using McMaster.Extensions.CommandLineUtils;

namespace Dos.Operator.Commands.Generators
namespace KubeOps.Operator.Commands.Generators
{
[Command("installer", Description = "Generates kustomization yaml for the whole installation of the operator.")]
internal class InstallerGenerator : GeneratorBase
Expand Down
6 changes: 3 additions & 3 deletions src/KubeOps/Operator/Commands/Generators/OperatorGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
using System.IO;
using System.Text;
using System.Threading.Tasks;
using Dos.Operator.Entities.Kustomize;
using Dos.Operator.Serialization;
using k8s.Models;
using KubeOps.Operator.Entities.Kustomize;
using KubeOps.Operator.Serialization;
using McMaster.Extensions.CommandLineUtils;

namespace Dos.Operator.Commands.Generators
namespace KubeOps.Operator.Commands.Generators
{
[Command("operator", Description = "Generates the needed yamls to run the operator.")]
internal class OperatorGenerator : GeneratorBase
Expand Down
8 changes: 4 additions & 4 deletions src/KubeOps/Operator/Commands/Generators/RbacGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using Dos.Operator.Entities.Kustomize;
using Dos.Operator.Rbac;
using Dos.Operator.Serialization;
using k8s.Models;
using KubeOps.Operator.Entities.Kustomize;
using KubeOps.Operator.Rbac;
using KubeOps.Operator.Serialization;
using McMaster.Extensions.CommandLineUtils;

namespace Dos.Operator.Commands.Generators
namespace KubeOps.Operator.Commands.Generators
{
[Command("rbac", Description = "Generates the needed rbac roles for the operator.")]
internal class RbacGenerator : GeneratorBase
Expand Down
8 changes: 4 additions & 4 deletions src/KubeOps/Operator/Commands/Management/Install.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
using System.Linq;
using System.Net;
using System.Threading.Tasks;
using Dos.Operator.Client;
using Dos.Operator.Commands.Generators;
using Dos.Operator.KubernetesEntities;
using KubeOps.Operator.Client;
using KubeOps.Operator.Commands.Generators;
using KubeOps.Operator.KubernetesEntities;
using McMaster.Extensions.CommandLineUtils;
using Microsoft.Rest;

namespace Dos.Operator.Commands.Management
namespace KubeOps.Operator.Commands.Management
{
[Command(
"install",
Expand Down
8 changes: 4 additions & 4 deletions src/KubeOps/Operator/Commands/Management/Uninstall.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
using System.Linq;
using System.Net;
using System.Threading.Tasks;
using Dos.Operator.Client;
using Dos.Operator.Commands.Generators;
using Dos.Operator.KubernetesEntities;
using KubeOps.Operator.Client;
using KubeOps.Operator.Commands.Generators;
using KubeOps.Operator.KubernetesEntities;
using McMaster.Extensions.CommandLineUtils;
using Microsoft.Rest;

namespace Dos.Operator.Commands.Management
namespace KubeOps.Operator.Commands.Management
{
[Command(
"uninstall",
Expand Down
6 changes: 3 additions & 3 deletions src/KubeOps/Operator/Commands/RunOperator.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using System.Threading.Tasks;
using Dos.Operator.Commands.Generators;
using Dos.Operator.Commands.Management;
using KubeOps.Operator.Commands.Generators;
using KubeOps.Operator.Commands.Management;
using McMaster.Extensions.CommandLineUtils;
using Microsoft.Extensions.Hosting;

namespace Dos.Operator.Commands
namespace KubeOps.Operator.Commands
{
[Command(Description = "Runs the operator.")]
[Subcommand(typeof(Generator))]
Expand Down
2 changes: 1 addition & 1 deletion src/KubeOps/Operator/Comparing/ArrayExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace Dos.Operator.Comparing
namespace KubeOps.Operator.Comparing
{
internal static class ArrayExtensions
{
Expand Down
2 changes: 1 addition & 1 deletion src/KubeOps/Operator/Comparing/ArrayTraverse.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace Dos.Operator.Comparing
namespace KubeOps.Operator.Comparing
{
internal class ArrayTraverse
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Collections.Generic;

namespace Dos.Operator.Comparing
namespace KubeOps.Operator.Comparing
{
internal class ReferenceEqualityComparer : EqualityComparer<object>
{
Expand Down
10 changes: 5 additions & 5 deletions src/KubeOps/Operator/Controller/ResourceControllerBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Dos.Operator.Client;
using Dos.Operator.DependencyInjection;
using Dos.Operator.Finalizer;
using Dos.Operator.Queue;
using k8s;
using k8s.Models;
using KubeOps.Operator.Client;
using KubeOps.Operator.DependencyInjection;
using KubeOps.Operator.Finalizer;
using KubeOps.Operator.Queue;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;

namespace Dos.Operator.Controller
namespace KubeOps.Operator.Controller
{
// TODO: namespaced controller (only watch resource of a specific namespace)
// TODO: Webhooks?
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using Microsoft.Extensions.DependencyInjection;

namespace Dos.Operator.DependencyInjection
namespace KubeOps.Operator.DependencyInjection
{
internal static class DependencyInjector
{
Expand Down
2 changes: 1 addition & 1 deletion src/KubeOps/Operator/Entities/CustomEntityDefinition.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Dos.Operator.Entities
namespace KubeOps.Operator.Entities
{
internal readonly struct CustomEntityDefinition
{
Expand Down
2 changes: 1 addition & 1 deletion src/KubeOps/Operator/Entities/CustomKubernetesEntity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using k8s;
using k8s.Models;

namespace Dos.Operator.Entities
namespace KubeOps.Operator.Entities
{
public abstract class CustomKubernetesEntity : KubernetesObject, IKubernetesObject<V1ObjectMeta>
{
Expand Down
4 changes: 2 additions & 2 deletions src/KubeOps/Operator/Entities/EntityExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using System;
using System.Collections.Generic;
using System.Reflection;
using Dos.Operator.Comparing;
using k8s;
using k8s.Models;
using KubeOps.Operator.Comparing;

namespace Dos.Operator.Entities
namespace KubeOps.Operator.Entities
{
internal static class EntityExtensions
{
Expand Down
2 changes: 1 addition & 1 deletion src/KubeOps/Operator/Entities/EntityScope.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Dos.Operator.Entities
namespace KubeOps.Operator.Entities
{
public enum EntityScope
{
Expand Down
2 changes: 1 addition & 1 deletion src/KubeOps/Operator/Entities/EntityScopeAttribute.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace Dos.Operator.Entities
namespace KubeOps.Operator.Entities
{
[AttributeUsage(AttributeTargets.Class, Inherited = false)]
public sealed class EntityScopeAttribute : Attribute
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Collections.Generic;
using k8s;

namespace Dos.Operator.Entities.Kustomize
namespace KubeOps.Operator.Entities.Kustomize
{
public class KustomizationConfig : KubernetesObject
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Dos.Operator.Entities.Kustomize
namespace KubeOps.Operator.Entities.Kustomize
{
public class KustomizationImage
{
Expand Down
Loading

0 comments on commit 22d707f

Please sign in to comment.