Skip to content

Commit 0b716fa

Browse files
author
Christoph Bühler
committed
fix: rename the options from "dos" to "kubeOps"
1 parent 4dd0d1c commit 0b716fa

File tree

2 files changed

+34
-34
lines changed

2 files changed

+34
-34
lines changed

‎src/KubeOps/Build/KubeOps.props‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
<Project>
22
<PropertyGroup>
33
<!-- Configuration for Docker related commands-->
4-
<DosDockerfilePath Condition="'$(DosDockerfilePath)' == '' And '$(SolutionDir)' != '' ">$(SolutionDir)Dockerfile</DosDockerfilePath>
5-
<DosDockerfilePath Condition="'$(DosDockerfilePath)' == '' And '$(SolutionDir)' == '' ">$(MSBuildProjectDirectory)\Dockerfile</DosDockerfilePath>
6-
<DosDockerTag Condition="'$(DosDockerTag)' == ''">latest</DosDockerTag>
4+
<KubeOpsDockerfilePath Condition="'$(KubeOpsDockerfilePath)' == '' And '$(SolutionDir)' != '' ">$(SolutionDir)Dockerfile</KubeOpsDockerfilePath>
5+
<KubeOpsDockerfilePath Condition="'$(KubeOpsDockerfilePath)' == '' And '$(SolutionDir)' == '' ">$(MSBuildProjectDirectory)\Dockerfile</KubeOpsDockerfilePath>
6+
<KubeOpsDockerTag Condition="'$(KubeOpsDockerTag)' == ''">latest</KubeOpsDockerTag>
77
</PropertyGroup>
88

99
<PropertyGroup>
1010
<!-- Configuration for the pathes where to store the generated yamls and elements -->
11-
<DosConfigRoot Condition="'$(DosConfigRoot)' == '' And '$(SolutionDir)' != '' ">$(SolutionDir)config</DosConfigRoot>
12-
<DosConfigRoot Condition="'$(DosConfigRoot)' == '' And '$(SolutionDir)' == '' ">$(MSBuildProjectDirectory)\config</DosConfigRoot>
11+
<KubeOpsConfigRoot Condition="'$(KubeOpsConfigRoot)' == '' And '$(SolutionDir)' != '' ">$(SolutionDir)config</KubeOpsConfigRoot>
12+
<KubeOpsConfigRoot Condition="'$(KubeOpsConfigRoot)' == '' And '$(SolutionDir)' == '' ">$(MSBuildProjectDirectory)\config</KubeOpsConfigRoot>
1313
</PropertyGroup>
1414

1515
<PropertyGroup>
1616
<!-- Configuration for the crd generation -->
17-
<DosCrdDir Condition="'$(DosCrdDir)' == ''">$(DosConfigRoot)\crds</DosCrdDir>
18-
<DosCrdFormat Condition="'$(DosCrdFormat)' == ''">Yaml</DosCrdFormat>
19-
<DosCrdUseOldCrds Condition="'$(DosCrdUseOldCrds)' == ''">false</DosCrdUseOldCrds>
17+
<KubeOpsCrdDir Condition="'$(KubeOpsCrdDir)' == ''">$(KubeOpsConfigRoot)\crds</KubeOpsCrdDir>
18+
<KubeOpsCrdFormat Condition="'$(KubeOpsCrdFormat)' == ''">Yaml</KubeOpsCrdFormat>
19+
<KubeOpsCrdUseOldCrds Condition="'$(KubeOpsCrdUseOldCrds)' == ''">false</KubeOpsCrdUseOldCrds>
2020
</PropertyGroup>
2121

2222
<PropertyGroup>
2323
<!-- Configuration for the rbac generation -->
24-
<DosRbacDir Condition="'$(DosRbacDir)' == ''">$(DosConfigRoot)\rbac</DosRbacDir>
25-
<DosRbacFormat Condition="'$(DosRbacFormat)' == ''">Yaml</DosRbacFormat>
24+
<KubeOpsRbacDir Condition="'$(KubeOpsRbacDir)' == ''">$(KubeOpsConfigRoot)\rbac</KubeOpsRbacDir>
25+
<KubeOpsRbacFormat Condition="'$(KubeOpsRbacFormat)' == ''">Yaml</KubeOpsRbacFormat>
2626
</PropertyGroup>
2727

