Skip to content

Commit 0a382cc

Browse files
committed
Remove leftover expose properties in K8s/OCP configuration
These properties were deleted as part of #30977, but I forgot deleting them from the config objects.
1 parent cf2acb1 commit 0a382cc

File tree

5 files changed

+6
-26
lines changed

5 files changed

+6
-26
lines changed

extensions/kubernetes/openshift/deployment/src/main/resources/dev-templates/deploy.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
</select>
1515
</div>
1616
<div class="form-group">
17-
<label for="quarkus.openshift.expose">Expose</label>
18-
<select name="quarkus.openshift.expose" class="form-control">
17+
<label for="quarkus.openshift.route.expose">Expose</label>
18+
<select name="quarkus.openshift.route.expose" class="form-control">
1919
<option value="true">Yes</option>
2020
<option value="false">No</option>
2121
</select>
2222
</div>
2323
<div class="form-group">
24-
<label for="quarkus.openshift.expose">Allow untrusted SSL Certificates</label>
24+
<label for="quarkus.kubernetes-client.trust-certs">Allow untrusted SSL Certificates</label>
2525
<select name="quarkus.kubernetes-client.trust-certs" class="form-control">
2626
<option value="false" selected="selected">No</option>
2727
<option value="true">Yes</option>

extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ApplyOpenshiftRouteConfigurator.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@
66
public class ApplyOpenshiftRouteConfigurator extends Configurator<OpenshiftConfigFluent> {
77

88
private final RouteConfig routeConfig;
9-
private final boolean defaultExpose;
109

11-
public ApplyOpenshiftRouteConfigurator(RouteConfig routeConfig, boolean defaultExpose) {
10+
public ApplyOpenshiftRouteConfigurator(RouteConfig routeConfig) {
1211
this.routeConfig = routeConfig;
13-
this.defaultExpose = defaultExpose;
1412
}
1513

1614
@Override
1715
public void visit(OpenshiftConfigFluent config) {
18-
if (routeConfig.expose || defaultExpose) {
16+
if (routeConfig.expose) {
1917
var routeBuilder = config.editOrNewRoute();
2018
routeBuilder.withExpose(true);
2119
if (routeConfig.host.isPresent()) {

extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesConfig.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -261,15 +261,6 @@ public enum DeploymentResourceKind {
261261
@ConfigItem
262262
ResourcesConfig resources;
263263

264-
/**
265-
* If true, a Kubernetes Ingress will be created
266-
*
267-
* @deprecated Use the {@code quarkus.kubernetes.ingress.expose} instead
268-
*/
269-
@ConfigItem
270-
@Deprecated
271-
boolean expose;
272-
273264
/**
274265
* Ingress configuration
275266
*/

extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftConfig.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -299,15 +299,6 @@ public static enum DeploymentResourceKind {
299299
@ConfigItem
300300
Optional<String> containerName;
301301

302-
/**
303-
* If true, an Openshift Route will be created
304-
*
305-
* @deprecated Use the {@code quarkus.openshift.route.exposition} instead
306-
*/
307-
@ConfigItem
308-
@Deprecated
309-
boolean expose;
310-
311302
/**
312303
* Openshift route configuration
313304
*/

extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public List<ConfiguratorBuildItem> createConfigurators(ApplicationInfoBuildItem
139139
result.add(new ConfiguratorBuildItem(new AddPortToOpenshiftConfig(value)));
140140
});
141141

142-
result.add(new ConfiguratorBuildItem(new ApplyOpenshiftRouteConfigurator(config.route, config.expose)));
142+
result.add(new ConfiguratorBuildItem(new ApplyOpenshiftRouteConfigurator(config.route)));
143143

144144
// Handle remote debug configuration for container ports
145145
if (config.remoteDebug.enabled) {

0 commit comments

Comments
 (0)