diff --git a/pkg/kubernetes/configurations_test.go b/pkg/kubernetes/configurations_test.go index e7843026..3edcf440 100644 --- a/pkg/kubernetes/configurations_test.go +++ b/pkg/kubernetes/configurations_test.go @@ -116,7 +116,7 @@ func TestConfigurations(t *testing.T) { name: "Yaml one config", configName: "", outputFormat: "yaml", - expectedOutput: "name: appConfig\nspec:\n httppipelinespec:\n handlers: []\n tracingspec:\n samplingrate: \"\"\n zipkin:\n endpointaddresss: \"\"\n metricspec:\n enabled: false\n mtlsspec:\n enabled: false\n workloadcertttl: \"\"\n allowedclockskew: \"\"\n secrets:\n scopes: []\n accesscontrolspec:\n defaultAction: \"\"\n trustDomain: \"\"\n policies: []\n", + expectedOutput: "name: appConfig\nspec:\n httppipelinespec:\n handlers: []\n tracingspec:\n samplingrate: \"\"\n zipkin:\n endpointaddresss: \"\"\n metricspec:\n enabled: false\n mtlsspec:\n enabled: false\n workloadcertttl: \"\"\n allowedclockskew: \"\"\n secrets:\n scopes: []\n accesscontrolspec:\n defaultAction: \"\"\n trustDomain: \"\"\n policies: []\n nameresolutionspec:\n component: \"\"\n version: \"\"\n configuration:\n json:\n raw: []\n features: []\n apispec:\n allowed: []\n", errString: "", errorExpected: false, k8sConfig: []v1alpha1.Configuration{ @@ -133,7 +133,7 @@ func TestConfigurations(t *testing.T) { name: "Yaml two configs", configName: "", outputFormat: "yaml", - expectedOutput: "- name: appConfig1\n spec:\n httppipelinespec:\n handlers: []\n tracingspec:\n samplingrate: \"\"\n zipkin:\n endpointaddresss: \"\"\n metricspec:\n enabled: false\n mtlsspec:\n enabled: false\n workloadcertttl: \"\"\n allowedclockskew: \"\"\n secrets:\n scopes: []\n accesscontrolspec:\n defaultAction: \"\"\n trustDomain: \"\"\n policies: []\n- name: appConfig2\n spec:\n httppipelinespec:\n handlers: []\n tracingspec:\n samplingrate: \"\"\n zipkin:\n endpointaddresss: \"\"\n metricspec:\n enabled: false\n mtlsspec:\n enabled: false\n workloadcertttl: \"\"\n allowedclockskew: \"\"\n secrets:\n scopes: []\n accesscontrolspec:\n defaultAction: \"\"\n trustDomain: \"\"\n policies: []\n", + expectedOutput: "- name: appConfig1\n spec:\n httppipelinespec:\n handlers: []\n tracingspec:\n samplingrate: \"\"\n zipkin:\n endpointaddresss: \"\"\n metricspec:\n enabled: false\n mtlsspec:\n enabled: false\n workloadcertttl: \"\"\n allowedclockskew: \"\"\n secrets:\n scopes: []\n accesscontrolspec:\n defaultAction: \"\"\n trustDomain: \"\"\n policies: []\n nameresolutionspec:\n component: \"\"\n version: \"\"\n configuration:\n json:\n raw: []\n features: []\n apispec:\n allowed: []\n- name: appConfig2\n spec:\n httppipelinespec:\n handlers: []\n tracingspec:\n samplingrate: \"\"\n zipkin:\n endpointaddresss: \"\"\n metricspec:\n enabled: false\n mtlsspec:\n enabled: false\n workloadcertttl: \"\"\n allowedclockskew: \"\"\n secrets:\n scopes: []\n accesscontrolspec:\n defaultAction: \"\"\n trustDomain: \"\"\n policies: []\n nameresolutionspec:\n component: \"\"\n version: \"\"\n configuration:\n json:\n raw: []\n features: []\n apispec:\n allowed: []\n", errString: "", errorExpected: false, k8sConfig: []v1alpha1.Configuration{ @@ -157,7 +157,7 @@ func TestConfigurations(t *testing.T) { name: "Json one config", configName: "", outputFormat: "json", - expectedOutput: "{\n \"name\": \"appConfig\",\n \"spec\": {\n \"httpPipeline\": {\n \"handlers\": null\n },\n \"tracing\": {\n \"samplingRate\": \"\",\n \"zipkin\": {\n \"endpointAddress\": \"\"\n }\n },\n \"metric\": {\n \"enabled\": false\n },\n \"mtls\": {\n \"enabled\": false,\n \"workloadCertTTL\": \"\",\n \"allowedClockSkew\": \"\"\n },\n \"secrets\": {\n \"scopes\": null\n },\n \"accessControl\": {\n \"defaultAction\": \"\",\n \"trustDomain\": \"\",\n \"policies\": null\n }\n }\n}", + expectedOutput: "{\n \"name\": \"appConfig\",\n \"spec\": {\n \"httpPipeline\": {\n \"handlers\": null\n },\n \"tracing\": {\n \"samplingRate\": \"\",\n \"zipkin\": {\n \"endpointAddress\": \"\"\n }\n },\n \"metric\": {\n \"enabled\": false\n },\n \"mtls\": {\n \"enabled\": false,\n \"workloadCertTTL\": \"\",\n \"allowedClockSkew\": \"\"\n },\n \"secrets\": {\n \"scopes\": null\n },\n \"accessControl\": {\n \"defaultAction\": \"\",\n \"trustDomain\": \"\",\n \"policies\": null\n },\n \"nameResolution\": {\n \"component\": \"\",\n \"version\": \"\",\n \"configuration\": null\n },\n \"api\": {}\n }\n}", errString: "", errorExpected: false, k8sConfig: []v1alpha1.Configuration{ @@ -174,7 +174,7 @@ func TestConfigurations(t *testing.T) { name: "Json two configs", configName: "", outputFormat: "json", - expectedOutput: "[\n {\n \"name\": \"appConfig1\",\n \"spec\": {\n \"httpPipeline\": {\n \"handlers\": null\n },\n \"tracing\": {\n \"samplingRate\": \"\",\n \"zipkin\": {\n \"endpointAddress\": \"\"\n }\n },\n \"metric\": {\n \"enabled\": false\n },\n \"mtls\": {\n \"enabled\": false,\n \"workloadCertTTL\": \"\",\n \"allowedClockSkew\": \"\"\n },\n \"secrets\": {\n \"scopes\": null\n },\n \"accessControl\": {\n \"defaultAction\": \"\",\n \"trustDomain\": \"\",\n \"policies\": null\n }\n }\n },\n {\n \"name\": \"appConfig2\",\n \"spec\": {\n \"httpPipeline\": {\n \"handlers\": null\n },\n \"tracing\": {\n \"samplingRate\": \"\",\n \"zipkin\": {\n \"endpointAddress\": \"\"\n }\n },\n \"metric\": {\n \"enabled\": false\n },\n \"mtls\": {\n \"enabled\": false,\n \"workloadCertTTL\": \"\",\n \"allowedClockSkew\": \"\"\n },\n \"secrets\": {\n \"scopes\": null\n },\n \"accessControl\": {\n \"defaultAction\": \"\",\n \"trustDomain\": \"\",\n \"policies\": null\n }\n }\n }\n]", + expectedOutput: "[\n {\n \"name\": \"appConfig1\",\n \"spec\": {\n \"httpPipeline\": {\n \"handlers\": null\n },\n \"tracing\": {\n \"samplingRate\": \"\",\n \"zipkin\": {\n \"endpointAddress\": \"\"\n }\n },\n \"metric\": {\n \"enabled\": false\n },\n \"mtls\": {\n \"enabled\": false,\n \"workloadCertTTL\": \"\",\n \"allowedClockSkew\": \"\"\n },\n \"secrets\": {\n \"scopes\": null\n },\n \"accessControl\": {\n \"defaultAction\": \"\",\n \"trustDomain\": \"\",\n \"policies\": null\n },\n \"nameResolution\": {\n \"component\": \"\",\n \"version\": \"\",\n \"configuration\": null\n },\n \"api\": {}\n }\n },\n {\n \"name\": \"appConfig2\",\n \"spec\": {\n \"httpPipeline\": {\n \"handlers\": null\n },\n \"tracing\": {\n \"samplingRate\": \"\",\n \"zipkin\": {\n \"endpointAddress\": \"\"\n }\n },\n \"metric\": {\n \"enabled\": false\n },\n \"mtls\": {\n \"enabled\": false,\n \"workloadCertTTL\": \"\",\n \"allowedClockSkew\": \"\"\n },\n \"secrets\": {\n \"scopes\": null\n },\n \"accessControl\": {\n \"defaultAction\": \"\",\n \"trustDomain\": \"\",\n \"policies\": null\n },\n \"nameResolution\": {\n \"component\": \"\",\n \"version\": \"\",\n \"configuration\": null\n },\n \"api\": {}\n }\n }\n]", errString: "", errorExpected: false, k8sConfig: []v1alpha1.Configuration{ diff --git a/tests/e2e/kubernetes/kubernetes_test.go b/tests/e2e/kubernetes/kubernetes_test.go index 93d6ae3b..f9aa0c55 100644 --- a/tests/e2e/kubernetes/kubernetes_test.go +++ b/tests/e2e/kubernetes/kubernetes_test.go @@ -14,7 +14,7 @@ import ( ) const ( - currentRuntimeVersion = "1.3.0" + currentRuntimeVersion = "1.5.0-rc.1" currentDashboardVersion = "0.7.0" )