Skip to content

Commit f5e233a

Browse files
yannickchristhomasyannickchristhomas
committed
Cleanup
1 parent 92b2970 commit f5e233a

File tree

6 files changed

+31
-58
lines changed

6 files changed

+31
-58
lines changed

‎scripts/downloadHelmCharts.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/usr/bin/env bash
22
set -o errexit -o nounset -o pipefail
33

4-
#charts=( 'monitoring' 'externalSecrets' 'vault' 'mailhog' 'ingressNginx' )
54
charts=( 'monitoring' 'externalSecrets' 'vault' 'mailhog' 'ingressNginx')
65
APPLICATION_CONFIGURATOR_GROOVY="${1:-src/main/groovy/com/cloudogu/gitops/config/ApplicationConfigurator.groovy}"
76

‎src/main/groovy/com/cloudogu/gitops/features/Mailhog.groovy

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@ import com.cloudogu.gitops.Feature
44
import com.cloudogu.gitops.config.Configuration
55
import com.cloudogu.gitops.features.deployment.DeploymentStrategy
66
import com.cloudogu.gitops.utils.AirGappedUtils
7-
import com.cloudogu.gitops.utils.DockerImageParser
87
import com.cloudogu.gitops.utils.FileSystemUtils
98
import com.cloudogu.gitops.utils.K8sClient
10-
import com.cloudogu.gitops.utils.MapUtils
119
import com.cloudogu.gitops.utils.TemplatingEngine
1210
import groovy.util.logging.Slf4j
1311
import groovy.yaml.YamlSlurper
@@ -68,7 +66,7 @@ class Mailhog extends Feature {
6866
passwordCrypt: bcryptMailhogPassword,
6967
podResources: config.application['podResources'],
7068
]).toPath()
71-
Map helmValuesYaml = fileSystemUtils.readYaml(tmpHelmValues)
69+
7270
def helmConfig = config['features']['mail']['helm']
7371

