Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Normalise model-name to ISTIO & model-displayName to Istio #554

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"kind":"Gateway","apiVersion":"networking.istio.io/v1alpha3","displayName":"Gateway","format":"JSON","metadata":{"logoURL":"https://github.com/istio/istio/blob/master/logo/istio-bluelogo-whitebackground-unframed.svg","primaryColor":"#466BB0","svgColor":"\u003csvg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" viewBox=\"0 0 160 240\"\u003e\u003cg id=\"logo\" fill=\"#466BB0\"\u003e\u003crect id=\"background\" width=\"160\" height=\"240\" fill=\"#fff\"/\u003e\u003cpolygon id=\"hull\" points=\"0 210 160 210 60 240\"/\u003e\u003cpolygon id=\"mainsail\" points=\"0 200 60 190 60 80\"/\u003e\u003cpolygon id=\"headsail\" points=\"70 190 160 200 70 0\"/\u003e\u003c/g\u003e\u003c/svg\u003e\n","svgWhite":"\u003csvg viewBox=\"6.386270046234131 3.7419400215148926 18.227430820465088 25.258059978485107\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\"\u003e\u003cpath d=\"M6.38627 24.7904L13.2215 23.738V12.1613L6.38627 24.7904Z\" fill=\"white\"/\u003e\u003cpath d=\"M6.38627 25.8427H24.6137L13.2215 29L6.38627 25.8427Z\" fill=\"white\"/\u003e\u003cpath d=\"M14.3608 23.7379L24.6137 24.7904L14.3608 3.74194V23.7379Z\" fill=\"white\"/\u003e\u003c/svg\u003e","secondaryColor":"#93b0e6","shape":"circle"},"model":{"name":"istio","version":"1.10.0-alpha.0","displayName":"ISTIO","category":"Orchestration \u0026 Management","subCategory":"Service Mesh"},"schema":"{\n \"description\": \"Configuration affecting edge load balancer. See more details at: https://istio.io/docs/reference/config/networking/gateway.html\",\n \"properties\": {\n \"selector\": {\n \"additionalProperties\": {\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"type\": \"object\"\n },\n \"servers\": {\n \"description\": \"A list of server specifications.\",\n \"items\": {\n \"properties\": {\n \"bind\": {\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"defaultEndpoint\": {\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"hosts\": {\n \"description\": \"One or more hosts exposed by this gateway.\",\n \"items\": {\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"type\": \"array\"\n },\n \"name\": {\n \"description\": \"An optional name of the server, when set must be unique across all servers.\",\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"port\": {\n \"properties\": {\n \"name\": {\n \"description\": \"Label assigned to the port.\",\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"number\": {\n \"description\": \"A valid non-negative integer port number.\",\n \"type\": \"integer\"\n },\n \"protocol\": {\n \"description\": \"The protocol exposed on the port.\",\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"targetPort\": {\n \"type\": \"integer\"\n }\n },\n \"type\": \"object\"\n },\n \"tls\": {\n \"description\": \"Set of TLS related options that govern the server's behavior.\",\n \"properties\": {\n \"caCertificates\": {\n \"description\": \"REQUIRED if mode is `MUTUAL`.\",\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"cipherSuites\": {\n \"description\": \"Optional: If specified, only support the specified cipher list.\",\n \"items\": {\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"type\": \"array\"\n },\n \"credentialName\": {\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"httpsRedirect\": {\n \"type\": \"boolean\"\n },\n \"maxProtocolVersion\": {\n \"description\": \"Optional: Maximum TLS protocol version.\",\n \"enum\": [\n \"TLS_AUTO\",\n \"TLSV1_0\",\n \"TLSV1_1\",\n \"TLSV1_2\",\n \"TLSV1_3\"\n ],\n \"type\": \"string\"\n },\n \"minProtocolVersion\": {\n \"description\": \"Optional: Minimum TLS protocol version.\",\n \"enum\": [\n \"TLS_AUTO\",\n \"TLSV1_0\",\n \"TLSV1_1\",\n \"TLSV1_2\",\n \"TLSV1_3\"\n ],\n \"type\": \"string\"\n },\n \"mode\": {\n \"enum\": [\n \"PASSTHROUGH\",\n \"SIMPLE\",\n \"MUTUAL\",\n \"AUTO_PASSTHROUGH\",\n \"ISTIO_MUTUAL\"\n ],\n \"type\": \"string\"\n },\n \"privateKey\": {\n \"description\": \"REQUIRED if mode is `SIMPLE` or `MUTUAL`.\",\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"serverCertificate\": {\n \"description\": \"REQUIRED if mode is `SIMPLE` or `MUTUAL`.\",\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"subjectAltNames\": {\n \"items\": {\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"type\": \"array\"\n },\n \"verifyCertificateHash\": {\n \"items\": {\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"type\": \"array\"\n },\n \"verifyCertificateSpki\": {\n \"items\": {\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"type\": \"array\"\n }\n },\n \"type\": \"object\"\n }\n },\n \"type\": \"object\"\n },\n \"type\": \"array\"\n }\n },\n \"title\": \"Gateway\",\n \"type\": \"object\"\n}"}
{"kind":"Gateway","apiVersion":"networking.istio.io/v1alpha3","displayName":"Gateway","format":"JSON","metadata":{"logoURL":"https://github.com/istio/istio/blob/master/logo/istio-bluelogo-whitebackground-unframed.svg","primaryColor":"#466BB0","svgColor":"\u003csvg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" viewBox=\"0 0 160 240\"\u003e\u003cg id=\"logo\" fill=\"#466BB0\"\u003e\u003crect id=\"background\" width=\"160\" height=\"240\" fill=\"#fff\"/\u003e\u003cpolygon id=\"hull\" points=\"0 210 160 210 60 240\"/\u003e\u003cpolygon id=\"mainsail\" points=\"0 200 60 190 60 80\"/\u003e\u003cpolygon id=\"headsail\" points=\"70 190 160 200 70 0\"/\u003e\u003c/g\u003e\u003c/svg\u003e\n","svgWhite":"\u003csvg viewBox=\"6.386270046234131 3.7419400215148926 18.227430820465088 25.258059978485107\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\"\u003e\u003cpath d=\"M6.38627 24.7904L13.2215 23.738V12.1613L6.38627 24.7904Z\" fill=\"white\"/\u003e\u003cpath d=\"M6.38627 25.8427H24.6137L13.2215 29L6.38627 25.8427Z\" fill=\"white\"/\u003e\u003cpath d=\"M14.3608 23.7379L24.6137 24.7904L14.3608 3.74194V23.7379Z\" fill=\"white\"/\u003e\u003c/svg\u003e","secondaryColor":"#93b0e6","shape":"circle"},"model":{"name":"ISTIO","version":"1.10.0-alpha.0","displayName":"Istio","category":"Orchestration \u0026 Management","subCategory":"Service Mesh"},"schema":"{\n \"description\": \"Configuration affecting edge load balancer. See more details at: https://istio.io/docs/reference/config/networking/gateway.html\",\n \"properties\": {\n \"selector\": {\n \"additionalProperties\": {\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"type\": \"object\"\n },\n \"servers\": {\n \"description\": \"A list of server specifications.\",\n \"items\": {\n \"properties\": {\n \"bind\": {\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"defaultEndpoint\": {\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"hosts\": {\n \"description\": \"One or more hosts exposed by this gateway.\",\n \"items\": {\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"type\": \"array\"\n },\n \"name\": {\n \"description\": \"An optional name of the server, when set must be unique across all servers.\",\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"port\": {\n \"properties\": {\n \"name\": {\n \"description\": \"Label assigned to the port.\",\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"number\": {\n \"description\": \"A valid non-negative integer port number.\",\n \"type\": \"integer\"\n },\n \"protocol\": {\n \"description\": \"The protocol exposed on the port.\",\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"targetPort\": {\n \"type\": \"integer\"\n }\n },\n \"type\": \"object\"\n },\n \"tls\": {\n \"description\": \"Set of TLS related options that govern the server's behavior.\",\n \"properties\": {\n \"caCertificates\": {\n \"description\": \"REQUIRED if mode is `MUTUAL`.\",\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"cipherSuites\": {\n \"description\": \"Optional: If specified, only support the specified cipher list.\",\n \"items\": {\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"type\": \"array\"\n },\n \"credentialName\": {\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"httpsRedirect\": {\n \"type\": \"boolean\"\n },\n \"maxProtocolVersion\": {\n \"description\": \"Optional: Maximum TLS protocol version.\",\n \"enum\": [\n \"TLS_AUTO\",\n \"TLSV1_0\",\n \"TLSV1_1\",\n \"TLSV1_2\",\n \"TLSV1_3\"\n ],\n \"type\": \"string\"\n },\n \"minProtocolVersion\": {\n \"description\": \"Optional: Minimum TLS protocol version.\",\n \"enum\": [\n \"TLS_AUTO\",\n \"TLSV1_0\",\n \"TLSV1_1\",\n \"TLSV1_2\",\n \"TLSV1_3\"\n ],\n \"type\": \"string\"\n },\n \"mode\": {\n \"enum\": [\n \"PASSTHROUGH\",\n \"SIMPLE\",\n \"MUTUAL\",\n \"AUTO_PASSTHROUGH\",\n \"ISTIO_MUTUAL\"\n ],\n \"type\": \"string\"\n },\n \"privateKey\": {\n \"description\": \"REQUIRED if mode is `SIMPLE` or `MUTUAL`.\",\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"serverCertificate\": {\n \"description\": \"REQUIRED if mode is `SIMPLE` or `MUTUAL`.\",\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"subjectAltNames\": {\n \"items\": {\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"type\": \"array\"\n },\n \"verifyCertificateHash\": {\n \"items\": {\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"type\": \"array\"\n },\n \"verifyCertificateSpki\": {\n \"items\": {\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"type\": \"array\"\n }\n },\n \"type\": \"object\"\n }\n },\n \"type\": \"object\"\n },\n \"type\": \"array\"\n }\n },\n \"title\": \"Gateway\",\n \"type\": \"object\"\n}"}
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"shape": "circle"
},
"model": {
"name": "istio",
"name": "ISTIO",
"version": "1.10.0-alpha.0",
"displayName": "istio",
"displayName": "Istio",
"category": "Service Mesh",
"subCategory": ""
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"shape": "circle"
},
"model": {
"name": "istio",
"name": "ISTIO",
"version": "1.10.0-alpha.0",
"displayName": "ISTIO",
"displayName":"Istio",
"category": "Service Mesh",
"subCategory": ""
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"kind":"JaegerIstioAddon","apiVersion":"core.meshmodel.dev/v1alpha1","displayName":"Jaeger Istio Addon","format":"JSON","metadata":{"logoURL":"https://github.com/istio/istio/blob/master/logo/istio-bluelogo-whitebackground-unframed.svg","primaryColor":"#466BB0","svgColor":"\u003csvg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" viewBox=\"0 0 160 240\"\u003e\u003cg id=\"logo\" fill=\"#466BB0\"\u003e\u003crect id=\"background\" width=\"160\" height=\"240\" fill=\"#fff\"/\u003e\u003cpolygon id=\"hull\" points=\"0 210 160 210 60 240\"/\u003e\u003cpolygon id=\"mainsail\" points=\"0 200 60 190 60 80\"/\u003e\u003cpolygon id=\"headsail\" points=\"70 190 160 200 70 0\"/\u003e\u003c/g\u003e\u003c/svg\u003e\n","svgWhite":"\u003csvg viewBox=\"6.386270046234131 3.7419400215148926 18.227430820465088 25.258059978485107\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\"\u003e\u003cpath d=\"M6.38627 24.7904L13.2215 23.738V12.1613L6.38627 24.7904Z\" fill=\"white\"/\u003e\u003cpath d=\"M6.38627 25.8427H24.6137L13.2215 29L6.38627 25.8427Z\" fill=\"white\"/\u003e\u003cpath d=\"M14.3608 23.7379L24.6137 24.7904L14.3608 3.74194V23.7379Z\" fill=\"white\"/\u003e\u003c/svg\u003e","secondaryColor":"#93b0e6","shape":"circle"},"model":{"name":"istio","version":"1.10.0-alpha.0","displayName":"ISTIO","category":"Service Mesh","subCategory":""},"schema":"{\"properties\":{},\"title\":\"JaegerIstioAddon\",\"type\":\"object\"}"}
{"kind":"JaegerIstioAddon","apiVersion":"core.meshmodel.dev/v1alpha1","displayName":"Jaeger Istio Addon","format":"JSON","metadata":{"logoURL":"https://github.com/istio/istio/blob/master/logo/istio-bluelogo-whitebackground-unframed.svg","primaryColor":"#466BB0","svgColor":"\u003csvg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" viewBox=\"0 0 160 240\"\u003e\u003cg id=\"logo\" fill=\"#466BB0\"\u003e\u003crect id=\"background\" width=\"160\" height=\"240\" fill=\"#fff\"/\u003e\u003cpolygon id=\"hull\" points=\"0 210 160 210 60 240\"/\u003e\u003cpolygon id=\"mainsail\" points=\"0 200 60 190 60 80\"/\u003e\u003cpolygon id=\"headsail\" points=\"70 190 160 200 70 0\"/\u003e\u003c/g\u003e\u003c/svg\u003e\n","svgWhite":"\u003csvg viewBox=\"6.386270046234131 3.7419400215148926 18.227430820465088 25.258059978485107\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\"\u003e\u003cpath d=\"M6.38627 24.7904L13.2215 23.738V12.1613L6.38627 24.7904Z\" fill=\"white\"/\u003e\u003cpath d=\"M6.38627 25.8427H24.6137L13.2215 29L6.38627 25.8427Z\" fill=\"white\"/\u003e\u003cpath d=\"M14.3608 23.7379L24.6137 24.7904L14.3608 3.74194V23.7379Z\" fill=\"white\"/\u003e\u003c/svg\u003e","secondaryColor":"#93b0e6","shape":"circle"},"model":{"name":"ISTIO","version":"1.10.0-alpha.0","displayName":"Istio","category":"Service Mesh","subCategory":""},"schema":"{\"properties\":{},\"title\":\"JaegerIstioAddon\",\"type\":\"object\"}"}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"kind":"PeerAuthentication","apiVersion":"security.istio.io/v1beta1","displayName":"Peer Authentication","format":"JSON","metadata":{"logoURL":"https://github.com/istio/istio/blob/master/logo/istio-bluelogo-whitebackground-unframed.svg","primaryColor":"#466BB0","svgColor":"\u003csvg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" viewBox=\"0 0 160 240\"\u003e\u003cg id=\"logo\" fill=\"#466BB0\"\u003e\u003crect id=\"background\" width=\"160\" height=\"240\" fill=\"#fff\"/\u003e\u003cpolygon id=\"hull\" points=\"0 210 160 210 60 240\"/\u003e\u003cpolygon id=\"mainsail\" points=\"0 200 60 190 60 80\"/\u003e\u003cpolygon id=\"headsail\" points=\"70 190 160 200 70 0\"/\u003e\u003c/g\u003e\u003c/svg\u003e\n","svgWhite":"\u003csvg viewBox=\"6.386270046234131 3.7419400215148926 18.227430820465088 25.258059978485107\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\"\u003e\u003cpath d=\"M6.38627 24.7904L13.2215 23.738V12.1613L6.38627 24.7904Z\" fill=\"white\"/\u003e\u003cpath d=\"M6.38627 25.8427H24.6137L13.2215 29L6.38627 25.8427Z\" fill=\"white\"/\u003e\u003cpath d=\"M14.3608 23.7379L24.6137 24.7904L14.3608 3.74194V23.7379Z\" fill=\"white\"/\u003e\u003c/svg\u003e","secondaryColor":"#93b0e6","shape":"circle"},"model":{"name":"istio","version":"1.10.0-alpha.0","displayName":"ISTIO","category":"Orchestration \u0026 Management","subCategory":"Service Mesh"},"schema":"{\n \"description\": \"PeerAuthentication defines how traffic will be tunneled (or not) to the sidecar.\",\n \"properties\": {\n \"mtls\": {\n \"description\": \"Mutual TLS settings for workload.\",\n \"properties\": {\n \"mode\": {\n \"description\": \"Defines the mTLS mode used for peer authentication.\",\n \"enum\": [\n \"UNSET\",\n \"DISABLE\",\n \"PERMISSIVE\",\n \"STRICT\"\n ],\n \"type\": \"string\"\n }\n },\n \"type\": \"object\"\n },\n \"portLevelMtls\": {\n \"additionalProperties\": {\n \"properties\": {\n \"mode\": {\n \"description\": \"Defines the mTLS mode used for peer authentication.\",\n \"enum\": [\n \"UNSET\",\n \"DISABLE\",\n \"PERMISSIVE\",\n \"STRICT\"\n ],\n \"type\": \"string\"\n }\n },\n \"type\": \"object\"\n },\n \"description\": \"Port specific mutual TLS settings.\",\n \"type\": \"object\"\n },\n \"selector\": {\n \"description\": \"The selector determines the workloads to apply the ChannelAuthentication on.\",\n \"properties\": {\n \"matchLabels\": {\n \"additionalProperties\": {\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"type\": \"object\"\n }\n },\n \"type\": \"object\"\n }\n },\n \"title\": \"Peer Authentication\",\n \"type\": \"object\"\n}"}
{"kind":"PeerAuthentication","apiVersion":"security.istio.io/v1beta1","displayName":"Peer Authentication","format":"JSON","metadata":{"logoURL":"https://github.com/istio/istio/blob/master/logo/istio-bluelogo-whitebackground-unframed.svg","primaryColor":"#466BB0","svgColor":"\u003csvg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" viewBox=\"0 0 160 240\"\u003e\u003cg id=\"logo\" fill=\"#466BB0\"\u003e\u003crect id=\"background\" width=\"160\" height=\"240\" fill=\"#fff\"/\u003e\u003cpolygon id=\"hull\" points=\"0 210 160 210 60 240\"/\u003e\u003cpolygon id=\"mainsail\" points=\"0 200 60 190 60 80\"/\u003e\u003cpolygon id=\"headsail\" points=\"70 190 160 200 70 0\"/\u003e\u003c/g\u003e\u003c/svg\u003e\n","svgWhite":"\u003csvg viewBox=\"6.386270046234131 3.7419400215148926 18.227430820465088 25.258059978485107\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\"\u003e\u003cpath d=\"M6.38627 24.7904L13.2215 23.738V12.1613L6.38627 24.7904Z\" fill=\"white\"/\u003e\u003cpath d=\"M6.38627 25.8427H24.6137L13.2215 29L6.38627 25.8427Z\" fill=\"white\"/\u003e\u003cpath d=\"M14.3608 23.7379L24.6137 24.7904L14.3608 3.74194V23.7379Z\" fill=\"white\"/\u003e\u003c/svg\u003e","secondaryColor":"#93b0e6","shape":"circle"},"model":{"name":"ISTIO","version":"1.10.0-alpha.0","displayName":"Istio","category":"Orchestration \u0026 Management","subCategory":"Service Mesh"},"schema":"{\n \"description\": \"PeerAuthentication defines how traffic will be tunneled (or not) to the sidecar.\",\n \"properties\": {\n \"mtls\": {\n \"description\": \"Mutual TLS settings for workload.\",\n \"properties\": {\n \"mode\": {\n \"description\": \"Defines the mTLS mode used for peer authentication.\",\n \"enum\": [\n \"UNSET\",\n \"DISABLE\",\n \"PERMISSIVE\",\n \"STRICT\"\n ],\n \"type\": \"string\"\n }\n },\n \"type\": \"object\"\n },\n \"portLevelMtls\": {\n \"additionalProperties\": {\n \"properties\": {\n \"mode\": {\n \"description\": \"Defines the mTLS mode used for peer authentication.\",\n \"enum\": [\n \"UNSET\",\n \"DISABLE\",\n \"PERMISSIVE\",\n \"STRICT\"\n ],\n \"type\": \"string\"\n }\n },\n \"type\": \"object\"\n },\n \"description\": \"Port specific mutual TLS settings.\",\n \"type\": \"object\"\n },\n \"selector\": {\n \"description\": \"The selector determines the workloads to apply the ChannelAuthentication on.\",\n \"properties\": {\n \"matchLabels\": {\n \"additionalProperties\": {\n \"format\": \"string\",\n \"type\": \"string\"\n },\n \"type\": \"object\"\n }\n },\n \"type\": \"object\"\n }\n },\n \"title\": \"Peer Authentication\",\n \"type\": \"object\"\n}"}
Loading