2828
<PropertyGroup>
2929
<!-- Configuration for the operator manifest generation -->
30-
<DosOperatorDir Condition="'$(DosOperatorDir)' == ''">$(DosConfigRoot)\operator</DosOperatorDir>
31-
<DosOperatorFormat Condition="'$(DosOperatorFormat)' == ''">Yaml</DosOperatorFormat>
30+
<KubeOpsOperatorDir Condition="'$(KubeOpsOperatorDir)' == ''">$(KubeOpsConfigRoot)\operator</KubeOpsOperatorDir>
31+
<KubeOpsOperatorFormat Condition="'$(KubeOpsOperatorFormat)' == ''">Yaml</KubeOpsOperatorFormat>
3232
</PropertyGroup>
3333

3434
<PropertyGroup>
3535
<!-- Configuration for the installer manifest generation -->
36-
<DosInstallerDir Condition="'$(DosInstallerDir)' == ''">$(DosConfigRoot)\install</DosInstallerDir>
37-
<DosInstallerFormat Condition="'$(DosInstallerFormat)' == ''">Yaml</DosInstallerFormat>
36+
<KubeOpsInstallerDir Condition="'$(KubeOpsInstallerDir)' == ''">$(KubeOpsConfigRoot)\install</KubeOpsInstallerDir>
37+
<KubeOpsInstallerFormat Condition="'$(KubeOpsInstallerFormat)' == ''">Yaml</KubeOpsInstallerFormat>
3838
</PropertyGroup>
3939
</Project>

‎src/KubeOps/Build/KubeOps.targets‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,49 @@
11
<Project DefaultTargets="GenerateAfterBuild">
22
<Target Name="GenerateDockerfile">
33
<Message Text="Generating Dockerfile" Importance="high"/>
4-
<Message Text="Dockerfile path: $(DosDockerfilePath)" Importance="normal"/>
4+
<Message Text="Dockerfile path: $(KubeOpsDockerfilePath)" Importance="normal"/>
55

6-
<Message Condition="Exists('$(DosDockerfilePath)')" Text="Dockerfile already exists. Don't overwrite." Importance="high"/>
7-
<Exec Condition="!Exists('$(DosDockerfilePath)')"
8-
Command="dotnet $(OutputPath)$(TargetFileName) generator docker --out $(DosDockerfilePath) --dotnet-tag $(DosDockerTag) --solution-dir $(SolutionDir) --target-file $(TargetFileName) --project-path $(ProjectPath)"/>
6+
<Message Condition="Exists('$(KubeOpsDockerfilePath)')" Text="Dockerfile already exists. Don't overwrite." Importance="high"/>
7+
<Exec Condition="!Exists('$(KubeOpsDockerfilePath)')"
8+
Command="dotnet $(OutputPath)$(TargetFileName) generator docker --out $(KubeOpsDockerfilePath) --dotnet-tag $(KubeOpsDockerTag) --solution-dir $(SolutionDir) --target-file $(TargetFileName) --project-path $(ProjectPath)"/>
99
</Target>
1010

1111
<Target Name="GenerateCrds">
1212
<Message Text="Generating CRDs" Importance="high"/>
13-
<Message Text="Configuration path: $(DosCrdDir)" Importance="normal"/>
13+
<Message Text="Configuration path: $(KubeOpsCrdDir)" Importance="normal"/>
1414

15-
<Exec Condition="'$(DosCrdUseOldCrds)' == 'false'" Command="dotnet $(OutputPath)$(TargetFileName) generator crds --out $(DosCrdDir) --format $(DosCrdFormat)"/>
16-
<Exec Condition="'$(DosCrdUseOldCrds)' == 'true'" Command="dotnet $(OutputPath)$(TargetFileName) generator crds --out $(DosCrdDir) --format $(DosCrdFormat) --use-old-crds"/>
15+
<Exec Condition="'$(KubeOpsCrdUseOldCrds)' == 'false'" Command="dotnet $(OutputPath)$(TargetFileName) generator crds --out $(KubeOpsCrdDir) --format $(KubeOpsCrdFormat)"/>
16+
<Exec Condition="'$(KubeOpsCrdUseOldCrds)' == 'true'" Command="dotnet $(OutputPath)$(TargetFileName) generator crds --out $(KubeOpsCrdDir) --format $(KubeOpsCrdFormat) --use-old-crds"/>
1717
</Target>
1818