7472
if (config.application['mirrorRepos']) {
@@ -89,8 +87,6 @@ class Mailhog extends Feature {
8987
'mailhog',
9088
tmpHelmValues, DeploymentStrategy.RepoType.GIT)
9189
} else {
92-
fileSystemUtils.writeYaml(helmValuesYaml, tmpHelmValues.toFile())
93-
9490
deployer.deployFeature(
9591
helmConfig['repoURL'] as String,
9692
'mailhog',

‎src/test/groovy/com/cloudogu/gitops/features/ExternalSecretsOperatorTest.groovy

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@ package com.cloudogu.gitops.features
22

33
import com.cloudogu.gitops.config.Configuration
44
import com.cloudogu.gitops.features.deployment.DeploymentStrategy
5-
import com.cloudogu.gitops.features.deployment.HelmStrategy
65
import com.cloudogu.gitops.utils.AirGappedUtils
76
import com.cloudogu.gitops.utils.CommandExecutorForTest
87
import com.cloudogu.gitops.utils.FileSystemUtils
9-
import com.cloudogu.gitops.utils.HelmClient
108
import com.cloudogu.gitops.utils.K8sClient
119
import groovy.yaml.YamlSlurper
1210
import jakarta.inject.Provider
@@ -20,7 +18,6 @@ import static org.assertj.core.api.Assertions.assertThat
2018
import static org.mockito.ArgumentMatchers.any
2119
import static org.mockito.Mockito.mock
2220
import static org.mockito.Mockito.verify
23-
import static org.mockito.Mockito.verify
2421
import static org.mockito.Mockito.when
2522

2623
class ExternalSecretsOperatorTest {
@@ -47,15 +44,14 @@ class ExternalSecretsOperatorTest {
4744
externalSecrets: [
4845
helm: [
4946
chart : 'external-secrets',
50-
repoURL: 'https://external-secrets',
51-
version: '0.25.0'
47+
repoURL: 'https://charts.external-secrets.io',
48+
version: '0.9.16'
5249
]
5350
],
5451
]
5552
],
5653
]
5754
CommandExecutorForTest commandExecutor = new CommandExecutorForTest()
58-
5955
CommandExecutorForTest k8sCommandExecutor = new CommandExecutorForTest()
6056
DeploymentStrategy deploymentStrategy = mock(DeploymentStrategy)
6157
AirGappedUtils airGappedUtils = mock(AirGappedUtils)
@@ -73,13 +69,15 @@ class ExternalSecretsOperatorTest {
7369
void 'helm release is installed'() {
7470
createExternalSecretsOperator().install()
7571

76-
assertThat(commandExecutor.actualCommands[0].trim()).isEqualTo(
77-
'helm repo add externalsecretsoperator https://charts.external-secrets.io')
78-
assertThat(commandExecutor.actualCommands[1].trim()).startsWith(
79-
'helm upgrade -i external-secrets externalsecretsoperator/external-secrets --create-namespace')
80-
assertThat(commandExecutor.actualCommands[1].trim()).contains('--version 0.6.0')
81-
assertThat(commandExecutor.actualCommands[1].trim()).contains("--values $temporaryYamlFile")
82-
assertThat(commandExecutor.actualCommands[1].trim()).contains('--namespace foo-secrets')
72+
verify(deploymentStrategy).deployFeature(
73+
'https://charts.external-secrets.io',
74+
'externalsecretsoperator',
75+
'external-secrets',
76+
'0.9.16',
77+
'secrets',
78+
'external-secrets',
79+
temporaryYamlFile
80+
)
8381

8482
assertThat(parseActualStackYaml()).doesNotContainKeys('resources')
8583
assertThat(parseActualStackYaml()).doesNotContainKey('certController')
@@ -137,8 +135,8 @@ class ExternalSecretsOperatorTest {
137135
def helmConfig = ArgumentCaptor.forClass(Map)
138136
verify(airGappedUtils).mirrorHelmRepoToGit(helmConfig.capture())
139137
assertThat(helmConfig.value.chart).isEqualTo('external-secrets')
140-
assertThat(helmConfig.value.repoURL).isEqualTo('https://external-secrets')
141-
assertThat(helmConfig.value.version).isEqualTo('0.25.0')
138+
assertThat(helmConfig.value.repoURL).isEqualTo('https://charts.external-secrets.io')
139+
assertThat(helmConfig.value.version).isEqualTo('0.9.16')
142140
verify(deploymentStrategy).deployFeature(
143141
'http://scmm-scm-manager.default.svc.cluster.local/scm/repo/a/b',
144142
'external-secrets', '.', '1.2.3','secrets',

‎src/test/groovy/com/cloudogu/gitops/features/IngressNginxTest.groovy

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ class IngressNginxTest {
3535
],
3636
scmm : [
3737
internal: true,
38-
protocol: 'https',
39-
host: 'abc',
40-
username: '',
41-
password: ''
4238
],
4339
features:[
4440
ingressNginx: [
@@ -53,11 +49,10 @@ class IngressNginxTest {
5349
],
5450
]
5551

56-
DeploymentStrategy deploymentStrategy = mock(DeploymentStrategy)
57-
5852
CommandExecutorForTest k8sCommandExecutor = new CommandExecutorForTest()
5953
Path temporaryYamlFile
6054
FileSystemUtils fileSystemUtils = new FileSystemUtils()
55+
DeploymentStrategy deploymentStrategy = mock(DeploymentStrategy)
6156
AirGappedUtils airGappedUtils = mock(AirGappedUtils)
6257

6358
@Test
@@ -129,7 +124,7 @@ class IngressNginxTest {
129124
def helmConfig = ArgumentCaptor.forClass(Map)
130125
verify(airGappedUtils).mirrorHelmRepoToGit(helmConfig.capture())
131126
assertThat(helmConfig.value.chart).isEqualTo('ingress-nginx')
132-
assertThat(helmConfig.value.repoURL).isEqualTo('https://ingress-nginx')
127+
assertThat(helmConfig.value.repoURL).isEqualTo('https://kubernetes.github.io/ingress-nginx')
133128
assertThat(helmConfig.value.version).isEqualTo('4.8.2')
134129
verify(deploymentStrategy).deployFeature(
135130
'http://scmm-scm-manager.default.svc.cluster.local/scm/repo/a/b',

‎src/test/groovy/com/cloudogu/gitops/features/MailhogTest.groovy

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ class MailhogTest {
3434
],
3535
scmm : [
3636
internal: true,
37-
protocol: 'https',
38-
host: 'abc',
39-
username: '',
40-
password: ''
4137
],
4238
features : [
4339
argocd : [
@@ -47,9 +43,8 @@ class MailhogTest {
4743
mailhog: true,
4844
helm : [
4945
chart : 'mailhog',
50-
repoURL: 'https://mailhog',
46+
repoURL: 'https://codecentric.github.io/helm-charts',
5147
version: '5.0.1',
52-
image: ''
5348
]
5449
]
5550
],
@@ -58,6 +53,7 @@ class MailhogTest {
5853
AirGappedUtils airGappedUtils = mock(AirGappedUtils)
5954
Path temporaryYamlFile = null
6055
CommandExecutorForTest k8sCommandExecutor = new CommandExecutorForTest()
56+
CommandExecutorForTest commandExecutor = new CommandExecutorForTest()
6157
FileSystemUtils fileSystemUtils = new FileSystemUtils()
6258

6359
@Test
@@ -121,12 +117,15 @@ class MailhogTest {
121117

122118
createMailhog().install()
123119

124-
assertThat(commandExecutor.actualCommands[0].trim()).isEqualTo(
125-
'helm repo add mailhog https://codecentric.github.io/helm-charts')
126-
assertThat(commandExecutor.actualCommands[1].trim()).startsWith(
127-
'helm upgrade -i mailhog mailhog/mailhog --create-namespace')
128-
assertThat(commandExecutor.actualCommands[1].trim()).contains('--version 5.0.1')
129-
assertThat(commandExecutor.actualCommands[1].trim()).contains('--namespace foo-monitoring')
120+
verify(deploymentStrategy).deployFeature(
121+
'https://codecentric.github.io/helm-charts',
122+
'mailhog',
123+
'mailhog',
124+
'5.0.1',
125+
'monitoring',
126+
'mailhog',
127+
temporaryYamlFile
128+
)
130129

131130
assertThat(parseActualYaml()).doesNotContainKey('resources')
132131
}
@@ -196,22 +195,14 @@ class MailhogTest {
196195
def helmConfig = ArgumentCaptor.forClass(Map)
197196
verify(airGappedUtils).mirrorHelmRepoToGit(helmConfig.capture())
198197
assertThat(helmConfig.value.chart).isEqualTo('mailhog')
199-
assertThat(helmConfig.value.repoURL).isEqualTo('https://mailhog')
198+
assertThat(helmConfig.value.repoURL).isEqualTo('https://codecentric.github.io/helm-charts')
200199
assertThat(helmConfig.value.version).isEqualTo('5.0.1')
201200
verify(deploymentStrategy).deployFeature(
202201
'http://scmm-scm-manager.default.svc.cluster.local/scm/repo/a/b',
203202
'mailhog', '.', '1.2.3','monitoring',
204203
'mailhog', temporaryYamlFile, DeploymentStrategy.RepoType.GIT)
205204
}
206205

207-
protected void assertMailhogInstalledImperativelyViaHelm() {
208-
209-
verify(deploymentStrategy).deployFeature(
210-
'https://mailhog',
211-
'mailhog', 'mailhog', '5.0.1', 'monitoring',
212-
'mailhog', temporaryYamlFile)
213-
}
214-
215206
private Mailhog createMailhog() {
216207
// We use the real FileSystemUtils and not a mock to make sure file editing works as expected
217208

‎src/test/groovy/com/cloudogu/gitops/features/VaultTest.groovy

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import com.cloudogu.gitops.config.Configuration
44
import com.cloudogu.gitops.features.deployment.DeploymentStrategy
55
import com.cloudogu.gitops.utils.*
66
import groovy.yaml.YamlSlurper
7-
import jakarta.inject.Provider
87
import org.junit.jupiter.api.Test
98
import org.mockito.ArgumentCaptor
109

@@ -29,10 +28,6 @@ class VaultTest {
2928
],
3029
scmm : [
3130
internal: true,
32-
protocol: 'https',
33-
host: 'abc',
34-
username: '',
35-
password: ''
3631
],
3732
features : [
3833
secrets : [
@@ -41,7 +36,7 @@ class VaultTest {
4136
mode: 'prod',
4237
helm: [
4338
chart : 'vault',
44-
repoURL: 'https://vault',
39+
repoURL: 'https://vault-reg',
4540
version: '42.23.0'
4641
]
4742
],
@@ -52,7 +47,6 @@ class VaultTest {
5247
],
5348
]
5449
CommandExecutorForTest helmCommands = new CommandExecutorForTest()
55-
CommandExecutorForTest k8sCommandExecutor = new CommandExecutorForTest()
5650
FileSystemUtils fileSystemUtils = new FileSystemUtils()
5751
DeploymentStrategy deploymentStrategy = mock(DeploymentStrategy)
5852
AirGappedUtils airGappedUtils = mock(AirGappedUtils)
@@ -179,7 +173,7 @@ class VaultTest {
179173
Path temporaryYamlFilePath = temporaryYamlFile.toPath()
180174

181175
verify(deploymentStrategy).deployFeature(
182-
'https://vault',
176+
'https://vault-reg',
183177
'vault',
184178
'vault',
185179
'42.23.0',
@@ -209,7 +203,7 @@ class VaultTest {
209203
def helmConfig = ArgumentCaptor.forClass(Map)
210204
verify(airGappedUtils).mirrorHelmRepoToGit(helmConfig.capture())
211205
assertThat(helmConfig.value.chart).isEqualTo('vault')
212-
assertThat(helmConfig.value.repoURL).isEqualTo('https://vault')
206+
assertThat(helmConfig.value.repoURL).isEqualTo('https://vault-reg')
213207
assertThat(helmConfig.value.version).isEqualTo('42.23.0')
214208
verify(deploymentStrategy).deployFeature(
215209
'http://scmm-scm-manager.default.svc.cluster.local/scm/repo/a/b',

0 commit comments

Comments
 (0)