diff --git a/src/main/resources/jira/certificate.yaml b/src/main/resources/jira/certificate.yaml index 49a75be..f8e7860 100644 --- a/src/main/resources/jira/certificate.yaml +++ b/src/main/resources/jira/certificate.yaml @@ -1,4 +1,4 @@ -apiVersion: cert-manager.io/v1alpha2 +apiVersion: cert-manager.io/v1 kind: Certificate metadata: name: jira-cert diff --git a/src/main/resources/jira/ingress.yaml b/src/main/resources/jira/ingress.yaml index f0f7c33..0293a37 100644 --- a/src/main/resources/jira/ingress.yaml +++ b/src/main/resources/jira/ingress.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: ingress-jira @@ -21,6 +21,9 @@ spec: http: paths: - path: / + pathType: Prefix backend: - serviceName: jira-service - servicePort: 8080 + service: + name: jira-service + port: + number: 8080 diff --git a/src/test/cljc/dda/c4k_jira/jira_test.cljc b/src/test/cljc/dda/c4k_jira/jira_test.cljc index 5c16b91..231ad13 100644 --- a/src/test/cljc/dda/c4k_jira/jira_test.cljc +++ b/src/test/cljc/dda/c4k_jira/jira_test.cljc @@ -5,7 +5,7 @@ [dda.c4k-jira.jira :as cut])) (deftest should-generate-certificate - (is (= {:apiVersion "cert-manager.io/v1alpha2" + (is (= {:apiVersion "cert-manager.io/v1" :kind "Certificate" :metadata {:name "jira-cert", :namespace "default"} :spec @@ -17,7 +17,7 @@ (cut/generate-certificate {:fqdn "xx" :issuer :prod})))) (deftest should-generate-ingress - (is (= {:apiVersion "extensions/v1beta1" + (is (= {:apiVersion "networking.k8s.io/v1" :kind "Ingress" :metadata {:name "ingress-jira" @@ -38,8 +38,11 @@ :http {:paths [{:path "/" + :pathType "Prefix" :backend - {:serviceName "jira-service", :servicePort 8080}}]}}]}} + {:service + {:name "jira-service", + :port {:number 8080}}}}]}}]}} (cut/generate-ingress {:fqdn "xx"})))) (deftest should-generate-persistent-volume