diff --git a/generators/generator-constants.js b/generators/generator-constants.js index 569ee4bcbb28..9797355f1965 100644 --- a/generators/generator-constants.js +++ b/generators/generator-constants.js @@ -117,7 +117,7 @@ const KUBERNETES_CORE_API_VERSION = 'v1'; const KUBERNETES_BATCH_API_VERSION = 'batch/v1'; const KUBERNETES_DEPLOYMENT_API_VERSION = 'apps/v1'; const KUBERNETES_STATEFULSET_API_VERSION = 'apps/v1'; -const KUBERNETES_INGRESS_API_VERSION = 'networking.k8s.io/v1beta1'; +const KUBERNETES_INGRESS_API_VERSION = 'networking.k8s.io/v1'; const KUBERNETES_ISTIO_NETWORKING_API_VERSION = 'networking.istio.io/v1beta1'; const KUBERNETES_RBAC_API_VERSION = 'rbac.authorization.k8s.io/v1'; diff --git a/generators/kubernetes/templates/ingress.yml.ejs b/generators/kubernetes/templates/ingress.yml.ejs index 0b8c2ee43972..c4253a759939 100644 --- a/generators/kubernetes/templates/ingress.yml.ejs +++ b/generators/kubernetes/templates/ingress.yml.ejs @@ -22,6 +22,7 @@ metadata: name: <%= app.baseName.toLowerCase() %> namespace: <%= kubernetesNamespace %> spec: + ingressClassName: <%= ingressType || "nginx" %> rules: <%_ if (ingressDomain) { _%> - host: <%= app.baseName.toLowerCase() %>.<%= kubernetesNamespace %>.<%= ingressDomain %> @@ -31,14 +32,20 @@ spec: <%_ } _%> paths: - path: /<%= ingressTypeNginx ? "" : "*" %> + pathType: Prefix backend: - serviceName: <%= app.baseName.toLowerCase() %> - servicePort: <%= app.serverPort %> + service: + name: <%= app.baseName.toLowerCase() %> + port: + name: http <%_ if (!app.serviceDiscoveryType) { _%> <%_ appConfigs.filter(config => config.baseName !== app.baseName).forEach(config => { _%> - path: /services/<%= config.baseName.toLowerCase() %>/<%= ingressTypeNginx ? "" : "*" %> + pathType: Prefix backend: - serviceName: <%= config.baseName.toLowerCase() %> - servicePort: <%= config.serverPort %> + service: + name: <%= config.baseName.toLowerCase() %> + port: + name: http <%_ }); _%> <%_ } _%> diff --git a/generators/kubernetes/templates/monitoring/jhipster-grafana.yml.ejs b/generators/kubernetes/templates/monitoring/jhipster-grafana.yml.ejs index f968245b19ae..65bc043db09f 100644 --- a/generators/kubernetes/templates/monitoring/jhipster-grafana.yml.ejs +++ b/generators/kubernetes/templates/monitoring/jhipster-grafana.yml.ejs @@ -106,12 +106,16 @@ metadata: name: jhipster-grafana namespace: <%= kubernetesNamespace %> spec: + ingressClassName: nginx rules: - host: jhipster-grafana.<%= kubernetesNamespace %>.<%= ingressDomain %> http: paths: - path: / + pathType: Prefix backend: - serviceName: jhipster-grafana - servicePort: 3000 + service: + name: jhipster-grafana + port: + number: 3000 <%_ } _%> diff --git a/test/__snapshots__/kubernetes.helm.spec.js.snap b/test/__snapshots__/kubernetes.helm.spec.js.snap index ab2321f86f8c..d7beec2b35c1 100644 --- a/test/__snapshots__/kubernetes.helm.spec.js.snap +++ b/test/__snapshots__/kubernetes.helm.spec.js.snap @@ -1609,20 +1609,24 @@ spec: "stateCleared": "modified", }, "jhgate-helm/templates/jhgate-ingress.yml": Object { - "contents": "apiVersion: networking.k8s.io/v1beta1 + "contents": "apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: jhgate namespace: default spec: + ingressClassName: gke rules: - host: jhgate.default.example.com http: paths: - path: /* + pathType: Prefix backend: - serviceName: jhgate - servicePort: 8080 + service: + name: jhgate + port: + name: http ", "stateCleared": "modified", }, diff --git a/test/__snapshots__/kubernetes.spec.js.snap b/test/__snapshots__/kubernetes.spec.js.snap index e2d95102e512..8b671c03404a 100644 --- a/test/__snapshots__/kubernetes.spec.js.snap +++ b/test/__snapshots__/kubernetes.spec.js.snap @@ -1553,20 +1553,24 @@ spec: "stateCleared": "modified", }, "jhgate-k8s/jhgate-ingress.yml": Object { - "contents": "apiVersion: networking.k8s.io/v1beta1 + "contents": "apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: jhgate namespace: default spec: + ingressClassName: nginx rules: - host: jhgate.default.example.com http: paths: - path: / + pathType: Prefix backend: - serviceName: jhgate - servicePort: 8080 + service: + name: jhgate + port: + name: http ", "stateCleared": "modified", },