Skip to content

Commit 04e5760

Browse files
committed
test: add tests for kube-version handling in install and upgrade commands
1 parent 9031f2f commit 04e5760

File tree

3 files changed

+52
-21
lines changed

3 files changed

+52
-21
lines changed

helm-java/src/test/java/com/marcnuri/helm/HelmInstallTest.java

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -230,18 +230,18 @@ void withDisableOpenApiValidation() {
230230
.hasFieldOrPropertyWithValue("status", "deployed");
231231
}
232232

233-
@Test
234-
void withKubeVersion() {
235-
final Release result = helm.install()
236-
.clientOnly()
237-
.debug()
238-
.withName("test-kube-version")
239-
.withKubeVersion("1.21.0")
240-
.call();
241-
assertThat(result)
242-
.returns("test-kube-version", Release::getName)
243-
.returns("deployed", Release::getStatus);
244-
}
233+
@Test
234+
void withKubeVersion() {
235+
final Release result = helm.install()
236+
.clientOnly()
237+
.debug()
238+
.withName("test-kube-version")
239+
.withKubeVersion("1.21.0")
240+
.call();
241+
assertThat(result)
242+
.returns("test-kube-version", Release::getName)
243+
.returns("deployed", Release::getStatus);
244+
}
245245

246246
@Test
247247
void skipCrdsWithoutCrdsInChart() {
@@ -322,7 +322,10 @@ void withInvalidKubeVersion() {
322322
.withKubeVersion("invalid");
323323
assertThatThrownBy(install::call)
324324
.isInstanceOf(IllegalStateException.class)
325-
.hasMessageContaining("Invalid semantic version");
325+
.message().containsAnyOf(
326+
"Invalid semantic version",
327+
"could not parse \"invalid\" as version"
328+
);
326329
}
327330

328331
// @Test

helm-java/src/test/java/com/marcnuri/helm/HelmKubernetesTest.java

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -570,6 +570,19 @@ void withInstall() {
570570
.returns("deployed", Release::getStatus);
571571
}
572572

573+
@Test
574+
void withInstallAndKubeVersion() {
575+
final Release result = helm.upgrade()
576+
.withKubeConfig(kubeConfigFile)
577+
.install()
578+
.withName("upgrade-with-kube-version")
579+
.withKubeVersion("v1.21.0")
580+
.call();
581+
assertThat(result)
582+
.returns("1", Release::getRevision)
583+
.returns("deployed", Release::getStatus);
584+
}
585+
573586
@Test
574587
void withPriorInstall() {
575588
helm.install().withName("upgrade-prior-install").withKubeConfig(kubeConfigFile).call();
@@ -732,6 +745,21 @@ void lowTimeout() {
732745
.message()
733746
.contains("context deadline exceeded");
734747
}
748+
749+
@Test
750+
void withInstallAndInvalidKubeVersion() {
751+
final UpgradeCommand upgrade = helm.upgrade()
752+
.withKubeConfig(kubeConfigFile)
753+
.install()
754+
.withName("upgrade-invalid-kube-version")
755+
.withKubeVersion("invalid");
756+
assertThatThrownBy(upgrade::call)
757+
.isInstanceOf(IllegalStateException.class)
758+
.message().containsAnyOf(
759+
"Invalid semantic version",
760+
"could not parse \"invalid\" as version"
761+
);
762+
}
735763
}
736764
}
737765
}

helm-java/src/test/java/com/marcnuri/helm/HelmTemplateTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,14 @@ void withInvalidValuesAndDebug() {
109109
.hasMessageContaining("name: release-name-local-chart-test");
110110
}
111111

112-
@Test
113-
void withKubeVersion() {
114-
final String result = helm.template()
115-
.withKubeVersion("1.21.0")
116-
.call();
117-
assertThat(result)
118-
.contains("name: release-name-local-chart-test");
119-
}
112+
@Test
113+
void withKubeVersion() {
114+
final String result = helm.template()
115+
.withKubeVersion("1.21.0")
116+
.call();
117+
assertThat(result)
118+
.contains("name: release-name-local-chart-test");
119+
}
120120

121121
@Test
122122
void skipCrdsWithoutCrdsInChart() {

0 commit comments

Comments
 (0)