1919
<Target Name="GenerateRbac">
2020
<Message Text="Generating Rbac roles" Importance="high"/>
21-
<Message Text="Configuration path: $(DosRbacDir)" Importance="normal"/>
21+
<Message Text="Configuration path: $(KubeOpsRbacDir)" Importance="normal"/>
2222

23-
<Exec Command="dotnet $(OutputPath)$(TargetFileName) generator rbac --out $(DosRbacDir) --format $(DosRbacFormat)"/>
23+
<Exec Command="dotnet $(OutputPath)$(TargetFileName) generator rbac --out $(KubeOpsRbacDir) --format $(KubeOpsRbacFormat)"/>
2424
</Target>
2525

2626
<Target Name="GenerateOperator">
2727
<Message Text="Generating Operator yamls" Importance="high"/>
28-
<Message Text="Configuration path: $(DosOperatorDir)" Importance="normal"/>
28+
<Message Text="Configuration path: $(KubeOpsOperatorDir)" Importance="normal"/>
2929

30-
<Exec Command="dotnet $(OutputPath)$(TargetFileName) generator operator --out $(DosOperatorDir) --format $(DosOperatorFormat)"/>
30+
<Exec Command="dotnet $(OutputPath)$(TargetFileName) generator operator --out $(KubeOpsOperatorDir) --format $(KubeOpsOperatorFormat)"/>
3131
</Target>
3232

3333
<Target Name="GenerateInstaller">
3434
<Message Text="Generating Installer yamls" Importance="high"/>
35-
<Message Text="Configuration path: $(DosInstallerDir)" Importance="normal"/>
35+
<Message Text="Configuration path: $(KubeOpsInstallerDir)" Importance="normal"/>
3636

37-
<Message Condition="Exists('$(DosInstallerDir)')" Text="Installer dir exists, don't overwrite contents." Importance="high"/>
38-
<Exec Condition="!Exists('$(DosInstallerDir)')"
39-
Command="dotnet $(OutputPath)$(TargetFileName) generator installer --out $(DosInstallerDir) --format $(DosInstallerFormat) --crds-dir $(DosCrdDir) --rbac-dir $(DosRbacDir) --operator-dir $(DosOperatorDir)"/>
37+
<Message Condition="Exists('$(KubeOpsInstallerDir)')" Text="Installer dir exists, don't overwrite contents." Importance="high"/>
38+
<Exec Condition="!Exists('$(KubeOpsInstallerDir)')"
39+
Command="dotnet $(OutputPath)$(TargetFileName) generator installer --out $(KubeOpsInstallerDir) --format $(KubeOpsInstallerFormat) --crds-dir $(KubeOpsCrdDir) --rbac-dir $(KubeOpsRbacDir) --operator-dir $(KubeOpsOperatorDir)"/>
4040
</Target>
4141

4242
<Target Name="GenerateAfterBuild" AfterTargets="Build">
43-
<CallTarget Condition="'$(DosSkipDockerfile)' == ''" Targets="GenerateDockerfile"/>
44-
<CallTarget Condition="'$(DosSkipCrds)' == ''" Targets="GenerateCrds"/>
45-
<CallTarget Condition="'$(DosSkipRbac)' == ''" Targets="GenerateRbac"/>
46-
<CallTarget Condition="'$(DosSkipOperator)' == ''" Targets="GenerateOperator"/>
47-
<CallTarget Condition="'$(DosSkipInstaller)' == ''" Targets="GenerateInstaller"/>
43+
<CallTarget Condition="'$(KubeOpsSkipDockerfile)' == ''" Targets="GenerateDockerfile"/>
44+
<CallTarget Condition="'$(KubeOpsSkipCrds)' == ''" Targets="GenerateCrds"/>
45+
<CallTarget Condition="'$(KubeOpsSkipRbac)' == ''" Targets="GenerateRbac"/>
46+
<CallTarget Condition="'$(KubeOpsSkipOperator)' == ''" Targets="GenerateOperator"/>
47+
<CallTarget Condition="'$(KubeOpsSkipInstaller)' == ''" Targets="GenerateInstaller"/>
4848
</Target>
4949
</Project>

0 commit comments

Comments
 (0)