Merge pull request #88 from projectsyn/feat/k8s-1.22

Generate Ingress with `apiVersion: networking.k8s.io/v1`

class/keycloak.yml

@@ -27,14 +27,14 @@ parameters:
         helm_params:
           release_name: ${keycloak:release_name}
           namespace: "${keycloak:namespace}"
+          # Tell Helm to generate networking.k8s.io/v1 Ingress objects
+          # This specifies argument `-a networking.k8s.io/v1/Ingress` for
+          # `helm template`.
+          api_versions: networking.k8s.io/v1/Ingress
         helm_values: ${keycloak:helm_values}
   commodore:
     postprocess:
       filters:
-        - type: jsonnet
-          filter: postprocess/api_version.jsonnet
-          path: ${_instance}/01_keycloak_helmchart/keycloak/charts/postgresql/templates
-          enabled: "${keycloak:helm_values:postgresql:enabled}"
         - type: jsonnet
           filter: postprocess/extra-env.jsonnet
           path: ${_instance}/01_keycloak_helmchart/keycloak/templates

docs/modules/ROOT/pages/index.adoc

@@ -7,3 +7,9 @@ chart] on a Syn-enabled cluster.
 The component defaults to provisioning a Bitnami Postgres database via the
 Keycloak helm chart, but this behavior can be overridden using the
 `keycloak.postgres` parameters exposed by the component.
+
+[NOTE]
+====
+This component doesn't support Kubernetes versions older than 1.14 anymore.
+This is because it generates `Ingress` resources with `apiVersion: networking.k8s.io/v1`.
+====

tests/builtin/ingress_test.go

@@ -0,0 +1,12 @@
+package builtin
+
+import (
+	"testing"
+
+	"github.com/projectsyn/component-keycloak/common"
+)
+
+
+func Test_IngressApiVersion(t *testing.T) {
+	common.IngressApiVersionTest(t, testPath)
+}

tests/common/apiversion.go

@@ -0,0 +1,19 @@
+package common
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	networkingv1 "k8s.io/api/networking/v1"
+)
+
+var (
+	ingressPath = "/01_keycloak_helmchart/keycloak/templates/ingress.yaml"
+)
+
+func IngressApiVersionTest(t *testing.T, basepath string) {
+	subject := &networkingv1.Ingress{}
+	scheme := NewSchemeWithDefault(t)
+	ingress := DecodeWithSchema(t, basepath+ingressPath, subject,scheme).(*networkingv1.Ingress)
+	assert.Equal(t, "keycloak", ingress.Name)
+}

tests/external/ingress_test.go

@@ -0,0 +1,12 @@
+package external
+
+import (
+	"testing"
+
+	"github.com/projectsyn/component-keycloak/common"
+)
+
+
+func Test_IngressApiVersion(t *testing.T) {
+	common.IngressApiVersionTest(t, testPath)
+}