Skip to content

Commit 7be3b8a

Browse files
authored
Merge pull request #32542 from gsmet/kubernetes-dev-ui
Various fixes for Kubernetes Dev UI 2
2 parents bbbf965 + 33f3cf3 commit 7be3b8a

File tree

3 files changed

+18
-7
lines changed

3 files changed

+18
-7
lines changed

extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/devconsole/KubernetesDevConsoleProcessor.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,14 @@ public static class GeneratedKubernetesResourceHandler implements BiConsumer<Map
3333
@Override
3434
public void accept(Map<String, byte[]> context, BuildResult buildResult) {
3535
// the idea here is to only display the content of the manifest file that will be selected for deployment
36+
var selectedTargetBI = buildResult
37+
.consumeOptional(SelectedKubernetesDeploymentTargetBuildItem.class);
38+
if (selectedTargetBI == null) {
39+
return;
40+
}
41+
3642
var generatedFilesBI = buildResult
3743
.consumeMulti(GeneratedKubernetesResourceBuildItem.class);
38-
var selectedTargetBI = buildResult
39-
.consume(SelectedKubernetesDeploymentTargetBuildItem.class);
4044
for (var bi : generatedFilesBI) {
4145
if (bi.getName().startsWith(selectedTargetBI.getEntry().getName())
4246
&& bi.getName().endsWith(".yml")) {

extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/devui/KubernetesDevUiProcessor.java

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ JsonRPCProvidersBuildItem createJsonRPCServiceForCache() {
3636
List<KubernetesDevConsoleProcessor.Manifest> manifests = holder.getManifests();
3737
// Avoid relying on databind.
3838
Map<String, String> map = new LinkedHashMap<>();
39-
System.out.println("manifests are " + manifests);
4039
for (KubernetesDevConsoleProcessor.Manifest manifest : manifests) {
4140
map.put(manifest.getName(), manifest.getContent());
4241
}

extensions/kubernetes/vanilla/deployment/src/main/resources/dev-ui/qwc-kubernetes-manifest.js

+12-4
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export class QwcKubernetesManifest extends observeState(LitElement) {
4747
m.set(key, data[key]);
4848
}
4949
this._manifests = m;
50-
this._message = "No manifests generated";
50+
this._message = "No manifests generated.";
5151
});
5252
}
5353

@@ -57,6 +57,14 @@ export class QwcKubernetesManifest extends observeState(LitElement) {
5757
*/
5858
render() {
5959
if (this._manifests) {
60+
if (this._manifests.size == 0) {
61+
return html`
62+
<div style="color: var(--lumo-secondary-text-color);width: 95%;" >
63+
<div>${this._message}</div>
64+
</div>
65+
`;
66+
}
67+
6068
return html`
6169
<vaadin-tabsheet>
6270
<vaadin-tabs slot="tabs">
@@ -65,14 +73,14 @@ export class QwcKubernetesManifest extends observeState(LitElement) {
6573
${this._renderContent()}
6674
</vaadin-tabsheet>
6775
`;
68-
}else{
69-
return html`
76+
}
77+
78+
return html`
7079
<div style="color: var(--lumo-secondary-text-color);width: 95%;" >
7180
<div>${this._message}</div>
7281
<vaadin-progress-bar indeterminate></vaadin-progress-bar>
7382
</div>
7483
`;
75-
}
7684
}
7785

7886
_renderFileName(){

0 commit comments

Comments
 (0)