fix (jkube-kit) : Remove ExposeEnricher (#1309)

Remove all occurences of ExposeEnricher from project. Signed-off-by: Rohan Kumar <[email protected]>
eclipse-jkube · Aug 4, 2022 · d3d61c2 · d3d61c2
1 parent e643a0a
commit d3d61c2
Show file tree

Hide file tree

Showing 93 changed files with 12 additions and 298 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -68,6 +68,7 @@ _**Note**_:
 * 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...n/it/src/it/ingress/expected/zero-config-extensionsv1beta1-enricher-config/kubernetes.yml b/...n/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/...src/it/ingress/expected/zero-config-extensionsv1beta1-host-enricher-config/kubernetes.yml b/...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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -41,7 +41,6 @@
       - jkube-secret-file
 
       # Route exposure
-      - jkube-openshift-service-expose
       - jkube-openshift-route
       - jkube-openshift-project
 
@@ -134,7 +133,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
@@ -154,5 +152,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
@@ -56,8 +56,6 @@
     - jkube-healthcheck-micronaut
     - jkube-healthcheck-openliberty
 
-    # Route exposure
-    - jkube-openshift-service-expose
     # DeploymentConfigEnricher converts Deployment into DeploymentConfig
     - jkube-openshift-deploymentconfig
     - jkube-openshift-route
@@ -149,5 +147,4 @@
   generator:
     excludes: []
   enricher:
-    excludes:
-      - jkube-openshift-service-expose
+    excludes: []