diff --git a/CHANGELOG.md b/CHANGELOG.md index bb1e5af2eb..ee2690293d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,6 +45,7 @@ Usage: * Fix #1302: Port volume-permission maven integration tests + docs to gradle * Fix #1303: Add gradle integration test and docs for AutoTLSEnricher * Fix #1308: Add documentation for DeploymentConfigEnricher +* Fix #1309: Remove ExposeEnricher from profiles and documentation * Fix #1310: Add documentation + gradle integration test for ImageChangeTriggerEnricher * Fix #1311: Add documentation for OpenShift ProjectEnricher * Fix #1312: Add documentation + gradle integration test for RouteEnricher diff --git a/gradle-plugin/doc/src/main/asciidoc/inc/_profiles.adoc b/gradle-plugin/doc/src/main/asciidoc/inc/_profiles.adoc index b12e0196c2..9a9110854d 100644 --- a/gradle-plugin/doc/src/main/asciidoc/inc/_profiles.adoc +++ b/gradle-plugin/doc/src/main/asciidoc/inc/_profiles.adoc @@ -226,7 +226,6 @@ A profile can also extend another profile to avoid repetition e.g of generators - jkube-controller-from-configuration - jkube-openshift-deploymentconfig - jkube-openshift-project - - jkube-openshift-service-expose - jkube-openshift-route ---- diff --git a/gradle-plugin/it/src/it/autotls/expected/openshift.yml b/gradle-plugin/it/src/it/autotls/expected/openshift.yml index d705573e45..9f674464f6 100644 --- a/gradle-plugin/it/src/it/autotls/expected/openshift.yml +++ b/gradle-plugin/it/src/it/autotls/expected/openshift.yml @@ -13,7 +13,6 @@ items: app.openshift.io/vcs-uri: "@ignore@" jkube.io/git-commit: "@ignore@" labels: - expose: "true" app: autotls provider: jkube version: "@ignore@" diff --git a/gradle-plugin/it/src/it/configmap/expected/kubernetes.yml b/gradle-plugin/it/src/it/configmap/expected/kubernetes.yml index 188ccb48a8..6efb6fb017 100644 --- a/gradle-plugin/it/src/it/configmap/expected/kubernetes.yml +++ b/gradle-plugin/it/src/it/configmap/expected/kubernetes.yml @@ -25,7 +25,6 @@ items: jkube.io/git-branch: "@ignore@" prometheus.io/port: "9779" labels: - expose: "true" provider: jkube app: configmap version: "@ignore@" diff --git a/gradle-plugin/it/src/it/configmap/expected/openshift.yml b/gradle-plugin/it/src/it/configmap/expected/openshift.yml index 403925099f..ea0b03a599 100644 --- a/gradle-plugin/it/src/it/configmap/expected/openshift.yml +++ b/gradle-plugin/it/src/it/configmap/expected/openshift.yml @@ -25,7 +25,6 @@ items: jkube.io/git-branch: "@ignore@" prometheus.io/port: "9779" labels: - expose: "true" provider: jkube app: configmap version: "@ignore@" diff --git a/gradle-plugin/it/src/it/dockerfile-simple/expected/kubernetes.yml b/gradle-plugin/it/src/it/dockerfile-simple/expected/kubernetes.yml index 362143e662..79e3ce8a60 100644 --- a/gradle-plugin/it/src/it/dockerfile-simple/expected/kubernetes.yml +++ b/gradle-plugin/it/src/it/dockerfile-simple/expected/kubernetes.yml @@ -10,7 +10,6 @@ items: jkube.io/git-commit: "@ignore@" jkube.io/git-branch: "@ignore@" labels: - expose: "true" app: dockerfile-simple provider: jkube version: "@ignore@" diff --git a/gradle-plugin/it/src/it/dockerfile-simple/expected/openshift.yml b/gradle-plugin/it/src/it/dockerfile-simple/expected/openshift.yml index 6bd0100cbd..298cbce702 100644 --- a/gradle-plugin/it/src/it/dockerfile-simple/expected/openshift.yml +++ b/gradle-plugin/it/src/it/dockerfile-simple/expected/openshift.yml @@ -10,7 +10,6 @@ items: jkube.io/git-commit: "@ignore@" jkube.io/git-branch: "@ignore@" labels: - expose: "true" app: dockerfile-simple provider: jkube version: "@ignore@" diff --git a/gradle-plugin/it/src/it/groovy-dsl-image/expected/kubernetes.yml b/gradle-plugin/it/src/it/groovy-dsl-image/expected/kubernetes.yml index a58c4edefb..41df331490 100644 --- a/gradle-plugin/it/src/it/groovy-dsl-image/expected/kubernetes.yml +++ b/gradle-plugin/it/src/it/groovy-dsl-image/expected/kubernetes.yml @@ -10,7 +10,6 @@ items: jkube.io/git-commit: "@ignore@" jkube.io/git-branch: "@ignore@" labels: - expose: "true" app: groovy-dsl-image provider: jkube version: "@ignore@" diff --git a/gradle-plugin/it/src/it/ingress/expected/groovy-dsl-config/kubernetes.yml b/gradle-plugin/it/src/it/ingress/expected/groovy-dsl-config/kubernetes.yml index cad8129d6f..7a5e700c3a 100644 --- a/gradle-plugin/it/src/it/ingress/expected/groovy-dsl-config/kubernetes.yml +++ b/gradle-plugin/it/src/it/ingress/expected/groovy-dsl-config/kubernetes.yml @@ -10,7 +10,6 @@ items: jkube.io/git-commit: "@ignore@" jkube.io/git-branch: "@ignore@" labels: - expose: "true" app: ingress provider: jkube version: "@ignore@" diff --git a/gradle-plugin/it/src/it/ingress/expected/zero-config-extensionsv1beta1-enricher-config/kubernetes.yml b/gradle-plugin/it/src/it/ingress/expected/zero-config-extensionsv1beta1-enricher-config/kubernetes.yml index e978842ace..53f25fef9a 100644 --- a/gradle-plugin/it/src/it/ingress/expected/zero-config-extensionsv1beta1-enricher-config/kubernetes.yml +++ b/gradle-plugin/it/src/it/ingress/expected/zero-config-extensionsv1beta1-enricher-config/kubernetes.yml @@ -10,7 +10,6 @@ items: jkube.io/git-commit: "@ignore@" jkube.io/git-branch: "@ignore@" labels: - expose: "true" app: ingress provider: jkube version: "@ignore@" diff --git a/gradle-plugin/it/src/it/ingress/expected/zero-config-extensionsv1beta1-host-enricher-config/kubernetes.yml b/gradle-plugin/it/src/it/ingress/expected/zero-config-extensionsv1beta1-host-enricher-config/kubernetes.yml index 843a34aa33..110fc31b6e 100644 --- a/gradle-plugin/it/src/it/ingress/expected/zero-config-extensionsv1beta1-host-enricher-config/kubernetes.yml +++ b/gradle-plugin/it/src/it/ingress/expected/zero-config-extensionsv1beta1-host-enricher-config/kubernetes.yml @@ -10,7 +10,6 @@ items: jkube.io/git-commit: "@ignore@" jkube.io/git-branch: "@ignore@" labels: - expose: "true" app: ingress provider: jkube version: "@ignore@" diff --git a/gradle-plugin/it/src/it/ingress/expected/zero-config-host-enricher-config/kubernetes.yml b/gradle-plugin/it/src/it/ingress/expected/zero-config-host-enricher-config/kubernetes.yml index 773a64e520..fcf9702a78 100644 --- a/gradle-plugin/it/src/it/ingress/expected/zero-config-host-enricher-config/kubernetes.yml +++ b/gradle-plugin/it/src/it/ingress/expected/zero-config-host-enricher-config/kubernetes.yml @@ -10,7 +10,6 @@ items: jkube.io/git-commit: "@ignore@" jkube.io/git-branch: "@ignore@" labels: - expose: "true" app: ingress provider: jkube version: "@ignore@" diff --git a/gradle-plugin/it/src/it/ingress/expected/zero-config-no-host/kubernetes.yml b/gradle-plugin/it/src/it/ingress/expected/zero-config-no-host/kubernetes.yml index 8fc4626e87..0f79e29cb1 100644 --- a/gradle-plugin/it/src/it/ingress/expected/zero-config-no-host/kubernetes.yml +++ b/gradle-plugin/it/src/it/ingress/expected/zero-config-no-host/kubernetes.yml @@ -10,7 +10,6 @@ items: jkube.io/git-commit: "@ignore@" jkube.io/git-branch: "@ignore@" labels: - expose: "true" app: ingress provider: jkube version: "@ignore@" diff --git a/gradle-plugin/it/src/it/metadata/expected/kubernetes-replicaset-controller.yml b/gradle-plugin/it/src/it/metadata/expected/kubernetes-replicaset-controller.yml index 2b699da6db..5f38a1f78e 100644 --- a/gradle-plugin/it/src/it/metadata/expected/kubernetes-replicaset-controller.yml +++ b/gradle-plugin/it/src/it/metadata/expected/kubernetes-replicaset-controller.yml @@ -26,7 +26,6 @@ items: jkube.io/git-branch: "@ignore@" keyinservice: valueinservice labels: - expose: "true" keyinall: valueinall keyinservice: valueinservice app: metadata diff --git a/gradle-plugin/it/src/it/metadata/expected/kubernetes.yml b/gradle-plugin/it/src/it/metadata/expected/kubernetes.yml index 39af0aeb53..6df2ca9b6a 100644 --- a/gradle-plugin/it/src/it/metadata/expected/kubernetes.yml +++ b/gradle-plugin/it/src/it/metadata/expected/kubernetes.yml @@ -26,7 +26,6 @@ items: jkube.io/git-branch: "@ignore@" keyinservice: valueinservice labels: - expose: "true" keyinall: valueinall keyinservice: valueinservice app: metadata diff --git a/gradle-plugin/it/src/it/metadata/expected/openshift.yml b/gradle-plugin/it/src/it/metadata/expected/openshift.yml index 331c5fcb0d..0db745303a 100644 --- a/gradle-plugin/it/src/it/metadata/expected/openshift.yml +++ b/gradle-plugin/it/src/it/metadata/expected/openshift.yml @@ -28,7 +28,6 @@ items: app.openshift.io/vcs-uri: "@ignore@" jkube.io/git-commit: "@ignore@" labels: - expose: "true" keyinall: valueinall keyinservice: valueinservice app: metadata diff --git a/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/liveness-readiness/kubernetes.yml b/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/liveness-readiness/kubernetes.yml index 146920052b..d05bf5e992 100644 --- a/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/liveness-readiness/kubernetes.yml +++ b/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/liveness-readiness/kubernetes.yml @@ -13,7 +13,6 @@ items: jkube.io/git-url: "@ignore@" jkube.io/git-commit: "@ignore@" labels: - expose: "true" app: probes-groovy-dsl-config provider: jkube version: "@ignore@" diff --git a/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/liveness-readiness/openshift.yml b/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/liveness-readiness/openshift.yml index 44f6e98537..c27fa1e02d 100644 --- a/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/liveness-readiness/openshift.yml +++ b/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/liveness-readiness/openshift.yml @@ -15,7 +15,6 @@ items: app.openshift.io/vcs-uri: "@ignore@" jkube.io/git-commit: "@ignore@" labels: - expose: "true" app: probes-groovy-dsl-config provider: jkube version: "@ignore@" diff --git a/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/none/kubernetes.yml b/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/none/kubernetes.yml index 59c54fed0d..186d8aee69 100644 --- a/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/none/kubernetes.yml +++ b/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/none/kubernetes.yml @@ -13,7 +13,6 @@ items: jkube.io/git-url: "@ignore@" jkube.io/git-commit: "@ignore@" labels: - expose: "true" app: probes-groovy-dsl-config provider: jkube version: "@ignore@" diff --git a/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/none/openshift.yml b/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/none/openshift.yml index e9ddf221eb..05214844b2 100644 --- a/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/none/openshift.yml +++ b/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/none/openshift.yml @@ -15,7 +15,6 @@ items: app.openshift.io/vcs-uri: "@ignore@" jkube.io/git-commit: "@ignore@" labels: - expose: "true" app: probes-groovy-dsl-config provider: jkube version: "@ignore@" diff --git a/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/startup/kubernetes.yml b/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/startup/kubernetes.yml index 9b5df42f37..3ec27560a7 100644 --- a/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/startup/kubernetes.yml +++ b/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/startup/kubernetes.yml @@ -13,7 +13,6 @@ items: jkube.io/git-url: "@ignore@" jkube.io/git-commit: "@ignore@" labels: - expose: "true" app: probes-groovy-dsl-config provider: jkube version: "@ignore@" diff --git a/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/startup/openshift.yml b/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/startup/openshift.yml index ebe922eaca..b5a962c5d9 100644 --- a/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/startup/openshift.yml +++ b/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/startup/openshift.yml @@ -15,7 +15,6 @@ items: app.openshift.io/vcs-uri: "@ignore@" jkube.io/git-commit: "@ignore@" labels: - expose: "true" app: probes-groovy-dsl-config provider: jkube version: "@ignore@" diff --git a/gradle-plugin/it/src/it/project-label/expected/app/kubernetes.yml b/gradle-plugin/it/src/it/project-label/expected/app/kubernetes.yml index 3025262e14..6036b15e6f 100644 --- a/gradle-plugin/it/src/it/project-label/expected/app/kubernetes.yml +++ b/gradle-plugin/it/src/it/project-label/expected/app/kubernetes.yml @@ -10,7 +10,6 @@ items: jkube.io/git-commit: "@ignore@" jkube.io/git-branch: "@ignore@" labels: - expose: "true" app: custom-app provider: jkube version: "@ignore@" diff --git a/gradle-plugin/it/src/it/project-label/expected/app/openshift.yml b/gradle-plugin/it/src/it/project-label/expected/app/openshift.yml index d09b73a86f..884bf83402 100644 --- a/gradle-plugin/it/src/it/project-label/expected/app/openshift.yml +++ b/gradle-plugin/it/src/it/project-label/expected/app/openshift.yml @@ -12,7 +12,6 @@ items: jkube.io/git-commit: "@ignore@" jkube.io/git-branch: "@ignore@" labels: - expose: "true" app: custom-app provider: jkube version: "@ignore@" diff --git a/gradle-plugin/it/src/it/project-label/expected/custom/kubernetes.yml b/gradle-plugin/it/src/it/project-label/expected/custom/kubernetes.yml index b0cb30141f..3adb49e0d0 100644 --- a/gradle-plugin/it/src/it/project-label/expected/custom/kubernetes.yml +++ b/gradle-plugin/it/src/it/project-label/expected/custom/kubernetes.yml @@ -10,7 +10,6 @@ items: jkube.io/git-commit: "@ignore@" jkube.io/git-branch: "@ignore@" labels: - expose: "true" provider: custom-provider project: project-label version: "@ignore@" diff --git a/gradle-plugin/it/src/it/project-label/expected/custom/openshift.yml b/gradle-plugin/it/src/it/project-label/expected/custom/openshift.yml index 413be286e5..f9a6a91e4a 100644 --- a/gradle-plugin/it/src/it/project-label/expected/custom/openshift.yml +++ b/gradle-plugin/it/src/it/project-label/expected/custom/openshift.yml @@ -12,7 +12,6 @@ items: jkube.io/git-commit: "@ignore@" jkube.io/git-branch: "@ignore@" labels: - expose: "true" provider: custom-provider project: project-label version: "@ignore@" diff --git a/gradle-plugin/it/src/it/project-label/expected/default/kubernetes.yml b/gradle-plugin/it/src/it/project-label/expected/default/kubernetes.yml index a390415cc6..4238aff8a3 100644 --- a/gradle-plugin/it/src/it/project-label/expected/default/kubernetes.yml +++ b/gradle-plugin/it/src/it/project-label/expected/default/kubernetes.yml @@ -10,7 +10,6 @@ items: jkube.io/git-commit: "@ignore@" jkube.io/git-branch: "@ignore@" labels: - expose: "true" app: "project-label" provider: "jkube" version: "@ignore@" diff --git a/gradle-plugin/it/src/it/project-label/expected/default/openshift.yml b/gradle-plugin/it/src/it/project-label/expected/default/openshift.yml index 6728e4919e..422119567f 100644 --- a/gradle-plugin/it/src/it/project-label/expected/default/openshift.yml +++ b/gradle-plugin/it/src/it/project-label/expected/default/openshift.yml @@ -12,7 +12,6 @@ items: jkube.io/git-commit: "@ignore@" jkube.io/git-branch: "@ignore@" labels: - expose: "true" app: "project-label" provider: "jkube" version: "@ignore@" diff --git a/gradle-plugin/it/src/it/project-label/expected/group/kubernetes.yml b/gradle-plugin/it/src/it/project-label/expected/group/kubernetes.yml index 1427996910..fb75e14f72 100644 --- a/gradle-plugin/it/src/it/project-label/expected/group/kubernetes.yml +++ b/gradle-plugin/it/src/it/project-label/expected/group/kubernetes.yml @@ -10,7 +10,6 @@ items: jkube.io/git-commit: "@ignore@" jkube.io/git-branch: "@ignore@" labels: - expose: "true" app: "project-label" provider: "jkube" version: "@ignore@" diff --git a/gradle-plugin/it/src/it/project-label/expected/group/openshift.yml b/gradle-plugin/it/src/it/project-label/expected/group/openshift.yml index f2635b8913..55d43362f3 100644 --- a/gradle-plugin/it/src/it/project-label/expected/group/openshift.yml +++ b/gradle-plugin/it/src/it/project-label/expected/group/openshift.yml @@ -12,7 +12,6 @@ items: jkube.io/git-commit: "@ignore@" jkube.io/git-branch: "@ignore@" labels: - expose: "true" app: "project-label" provider: "jkube" version: "@ignore@" diff --git a/gradle-plugin/it/src/it/project-label/expected/version/kubernetes.yml b/gradle-plugin/it/src/it/project-label/expected/version/kubernetes.yml index b974d9134b..4cdf57ed8a 100644 --- a/gradle-plugin/it/src/it/project-label/expected/version/kubernetes.yml +++ b/gradle-plugin/it/src/it/project-label/expected/version/kubernetes.yml @@ -10,7 +10,6 @@ items: jkube.io/git-commit: "@ignore@" jkube.io/git-branch: "@ignore@" labels: - expose: "true" app: "project-label" provider: "jkube" version: "0.1.0" diff --git a/gradle-plugin/it/src/it/project-label/expected/version/openshift.yml b/gradle-plugin/it/src/it/project-label/expected/version/openshift.yml index 5fb89c54ae..de71d6d73e 100644 --- a/gradle-plugin/it/src/it/project-label/expected/version/openshift.yml +++ b/gradle-plugin/it/src/it/project-label/expected/version/openshift.yml @@ -12,7 +12,6 @@ items: jkube.io/git-commit: "@ignore@" jkube.io/git-branch: "@ignore@" labels: - expose: "true" app: "project-label" provider: "jkube" version: "0.1.0" diff --git a/gradle-plugin/it/src/it/route/expected/routeDisabled/openshift.yml b/gradle-plugin/it/src/it/route/expected/routeDisabled/openshift.yml index 2b4be835b9..6811a9a613 100644 --- a/gradle-plugin/it/src/it/route/expected/routeDisabled/openshift.yml +++ b/gradle-plugin/it/src/it/route/expected/routeDisabled/openshift.yml @@ -12,7 +12,6 @@ items: jkube.io/git-commit: "@ignore@" jkube.io/git-branch: "@ignore@" labels: - expose: "true" app: route provider: jkube version: "@ignore@" diff --git a/gradle-plugin/it/src/it/route/expected/routeEnabled/openshift.yml b/gradle-plugin/it/src/it/route/expected/routeEnabled/openshift.yml index fb2af7e5df..56ffcb2729 100644 --- a/gradle-plugin/it/src/it/route/expected/routeEnabled/openshift.yml +++ b/gradle-plugin/it/src/it/route/expected/routeEnabled/openshift.yml @@ -12,7 +12,6 @@ items: jkube.io/git-commit: "@ignore@" jkube.io/git-branch: "@ignore@" labels: - expose: "true" app: route provider: jkube version: "@ignore@" diff --git a/gradle-plugin/it/src/it/service/expected/kubernetes.yml b/gradle-plugin/it/src/it/service/expected/kubernetes.yml index 8737e6c387..8863432220 100644 --- a/gradle-plugin/it/src/it/service/expected/kubernetes.yml +++ b/gradle-plugin/it/src/it/service/expected/kubernetes.yml @@ -10,7 +10,6 @@ items: jkube.io/git-commit: "@ignore@" jkube.io/git-branch: "@ignore@" labels: - expose: "true" app: service provider: jkube version: "@ignore@" diff --git a/gradle-plugin/it/src/it/service/expected/openshift.yml b/gradle-plugin/it/src/it/service/expected/openshift.yml index 650f31c61e..cc3cfa0c77 100644 --- a/gradle-plugin/it/src/it/service/expected/openshift.yml +++ b/gradle-plugin/it/src/it/service/expected/openshift.yml @@ -12,7 +12,6 @@ items: jkube.io/git-commit: "@ignore@" jkube.io/git-branch: "@ignore@" labels: - expose: "true" app: service provider: jkube version: "@ignore@" diff --git a/gradle-plugin/it/src/it/spring-boot-with-fragment/expected/kubernetes.yml b/gradle-plugin/it/src/it/spring-boot-with-fragment/expected/kubernetes.yml index c54c39736c..fbb562592a 100644 --- a/gradle-plugin/it/src/it/spring-boot-with-fragment/expected/kubernetes.yml +++ b/gradle-plugin/it/src/it/spring-boot-with-fragment/expected/kubernetes.yml @@ -13,7 +13,6 @@ items: jkube.io/git-url: "@ignore@" jkube.io/git-commit: "@ignore@" labels: - expose: "true" app: spring-boot-with-fragment provider: jkube version: "@ignore@" diff --git a/gradle-plugin/it/src/it/volume-permission/expected/custom-storageclass/kubernetes.yml b/gradle-plugin/it/src/it/volume-permission/expected/custom-storageclass/kubernetes.yml index 26c26d9b17..984ae80f87 100644 --- a/gradle-plugin/it/src/it/volume-permission/expected/custom-storageclass/kubernetes.yml +++ b/gradle-plugin/it/src/it/volume-permission/expected/custom-storageclass/kubernetes.yml @@ -14,7 +14,6 @@ items: app: volume-permission provider: jkube version: "@ignore@" - expose: "true" group: org.eclipse.jkube.devops.apps name: jkube-docker-registry spec: diff --git a/gradle-plugin/it/src/it/volume-permission/expected/custom-storageclass/openshift.yml b/gradle-plugin/it/src/it/volume-permission/expected/custom-storageclass/openshift.yml index 49db7896f1..cf3c97e487 100644 --- a/gradle-plugin/it/src/it/volume-permission/expected/custom-storageclass/openshift.yml +++ b/gradle-plugin/it/src/it/volume-permission/expected/custom-storageclass/openshift.yml @@ -16,7 +16,6 @@ items: app: volume-permission provider: jkube version: "@ignore@" - expose: "true" group: org.eclipse.jkube.devops.apps name: jkube-docker-registry spec: diff --git a/gradle-plugin/it/src/it/volume-permission/expected/default/kubernetes.yml b/gradle-plugin/it/src/it/volume-permission/expected/default/kubernetes.yml index 385bda8b44..f9d849fd63 100644 --- a/gradle-plugin/it/src/it/volume-permission/expected/default/kubernetes.yml +++ b/gradle-plugin/it/src/it/volume-permission/expected/default/kubernetes.yml @@ -14,7 +14,6 @@ items: app: volume-permission provider: jkube version: "@ignore@" - expose: "true" group: org.eclipse.jkube.devops.apps name: jkube-docker-registry spec: diff --git a/gradle-plugin/it/src/it/volume-permission/expected/default/openshift.yml b/gradle-plugin/it/src/it/volume-permission/expected/default/openshift.yml index 64a3ec7b59..ea3aa9268f 100644 --- a/gradle-plugin/it/src/it/volume-permission/expected/default/openshift.yml +++ b/gradle-plugin/it/src/it/volume-permission/expected/default/openshift.yml @@ -16,7 +16,6 @@ items: app: volume-permission provider: jkube version: "@ignore@" - expose: "true" group: org.eclipse.jkube.devops.apps name: jkube-docker-registry spec: diff --git a/gradle-plugin/kubernetes/src/main/resources/META-INF/jkube/profiles-default.yml b/gradle-plugin/kubernetes/src/main/resources/META-INF/jkube/profiles-default.yml index c072cf1483..1b8312e5f1 100644 --- a/gradle-plugin/kubernetes/src/main/resources/META-INF/jkube/profiles-default.yml +++ b/gradle-plugin/kubernetes/src/main/resources/META-INF/jkube/profiles-default.yml @@ -41,7 +41,6 @@ - jkube-secret-file # Route exposure - - jkube-openshift-service-expose - jkube-openshift-route - jkube-openshift-project @@ -131,7 +130,6 @@ - jkube-controller-from-configuration - jkube-openshift-deploymentconfig - jkube-openshift-project - - jkube-openshift-service-expose - jkube-openshift-route # Only dependencies, no build, use other resources raw - name: aggregate @@ -151,5 +149,4 @@ generator: excludes: [] enricher: - excludes: - - jkube-openshift-service-expose + excludes: [] diff --git a/gradle-plugin/openshift/src/main/resources/META-INF/jkube/profiles-default.yml b/gradle-plugin/openshift/src/main/resources/META-INF/jkube/profiles-default.yml index a1c6cf54a4..94aebf4ff5 100644 --- a/gradle-plugin/openshift/src/main/resources/META-INF/jkube/profiles-default.yml +++ b/gradle-plugin/openshift/src/main/resources/META-INF/jkube/profiles-default.yml @@ -55,8 +55,6 @@ - jkube-healthcheck-webapp - jkube-healthcheck-micronaut - # Route exposure - - jkube-openshift-service-expose # DeploymentConfigEnricher converts Deployment into DeploymentConfig - jkube-openshift-deploymentconfig - jkube-openshift-route @@ -146,5 +144,4 @@ generator: excludes: [] enricher: - excludes: - - jkube-openshift-service-expose + excludes: [] diff --git a/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/KubernetesHelper.java b/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/KubernetesHelper.java index 54a17947e7..f13b247c19 100644 --- a/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/KubernetesHelper.java +++ b/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/KubernetesHelper.java @@ -81,7 +81,6 @@ import io.fabric8.kubernetes.client.dsl.LogWatch; import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation; import io.fabric8.kubernetes.client.dsl.PodResource; -import io.fabric8.kubernetes.client.dsl.Resource; import io.fabric8.openshift.api.model.Build; import io.fabric8.openshift.api.model.DeploymentConfig; import io.fabric8.openshift.api.model.DeploymentConfigSpec; @@ -756,39 +755,6 @@ public static boolean isExposeService(Service service) { return expose != null && expose.equalsIgnoreCase("true"); } - public static String getServiceExposeUrl(KubernetesClient kubernetes, String namespace, Collection resources, long serviceUrlWaitTimeSeconds, String exposeServiceAnnotationKey) throws InterruptedException { - for (HasMetadata entity : resources) { - if (entity instanceof Service) { - Service service = (Service) entity; - String name = KubernetesHelper.getName(service); - Resource serviceResource = kubernetes.services().inNamespace(namespace).withName(name); - String url = pollServiceForExposeUrl(serviceUrlWaitTimeSeconds, service, serviceResource, exposeServiceAnnotationKey); - - // let's not wait for other services - serviceUrlWaitTimeSeconds = 1; - if (StringUtils.isNotBlank(url) && url.startsWith("http")) { - return url; - } - } - } - return null; - } - - private static String pollServiceForExposeUrl(long serviceUrlWaitTimeSeconds, Service service, Resource serviceResource, String exposeSvcAnnotationKey) throws InterruptedException { - String url = null; - // let's wait a little while until there is a service URL in case the exposecontroller is running slow - for (int i = 0; i < serviceUrlWaitTimeSeconds; i++) { - if (i > 0) { - Thread.sleep(1000); - } - url = KubernetesHelper.getAnnotationValue(serviceResource.get(), exposeSvcAnnotationKey); - if (StringUtils.isNotBlank(url) || !KubernetesHelper.isExposeService(service)) { - break; - } - } - return url; - } - public static String getAnnotationValue(HasMetadata item, String annotationKey) { if (item != null) { return getOrCreateAnnotations(item).get(annotationKey); diff --git a/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/util/KubernetesHelperTest.java b/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/util/KubernetesHelperTest.java index 3785858a03..e6f4c41ca5 100644 --- a/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/util/KubernetesHelperTest.java +++ b/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/util/KubernetesHelperTest.java @@ -284,67 +284,6 @@ public void testConvertToEnvVarList() { } - @Test - public void testGetServiceExposeUrlReturnsUrlFromAnnotation(@Mocked KubernetesClient kubernetesClient, @Mocked Resource svcResource) throws InterruptedException { - // Given - Service svc = new ServiceBuilder().withNewMetadata().withName("svc1").endMetadata().build(); - Set entities = new HashSet<>(); - entities.add(svc); - new Expectations() {{ - kubernetesClient.services().inNamespace("ns1").withName("svc1"); - result = svcResource; - svcResource.get(); - result = new ServiceBuilder() - .withNewMetadata() - .withName("svc1") - .addToAnnotations("exposeUrl", "http://example.com") - .endMetadata() - .build(); - }}; - - // When - String result = KubernetesHelper.getServiceExposeUrl(kubernetesClient, "ns1", entities, 3, "exposeUrl"); - - // Then - assertEquals("http://example.com", result); - new Verifications() {{ - kubernetesClient.services().inNamespace("ns1").withName("svc1"); - times = 1; - svcResource.get(); - times = 1; - }}; - } - - @Test - public void testGetServiceExposeUrlReturnsNull(@Mocked KubernetesClient kubernetesClient, @Mocked Resource svcResource) throws InterruptedException { - // Given - Service svc = new ServiceBuilder().withNewMetadata().withName("svc1").endMetadata().build(); - Set entities = new HashSet<>(); - entities.add(svc); - new Expectations() {{ - kubernetesClient.services().inNamespace("ns1").withName("svc1"); - result = svcResource; - svcResource.get(); - result = new ServiceBuilder() - .withNewMetadata() - .withName("svc1") - .endMetadata() - .build(); - }}; - - // When - String result = KubernetesHelper.getServiceExposeUrl(kubernetesClient, "ns1", entities, 1, "exposeUrl"); - - // Then - assertNull(result); - new Verifications() {{ - kubernetesClient.services().inNamespace("ns1").withName("svc1"); - times = 1; - svcResource.get(); - times = 1; - }}; - } - @Test public void testGetFullyQualifiedApiGroupWithKind() { // Given diff --git a/jkube-kit/config/service/src/main/java/org/eclipse/jkube/kit/config/service/ApplyService.java b/jkube-kit/config/service/src/main/java/org/eclipse/jkube/kit/config/service/ApplyService.java index e14fe44731..c539e260b8 100644 --- a/jkube-kit/config/service/src/main/java/org/eclipse/jkube/kit/config/service/ApplyService.java +++ b/jkube-kit/config/service/src/main/java/org/eclipse/jkube/kit/config/service/ApplyService.java @@ -33,7 +33,6 @@ import org.eclipse.jkube.kit.common.util.OpenshiftHelper; import org.eclipse.jkube.kit.common.util.ResourceUtil; import org.eclipse.jkube.kit.common.util.UserConfigurationCompare; -import org.eclipse.jkube.kit.config.resource.JKubeAnnotations; import org.eclipse.jkube.kit.config.service.kubernetes.KubernetesClientUtil; import com.fasterxml.jackson.core.JsonProcessingException; @@ -1351,17 +1350,9 @@ public void setRollingUpgradePreserveScale(boolean rollingUpgradePreserveScale) } public void applyEntities(String fileName, Collection entities, KitLogger serviceLogger, - long serviceUrlWaitTimeSeconds) throws InterruptedException { + long serviceUrlWaitTimeSeconds) { applyStandardEntities(fileName, getK8sListWithNamespaceFirst(entities)); - logExposeServiceUrl(entities, serviceLogger, serviceUrlWaitTimeSeconds); - } - - private void logExposeServiceUrl(Collection entities, KitLogger serviceLogger, long serviceUrlWaitTimeSeconds) throws InterruptedException { - String url = KubernetesHelper.getServiceExposeUrl(kubernetesClient, namespace, entities, serviceUrlWaitTimeSeconds, JKubeAnnotations.SERVICE_EXPOSE_URL.value()); - if (url != null) { - serviceLogger.info("ExposeController Service URL: %s", url); - } } private void applyStandardEntities(String fileName, List entities) { diff --git a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/IngressEnricher.java b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/IngressEnricher.java index e8685b3fd2..8f7d067061 100644 --- a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/IngressEnricher.java +++ b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/IngressEnricher.java @@ -139,6 +139,9 @@ public void visit(io.fabric8.kubernetes.api.model.networking.v1.IngressBuilder b * @return true if we should create an Ingress for this service. */ static boolean shouldCreateExternalURLForService(ServiceBuilder service, KitLogger log) { + if (service.buildMetadata() == null) { + return false; + } String serviceName = service.buildMetadata().getName(); ServiceSpec spec = service.buildSpec(); if (spec != null && !isKubernetesSystemService(serviceName)) { diff --git a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/NetworkingV1IngressGenerator.java b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/NetworkingV1IngressGenerator.java index d0fc723eac..e2a36f2112 100644 --- a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/NetworkingV1IngressGenerator.java +++ b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/NetworkingV1IngressGenerator.java @@ -47,7 +47,6 @@ import static org.eclipse.jkube.enricher.generic.IngressEnricher.hasIngress; import static org.eclipse.jkube.enricher.generic.IngressEnricher.resolveIngressHost; import static org.eclipse.jkube.enricher.generic.IngressEnricher.shouldCreateExternalURLForService; -import static org.eclipse.jkube.kit.enricher.api.util.KubernetesResourceUtil.isExposedService; public class NetworkingV1IngressGenerator { private NetworkingV1IngressGenerator() { } @@ -57,7 +56,7 @@ protected static Ingress generate(KubernetesListBuilder listBuilder, ServiceBuil if (serviceMetadata == null) { log.info("No Metadata for service! "); } - if (isExposedService(serviceMetadata) && shouldCreateExternalURLForService(serviceBuilder, log)) { + if (shouldCreateExternalURLForService(serviceBuilder, log)) { Objects.requireNonNull(serviceMetadata); String serviceName = serviceMetadata.getName(); if (!hasIngress(listBuilder, serviceName)) { diff --git a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/openshift/ExposeEnricher.java b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/openshift/ExposeEnricher.java deleted file mode 100644 index 0aec8416c7..0000000000 --- a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/openshift/ExposeEnricher.java +++ /dev/null @@ -1,86 +0,0 @@ -/** - * Copyright (c) 2019 Red Hat, Inc. - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at: - * - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - */ -package org.eclipse.jkube.enricher.generic.openshift; - -import io.fabric8.kubernetes.api.builder.TypedVisitor; -import io.fabric8.kubernetes.api.model.KubernetesListBuilder; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ServiceBuilder; -import io.fabric8.kubernetes.api.model.ServicePort; -import io.fabric8.kubernetes.api.model.ServiceSpec; -import org.eclipse.jkube.kit.common.util.KubernetesHelper; -import org.eclipse.jkube.kit.config.resource.PlatformMode; -import org.eclipse.jkube.kit.enricher.api.BaseEnricher; -import org.eclipse.jkube.kit.enricher.api.JKubeEnricherContext; - -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import static org.eclipse.jkube.kit.enricher.api.util.KubernetesResourceUtil.containsLabelInMetadata; - - -/** - * Enricher for enabling exposing of HTTP / HTTPS based services - */ -public class ExposeEnricher extends BaseEnricher { - public static final String EXPOSE_LABEL = "expose"; - - public ExposeEnricher(JKubeEnricherContext buildContext) { - super(buildContext, "jkube-openshift-service-expose"); - } - - private static final Set WEB_PORTS = new HashSet<>(Arrays.asList(80, 443, 8080, 9080, 9090, 9443)); - - @Override - public void create(PlatformMode platformMode, KubernetesListBuilder builder) { - builder.accept(new TypedVisitor() { - - @Override - public void visit(ServiceBuilder serviceBuilder) { - enrichService(serviceBuilder); - } - }); - } - - private void enrichService(ServiceBuilder serviceBuilder) { - if (hasWebPort(serviceBuilder)) { - ObjectMeta serviceMetadata = serviceBuilder.buildMetadata(); - if (! containsLabelInMetadata(serviceMetadata, EXPOSE_LABEL, "false")) { - log.verbose("Adding Service label '%s:true' on service %s" + - " so that it is exposed by the exposecontroller microservice." + - " To disable use the maven argument: '-Dfabric8.profile=internal-microservice'", - EXPOSE_LABEL, KubernetesHelper.getName(serviceMetadata)); - serviceBuilder.editOrNewMetadata().addToLabels(EXPOSE_LABEL, "true").endMetadata(); - } - } - } - - private boolean hasWebPort(ServiceBuilder serviceBuilder) { - ServiceSpec spec = serviceBuilder.buildSpec(); - if (spec != null) { - List ports = spec.getPorts(); - if (ports != null) { - for (ServicePort port : ports) { - Integer portNumber = port.getPort(); - if (portNumber != null && WEB_PORTS.contains(portNumber)) { - return true; - } - } - } - } - return false; - } -} diff --git a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricher.java b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricher.java index c282abe39a..ed2d607b85 100644 --- a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricher.java +++ b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricher.java @@ -41,7 +41,6 @@ import org.apache.commons.lang3.StringUtils; import static org.eclipse.jkube.enricher.generic.DefaultServiceEnricher.getPortToExpose; -import static org.eclipse.jkube.kit.enricher.api.util.KubernetesResourceUtil.isExposedService; import static org.eclipse.jkube.kit.enricher.api.util.KubernetesResourceUtil.mergeMetadata; import static org.eclipse.jkube.kit.enricher.api.util.KubernetesResourceUtil.mergeSimpleFields; import static org.eclipse.jkube.kit.enricher.api.util.KubernetesResourceUtil.removeItemFromKubernetesBuilder; @@ -104,7 +103,7 @@ private void addRoute(KubernetesListBuilder listBuilder, ServiceBuilder serviceB ObjectMeta serviceMetadata = serviceBuilder.buildMetadata(); if (serviceMetadata != null && StringUtils.isNotBlank(serviceMetadata.getName()) - && hasExactlyOneServicePort(serviceBuilder, serviceMetadata.getName()) && isExposedService(serviceMetadata)) { + && hasExactlyOneServicePort(serviceBuilder, serviceMetadata.getName())) { String name = serviceMetadata.getName(); updateRouteDomainPostFixBasedOnServiceName(name); Route opinionatedRoute = createOpinionatedRouteFromService(serviceBuilder, routeDomainPostfix, diff --git a/jkube-kit/enricher/generic/src/main/resources/META-INF/jkube/enricher-default b/jkube-kit/enricher/generic/src/main/resources/META-INF/jkube/enricher-default index c29e1adc75..f7d8bf8904 100644 --- a/jkube-kit/enricher/generic/src/main/resources/META-INF/jkube/enricher-default +++ b/jkube-kit/enricher/generic/src/main/resources/META-INF/jkube/enricher-default @@ -84,9 +84,6 @@ org.eclipse.jkube.enricher.generic.openshift.DeploymentConfigEnricher # Add a Project from Namespace when on OpenShift org.eclipse.jkube.enricher.generic.openshift.ProjectEnricher -# Add an "expose" label to every service (TODO: Combine this with a Route/Ingress enricher) -org.eclipse.jkube.enricher.generic.openshift.ExposeEnricher - # Enhance a given controller with the configuration information presented in the plugin configuration. org.eclipse.jkube.enricher.generic.ControllerViaPluginConfigurationEnricher diff --git a/jkube-kit/jkube-kit-spring-boot/src/main/java/org/eclipse/jkube/springboot/watcher/SpringBootWatcher.java b/jkube-kit/jkube-kit-spring-boot/src/main/java/org/eclipse/jkube/springboot/watcher/SpringBootWatcher.java index 59817b954a..8e8c09b1ac 100644 --- a/jkube-kit/jkube-kit-spring-boot/src/main/java/org/eclipse/jkube/springboot/watcher/SpringBootWatcher.java +++ b/jkube-kit/jkube-kit-spring-boot/src/main/java/org/eclipse/jkube/springboot/watcher/SpringBootWatcher.java @@ -38,7 +38,6 @@ import org.eclipse.jkube.kit.common.util.SpringBootConfigurationHelper; import org.eclipse.jkube.kit.common.util.SpringBootUtil; import org.eclipse.jkube.kit.config.image.ImageConfiguration; -import org.eclipse.jkube.kit.config.resource.JKubeAnnotations; import org.eclipse.jkube.kit.config.resource.PlatformMode; import org.eclipse.jkube.kit.config.service.PodLogService; import org.eclipse.jkube.kit.config.service.PortForwardService; @@ -99,11 +98,7 @@ public void watch(List configs, String namespace, Collection namespace, resources, false, null, true, null, false); - String url = getServiceExposeUrl(kubernetes, namespace, resources); - if (url == null) { - url = getPortForwardUrl(namespace, resources); - } - + String url = getPortForwardUrl(namespace, resources); if (url != null) { runRemoteSpringApplication(url); } else { @@ -136,17 +131,6 @@ private String createForwardUrl(SpringBootConfigurationHelper propertyHelper, Pr return scheme + "localhost:" + localPort + contextPath; } - private String getServiceExposeUrl(KubernetesClient kubernetes, String namespace, Collection resources) throws InterruptedException { - long serviceUrlWaitTimeSeconds = Configs.asInt(getConfig(Config.SERVICE_URL_WAIT_TIME_SECONDS)); - String url = KubernetesHelper.getServiceExposeUrl(kubernetes, namespace, resources, serviceUrlWaitTimeSeconds, JKubeAnnotations.SERVICE_EXPOSE_URL.value()); - if (StringUtils.isNotBlank(url)) { - return url; - } - - log.info("No exposed service found for connecting the dev tools"); - return null; - } - private void runRemoteSpringApplication(String url) { log.info("Running RemoteSpringApplication against endpoint: " + url); diff --git a/kubernetes-maven-plugin/doc/src/main/asciidoc/inc/_profiles.adoc b/kubernetes-maven-plugin/doc/src/main/asciidoc/inc/_profiles.adoc index dc445773fb..caea9bc6a9 100644 --- a/kubernetes-maven-plugin/doc/src/main/asciidoc/inc/_profiles.adoc +++ b/kubernetes-maven-plugin/doc/src/main/asciidoc/inc/_profiles.adoc @@ -230,7 +230,6 @@ A profile can also extend another profile to avoid repetition e.g of generators - jkube-controller-from-configuration - jkube-openshift-deploymentconfig - jkube-openshift-project - - jkube-openshift-service-expose - jkube-openshift-route ---- diff --git a/kubernetes-maven-plugin/it/src/it/configmap/expected/kubernetes.yml b/kubernetes-maven-plugin/it/src/it/configmap/expected/kubernetes.yml index 309e55d986..44d7ec4a59 100644 --- a/kubernetes-maven-plugin/it/src/it/configmap/expected/kubernetes.yml +++ b/kubernetes-maven-plugin/it/src/it/configmap/expected/kubernetes.yml @@ -25,7 +25,6 @@ items: jkube.io/git-branch: "@ignore@" prometheus.io/port: "9779" labels: - expose: "true" provider: jkube app: jkube-maven-sample-config-map version: "@ignore@" diff --git a/kubernetes-maven-plugin/it/src/it/env-metadata/expected/kubernetes.yml b/kubernetes-maven-plugin/it/src/it/env-metadata/expected/kubernetes.yml index 9492d9e7e3..00d62a009d 100644 --- a/kubernetes-maven-plugin/it/src/it/env-metadata/expected/kubernetes.yml +++ b/kubernetes-maven-plugin/it/src/it/env-metadata/expected/kubernetes.yml @@ -25,7 +25,6 @@ items: jkube.io/git-branch: "@ignore@" prometheus.io/port: "9779" labels: - expose: "true" provider: jkube app: jkube-maven-sample-env-metadata version: "@ignore@" diff --git a/kubernetes-maven-plugin/it/src/it/ingress-xml-config/expected/xml-config/kubernetes.yml b/kubernetes-maven-plugin/it/src/it/ingress-xml-config/expected/xml-config/kubernetes.yml index c2b4cf2b15..bb87cfdda4 100644 --- a/kubernetes-maven-plugin/it/src/it/ingress-xml-config/expected/xml-config/kubernetes.yml +++ b/kubernetes-maven-plugin/it/src/it/ingress-xml-config/expected/xml-config/kubernetes.yml @@ -25,7 +25,6 @@ items: jkube.io/git-branch: "@ignore@" prometheus.io/port: "9779" labels: - expose: "true" app: ingress-xml-config provider: jkube version: "@ignore@" diff --git a/kubernetes-maven-plugin/it/src/it/ingress-xml-config/expected/zero-config-extensionsv1beta1-enricher-config/kubernetes.yml b/kubernetes-maven-plugin/it/src/it/ingress-xml-config/expected/zero-config-extensionsv1beta1-enricher-config/kubernetes.yml index ca398b2a71..50e53900a9 100644 --- a/kubernetes-maven-plugin/it/src/it/ingress-xml-config/expected/zero-config-extensionsv1beta1-enricher-config/kubernetes.yml +++ b/kubernetes-maven-plugin/it/src/it/ingress-xml-config/expected/zero-config-extensionsv1beta1-enricher-config/kubernetes.yml @@ -25,7 +25,6 @@ items: jkube.io/git-branch: "@ignore@" prometheus.io/port: "9779" labels: - expose: "true" app: ingress-xml-config provider: jkube version: "@ignore@" diff --git a/kubernetes-maven-plugin/it/src/it/ingress-xml-config/expected/zero-config-extensionsv1beta1-host-enricher-config/kubernetes.yml b/kubernetes-maven-plugin/it/src/it/ingress-xml-config/expected/zero-config-extensionsv1beta1-host-enricher-config/kubernetes.yml index 7c4dd3072b..4ed43c68e8 100644 --- a/kubernetes-maven-plugin/it/src/it/ingress-xml-config/expected/zero-config-extensionsv1beta1-host-enricher-config/kubernetes.yml +++ b/kubernetes-maven-plugin/it/src/it/ingress-xml-config/expected/zero-config-extensionsv1beta1-host-enricher-config/kubernetes.yml @@ -25,7 +25,6 @@ items: jkube.io/git-branch: "@ignore@" prometheus.io/port: "9779" labels: - expose: "true" app: ingress-xml-config provider: jkube version: "@ignore@" diff --git a/kubernetes-maven-plugin/it/src/it/ingress-xml-config/expected/zero-config-host-enricher-config/kubernetes.yml b/kubernetes-maven-plugin/it/src/it/ingress-xml-config/expected/zero-config-host-enricher-config/kubernetes.yml index 2f34fc3453..c3cc852627 100644 --- a/kubernetes-maven-plugin/it/src/it/ingress-xml-config/expected/zero-config-host-enricher-config/kubernetes.yml +++ b/kubernetes-maven-plugin/it/src/it/ingress-xml-config/expected/zero-config-host-enricher-config/kubernetes.yml @@ -25,7 +25,6 @@ items: jkube.io/git-branch: "@ignore@" prometheus.io/port: "9779" labels: - expose: "true" app: ingress-xml-config provider: jkube version: "@ignore@" diff --git a/kubernetes-maven-plugin/it/src/it/ingress-xml-config/expected/zero-config-no-host/kubernetes.yml b/kubernetes-maven-plugin/it/src/it/ingress-xml-config/expected/zero-config-no-host/kubernetes.yml index 6cbf828edf..383560be12 100644 --- a/kubernetes-maven-plugin/it/src/it/ingress-xml-config/expected/zero-config-no-host/kubernetes.yml +++ b/kubernetes-maven-plugin/it/src/it/ingress-xml-config/expected/zero-config-no-host/kubernetes.yml @@ -25,7 +25,6 @@ items: jkube.io/git-branch: "@ignore@" prometheus.io/port: "9779" labels: - expose: "true" app: ingress-xml-config provider: jkube version: "@ignore@" diff --git a/kubernetes-maven-plugin/it/src/it/namespace/expected/create-and-set-different-namespace/kubernetes.yml b/kubernetes-maven-plugin/it/src/it/namespace/expected/create-and-set-different-namespace/kubernetes.yml index 50f63159c4..92bcfaaae7 100644 --- a/kubernetes-maven-plugin/it/src/it/namespace/expected/create-and-set-different-namespace/kubernetes.yml +++ b/kubernetes-maven-plugin/it/src/it/namespace/expected/create-and-set-different-namespace/kubernetes.yml @@ -36,7 +36,6 @@ items: jkube.io/git-branch: "@ignore@" prometheus.io/port: "9779" labels: - expose: "true" app: namespace provider: jkube version: "@ignore@" diff --git a/kubernetes-maven-plugin/it/src/it/namespace/expected/create-and-set-namespace/kubernetes.yml b/kubernetes-maven-plugin/it/src/it/namespace/expected/create-and-set-namespace/kubernetes.yml index 639ee599f7..3f25a2910a 100644 --- a/kubernetes-maven-plugin/it/src/it/namespace/expected/create-and-set-namespace/kubernetes.yml +++ b/kubernetes-maven-plugin/it/src/it/namespace/expected/create-and-set-namespace/kubernetes.yml @@ -36,7 +36,6 @@ items: jkube.io/git-branch: "@ignore@" prometheus.io/port: "9779" labels: - expose: "true" app: namespace provider: jkube version: "@ignore@" diff --git a/kubernetes-maven-plugin/it/src/it/namespace/expected/create-namespace/kubernetes.yml b/kubernetes-maven-plugin/it/src/it/namespace/expected/create-namespace/kubernetes.yml index bf1538dc98..423d9cfcef 100644 --- a/kubernetes-maven-plugin/it/src/it/namespace/expected/create-namespace/kubernetes.yml +++ b/kubernetes-maven-plugin/it/src/it/namespace/expected/create-namespace/kubernetes.yml @@ -36,7 +36,6 @@ items: jkube.io/git-branch: "@ignore@" prometheus.io/port: "9779" labels: - expose: "true" app: namespace provider: jkube version: "@ignore@" diff --git a/kubernetes-maven-plugin/it/src/it/namespace/expected/default/kubernetes.yml b/kubernetes-maven-plugin/it/src/it/namespace/expected/default/kubernetes.yml index 0dbab35aed..4095106c65 100644 --- a/kubernetes-maven-plugin/it/src/it/namespace/expected/default/kubernetes.yml +++ b/kubernetes-maven-plugin/it/src/it/namespace/expected/default/kubernetes.yml @@ -25,7 +25,6 @@ items: jkube.io/git-branch: "@ignore@" prometheus.io/port: "9779" labels: - expose: "true" app: namespace provider: jkube version: "@ignore@" diff --git a/kubernetes-maven-plugin/it/src/it/namespace/expected/set-namespace/kubernetes.yml b/kubernetes-maven-plugin/it/src/it/namespace/expected/set-namespace/kubernetes.yml index 01e243882c..15ce182a73 100644 --- a/kubernetes-maven-plugin/it/src/it/namespace/expected/set-namespace/kubernetes.yml +++ b/kubernetes-maven-plugin/it/src/it/namespace/expected/set-namespace/kubernetes.yml @@ -25,7 +25,6 @@ items: jkube.io/git-branch: "@ignore@" prometheus.io/port: "9779" labels: - expose: "true" app: namespace provider: jkube version: "@ignore@" diff --git a/kubernetes-maven-plugin/it/src/it/probes-xml-config/expected/kubernetes.yml b/kubernetes-maven-plugin/it/src/it/probes-xml-config/expected/kubernetes.yml index 713d5034c9..2d6ef18906 100644 --- a/kubernetes-maven-plugin/it/src/it/probes-xml-config/expected/kubernetes.yml +++ b/kubernetes-maven-plugin/it/src/it/probes-xml-config/expected/kubernetes.yml @@ -25,7 +25,6 @@ items: jkube.io/git-branch: "@ignore@" prometheus.io/port: "9779" labels: - expose: "true" provider: jkube app: jkube-maven-sample-xml-probe-config version: "@ignore@" diff --git a/kubernetes-maven-plugin/it/src/it/sidecar/expected/kubernetes.yml b/kubernetes-maven-plugin/it/src/it/sidecar/expected/kubernetes.yml index 32cbb1c398..20185851c6 100644 --- a/kubernetes-maven-plugin/it/src/it/sidecar/expected/kubernetes.yml +++ b/kubernetes-maven-plugin/it/src/it/sidecar/expected/kubernetes.yml @@ -25,7 +25,6 @@ items: jkube.io/git-branch: "@ignore@" prometheus.io/port: "9779" labels: - expose: "true" provider: jkube app: jkube-maven-sample-sidecar version: "@ignore@" diff --git a/kubernetes-maven-plugin/it/src/it/simple-maven-issue-mgmt/expected/kubernetes.yml b/kubernetes-maven-plugin/it/src/it/simple-maven-issue-mgmt/expected/kubernetes.yml index 4136926382..bb88b131e4 100644 --- a/kubernetes-maven-plugin/it/src/it/simple-maven-issue-mgmt/expected/kubernetes.yml +++ b/kubernetes-maven-plugin/it/src/it/simple-maven-issue-mgmt/expected/kubernetes.yml @@ -27,7 +27,6 @@ items: jkube.io/issue-system: "GitHub" jkube.io/issue-tracker-url: "https://github.com/reactiverse/vertx-maven-plugin/issues/" labels: - expose: "true" provider: jkube app: jkube-maven-sample-zero-config version: "@ignore@" diff --git a/kubernetes-maven-plugin/it/src/it/simple-with-route-flag-false/expected/kubernetes.yml b/kubernetes-maven-plugin/it/src/it/simple-with-route-flag-false/expected/kubernetes.yml index 65775a1e8a..ab6f19dd73 100644 --- a/kubernetes-maven-plugin/it/src/it/simple-with-route-flag-false/expected/kubernetes.yml +++ b/kubernetes-maven-plugin/it/src/it/simple-with-route-flag-false/expected/kubernetes.yml @@ -27,7 +27,6 @@ items: prometheus.io/scrape: "true" jkube.io/scm-tag: HEAD labels: - expose: "true" app: jkube-maven-sample-zero-config provider: jkube version: 0.1-SNAPSHOT diff --git a/kubernetes-maven-plugin/it/src/it/simple-with-route-flag-true/expected/kubernetes.yml b/kubernetes-maven-plugin/it/src/it/simple-with-route-flag-true/expected/kubernetes.yml index 65775a1e8a..ab6f19dd73 100644 --- a/kubernetes-maven-plugin/it/src/it/simple-with-route-flag-true/expected/kubernetes.yml +++ b/kubernetes-maven-plugin/it/src/it/simple-with-route-flag-true/expected/kubernetes.yml @@ -27,7 +27,6 @@ items: prometheus.io/scrape: "true" jkube.io/scm-tag: HEAD labels: - expose: "true" app: jkube-maven-sample-zero-config provider: jkube version: 0.1-SNAPSHOT diff --git a/kubernetes-maven-plugin/it/src/it/simple/expected/kubernetes.yml b/kubernetes-maven-plugin/it/src/it/simple/expected/kubernetes.yml index c3c9ecf44c..684faa8c86 100644 --- a/kubernetes-maven-plugin/it/src/it/simple/expected/kubernetes.yml +++ b/kubernetes-maven-plugin/it/src/it/simple/expected/kubernetes.yml @@ -25,7 +25,6 @@ items: jkube.io/git-branch: "@ignore@" prometheus.io/port: "9779" labels: - expose: "true" provider: jkube app: jkube-maven-sample-zero-config version: "@ignore@" diff --git a/kubernetes-maven-plugin/it/src/it/volume-enricher-custom-storage-class/expected/kubernetes.yml b/kubernetes-maven-plugin/it/src/it/volume-enricher-custom-storage-class/expected/kubernetes.yml index 561ef2b6fc..b6a1476b41 100644 --- a/kubernetes-maven-plugin/it/src/it/volume-enricher-custom-storage-class/expected/kubernetes.yml +++ b/kubernetes-maven-plugin/it/src/it/volume-enricher-custom-storage-class/expected/kubernetes.yml @@ -24,7 +24,6 @@ items: app: volume-enricher-custom-storage-class version: 0.1-SNAPSHOT group: org.eclipse.jkube.devops.apps - expose: "true" name: jkube-docker-registry spec: ports: diff --git a/kubernetes-maven-plugin/it/src/it/volume-enricher-default-storage-class/expected/kubernetes.yml b/kubernetes-maven-plugin/it/src/it/volume-enricher-default-storage-class/expected/kubernetes.yml index 55973eba7c..4556a52133 100644 --- a/kubernetes-maven-plugin/it/src/it/volume-enricher-default-storage-class/expected/kubernetes.yml +++ b/kubernetes-maven-plugin/it/src/it/volume-enricher-default-storage-class/expected/kubernetes.yml @@ -24,7 +24,6 @@ items: app: volume-enricher-default-storage-class version: 0.1-SNAPSHOT group: org.eclipse.jkube.devops.apps - expose: "true" name: jkube-docker-registry spec: ports: diff --git a/kubernetes-maven-plugin/plugin/src/main/resources/META-INF/jkube/profiles-default.yml b/kubernetes-maven-plugin/plugin/src/main/resources/META-INF/jkube/profiles-default.yml index 8584ad793d..d10f469379 100644 --- a/kubernetes-maven-plugin/plugin/src/main/resources/META-INF/jkube/profiles-default.yml +++ b/kubernetes-maven-plugin/plugin/src/main/resources/META-INF/jkube/profiles-default.yml @@ -41,7 +41,6 @@ - jkube-secret-file # Route exposure - - jkube-openshift-service-expose - jkube-openshift-route - jkube-openshift-project @@ -131,7 +130,6 @@ - jkube-controller-from-configuration - jkube-openshift-deploymentconfig - jkube-openshift-project - - jkube-openshift-service-expose - jkube-openshift-route # Only dependencies, no build, use other resources raw - name: aggregate @@ -151,5 +149,4 @@ generator: excludes: [] enricher: - excludes: - - jkube-openshift-service-expose + excludes: [] diff --git a/openshift-maven-plugin/it/src/it/configmap/expected/openshift.yml b/openshift-maven-plugin/it/src/it/configmap/expected/openshift.yml index f9ffeafc4a..2c8e211d95 100644 --- a/openshift-maven-plugin/it/src/it/configmap/expected/openshift.yml +++ b/openshift-maven-plugin/it/src/it/configmap/expected/openshift.yml @@ -25,7 +25,6 @@ items: jkube.io/git-branch: "@ignore@" prometheus.io/port: "9779" labels: - expose: "true" provider: jkube app: jkube-maven-sample-config-map version: "@ignore@" diff --git a/openshift-maven-plugin/it/src/it/custom-environment/expected/openshift.yml b/openshift-maven-plugin/it/src/it/custom-environment/expected/openshift.yml index 030b75368a..8864dacefc 100644 --- a/openshift-maven-plugin/it/src/it/custom-environment/expected/openshift.yml +++ b/openshift-maven-plugin/it/src/it/custom-environment/expected/openshift.yml @@ -20,7 +20,6 @@ items: kind: Service metadata: labels: - expose: "true" provider: jkube app: jkube-maven-sample-custom-environment version: "@ignore@" diff --git a/openshift-maven-plugin/it/src/it/env-metadata/expected/openshift.yml b/openshift-maven-plugin/it/src/it/env-metadata/expected/openshift.yml index 1456d62c3e..71d6224a58 100644 --- a/openshift-maven-plugin/it/src/it/env-metadata/expected/openshift.yml +++ b/openshift-maven-plugin/it/src/it/env-metadata/expected/openshift.yml @@ -25,7 +25,6 @@ items: jkube.io/git-branch: "@ignore@" prometheus.io/port: "9779" labels: - expose: "true" provider: jkube app: jkube-maven-sample-env-metadata version: "@ignore@" diff --git a/openshift-maven-plugin/it/src/it/project/expected/create-project-and-set-different-namespace/openshift.yml b/openshift-maven-plugin/it/src/it/project/expected/create-project-and-set-different-namespace/openshift.yml index cfc8729763..948910884e 100644 --- a/openshift-maven-plugin/it/src/it/project/expected/create-project-and-set-different-namespace/openshift.yml +++ b/openshift-maven-plugin/it/src/it/project/expected/create-project-and-set-different-namespace/openshift.yml @@ -36,7 +36,6 @@ items: jkube.io/git-branch: "@ignore@" prometheus.io/port: "9779" labels: - expose: "true" app: project provider: jkube version: "@ignore@" diff --git a/openshift-maven-plugin/it/src/it/project/expected/create-project-and-set-namespace/openshift.yml b/openshift-maven-plugin/it/src/it/project/expected/create-project-and-set-namespace/openshift.yml index 71c0c1d968..7ca1802270 100644 --- a/openshift-maven-plugin/it/src/it/project/expected/create-project-and-set-namespace/openshift.yml +++ b/openshift-maven-plugin/it/src/it/project/expected/create-project-and-set-namespace/openshift.yml @@ -36,7 +36,6 @@ items: jkube.io/git-branch: "@ignore@" prometheus.io/port: "9779" labels: - expose: "true" app: project provider: jkube version: "@ignore@" diff --git a/openshift-maven-plugin/it/src/it/project/expected/create-project/openshift.yml b/openshift-maven-plugin/it/src/it/project/expected/create-project/openshift.yml index b46f2fba11..170bea08a5 100644 --- a/openshift-maven-plugin/it/src/it/project/expected/create-project/openshift.yml +++ b/openshift-maven-plugin/it/src/it/project/expected/create-project/openshift.yml @@ -36,7 +36,6 @@ items: jkube.io/git-branch: "@ignore@" prometheus.io/port: "9779" labels: - expose: "true" app: project provider: jkube version: "@ignore@" diff --git a/openshift-maven-plugin/it/src/it/project/expected/default/openshift.yml b/openshift-maven-plugin/it/src/it/project/expected/default/openshift.yml index 78c343590a..f0665f121b 100644 --- a/openshift-maven-plugin/it/src/it/project/expected/default/openshift.yml +++ b/openshift-maven-plugin/it/src/it/project/expected/default/openshift.yml @@ -25,7 +25,6 @@ items: jkube.io/git-branch: "@ignore@" prometheus.io/port: "9779" labels: - expose: "true" app: project provider: jkube version: "@ignore@" diff --git a/openshift-maven-plugin/it/src/it/project/expected/set-namespace/openshift.yml b/openshift-maven-plugin/it/src/it/project/expected/set-namespace/openshift.yml index d0fb15156d..48b80c3f3d 100644 --- a/openshift-maven-plugin/it/src/it/project/expected/set-namespace/openshift.yml +++ b/openshift-maven-plugin/it/src/it/project/expected/set-namespace/openshift.yml @@ -25,7 +25,6 @@ items: jkube.io/git-branch: "@ignore@" prometheus.io/port: "9779" labels: - expose: "true" app: project provider: jkube version: "@ignore@" diff --git a/openshift-maven-plugin/it/src/it/remote-resources/expected/openshift.yml b/openshift-maven-plugin/it/src/it/remote-resources/expected/openshift.yml index 9b25cfa087..887c78ad90 100644 --- a/openshift-maven-plugin/it/src/it/remote-resources/expected/openshift.yml +++ b/openshift-maven-plugin/it/src/it/remote-resources/expected/openshift.yml @@ -20,7 +20,6 @@ items: kind: Service metadata: labels: - expose: "true" provider: jkube app: jkube-maven-sample-remote-resources version: "@ignore@" diff --git a/openshift-maven-plugin/it/src/it/sidecar/expected/openshift.yml b/openshift-maven-plugin/it/src/it/sidecar/expected/openshift.yml index c3b6e2e1c1..863e758526 100644 --- a/openshift-maven-plugin/it/src/it/sidecar/expected/openshift.yml +++ b/openshift-maven-plugin/it/src/it/sidecar/expected/openshift.yml @@ -25,7 +25,6 @@ items: jkube.io/git-branch: "@ignore@" prometheus.io/port: "9779" labels: - expose: "true" provider: jkube app: jkube-maven-sample-sidecar version: "@ignore@" diff --git a/openshift-maven-plugin/it/src/it/simple-maven-issue-mgmt/expected/openshift.yml b/openshift-maven-plugin/it/src/it/simple-maven-issue-mgmt/expected/openshift.yml index 90454de412..346232623c 100644 --- a/openshift-maven-plugin/it/src/it/simple-maven-issue-mgmt/expected/openshift.yml +++ b/openshift-maven-plugin/it/src/it/simple-maven-issue-mgmt/expected/openshift.yml @@ -27,7 +27,6 @@ items: jkube.io/issue-system: "GitHub" jkube.io/issue-tracker-url: "https://github.com/reactiverse/vertx-maven-plugin/issues/" labels: - expose: "true" provider: jkube app: jkube-maven-sample-zero-config version: "@ignore@" diff --git a/openshift-maven-plugin/it/src/it/simple-with-route-flag-false/expected/openshift.yml b/openshift-maven-plugin/it/src/it/simple-with-route-flag-false/expected/openshift.yml index 770dbded66..fddaf4dbde 100644 --- a/openshift-maven-plugin/it/src/it/simple-with-route-flag-false/expected/openshift.yml +++ b/openshift-maven-plugin/it/src/it/simple-with-route-flag-false/expected/openshift.yml @@ -27,7 +27,6 @@ items: prometheus.io/scrape: "true" jkube.io/scm-tag: HEAD labels: - expose: "true" app: jkube-maven-sample-zero-config provider: jkube version: 0.1-SNAPSHOT diff --git a/openshift-maven-plugin/it/src/it/simple-with-route-flag-true/expected/openshift.yml b/openshift-maven-plugin/it/src/it/simple-with-route-flag-true/expected/openshift.yml index 5cb0289f30..c9889cae05 100644 --- a/openshift-maven-plugin/it/src/it/simple-with-route-flag-true/expected/openshift.yml +++ b/openshift-maven-plugin/it/src/it/simple-with-route-flag-true/expected/openshift.yml @@ -27,7 +27,6 @@ items: prometheus.io/scrape: "true" jkube.io/scm-tag: HEAD labels: - expose: "true" app: jkube-maven-sample-zero-config provider: jkube version: 0.1-SNAPSHOT diff --git a/openshift-maven-plugin/it/src/it/simple/expected/openshift.yml b/openshift-maven-plugin/it/src/it/simple/expected/openshift.yml index 693fcc3010..c20786b7ca 100644 --- a/openshift-maven-plugin/it/src/it/simple/expected/openshift.yml +++ b/openshift-maven-plugin/it/src/it/simple/expected/openshift.yml @@ -25,7 +25,6 @@ items: jkube.io/git-branch: "@ignore@" prometheus.io/port: "9779" labels: - expose: "true" provider: jkube app: jkube-maven-sample-zero-config version: "@ignore@" diff --git a/openshift-maven-plugin/it/src/it/spring-boot/expected/openshift.yml b/openshift-maven-plugin/it/src/it/spring-boot/expected/openshift.yml index e75c939b7c..527910ad9f 100644 --- a/openshift-maven-plugin/it/src/it/spring-boot/expected/openshift.yml +++ b/openshift-maven-plugin/it/src/it/spring-boot/expected/openshift.yml @@ -20,7 +20,6 @@ items: kind: Service metadata: labels: - expose: "true" testProject: spring-boot-sample provider: jkube app: jkube-maven-sample-spring-boot diff --git a/openshift-maven-plugin/it/src/it/vertx-default/expected/openshift.yml b/openshift-maven-plugin/it/src/it/vertx-default/expected/openshift.yml index 08d464f447..2e4e3db77e 100644 --- a/openshift-maven-plugin/it/src/it/vertx-default/expected/openshift.yml +++ b/openshift-maven-plugin/it/src/it/vertx-default/expected/openshift.yml @@ -20,7 +20,6 @@ items: kind: Service metadata: labels: - expose: "true" provider: jkube app: vertx-default-sample version: "@ignore@" diff --git a/openshift-maven-plugin/it/src/it/vertx-health-check/expected/openshift.yml b/openshift-maven-plugin/it/src/it/vertx-health-check/expected/openshift.yml index d9f49d64a1..46f2b40f40 100644 --- a/openshift-maven-plugin/it/src/it/vertx-health-check/expected/openshift.yml +++ b/openshift-maven-plugin/it/src/it/vertx-health-check/expected/openshift.yml @@ -20,7 +20,6 @@ items: kind: Service metadata: labels: - expose: "true" provider: jkube app: vertx-default-sample version: "@ignore@" diff --git a/openshift-maven-plugin/it/src/it/vertx/expected/openshift.yml b/openshift-maven-plugin/it/src/it/vertx/expected/openshift.yml index b0d813f830..d0aa27483d 100644 --- a/openshift-maven-plugin/it/src/it/vertx/expected/openshift.yml +++ b/openshift-maven-plugin/it/src/it/vertx/expected/openshift.yml @@ -20,7 +20,6 @@ items: kind: Service metadata: labels: - expose: "true" provider: jkube app: jkube-maven-sample-vertx version: "@ignore@" diff --git a/openshift-maven-plugin/plugin/src/main/resources/META-INF/jkube/profiles-default.yml b/openshift-maven-plugin/plugin/src/main/resources/META-INF/jkube/profiles-default.yml index 670f4fa5a8..a830ea5211 100644 --- a/openshift-maven-plugin/plugin/src/main/resources/META-INF/jkube/profiles-default.yml +++ b/openshift-maven-plugin/plugin/src/main/resources/META-INF/jkube/profiles-default.yml @@ -55,8 +55,6 @@ - jkube-healthcheck-webapp - jkube-healthcheck-micronaut - # Route exposure - - jkube-openshift-service-expose # DeploymentConfigEnricher converts Deployment into DeploymentConfig - jkube-openshift-deploymentconfig - jkube-openshift-route @@ -146,5 +144,4 @@ generator: excludes: [] enricher: - excludes: - - jkube-openshift-service-expose + excludes: []