Skip to content

Commit 9fcd633

Browse files
authored
Merge pull request #695 from devhindo/fixistio
fix: update DefaultGenerationURL to correct path for CRDs
2 parents 20fd7a1 + 3850888 commit 9fcd633

15 files changed

+15
-1
lines changed

build/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,5 @@ func init() {
6565
}
6666
LatestVersion = AllVersions[len(AllVersions)-1]
6767
DefaultGenerationMethod = adapter.Manifests
68-
DefaultGenerationURL = "https://raw.githubusercontent.com/istio/istio/" + LatestVersion + "/manifests/charts/base/crds/crd-all.gen.yaml"
68+
DefaultGenerationURL = "https://raw.githubusercontent.com/istio/istio/" + LatestVersion + "/manifests/charts/base/files/crd-all.gen.yaml"
6969
}

templates/meshmodel/components/1.24.2/authorizationpolicy.Istio.meshery.layer5.io_meshmodel.json

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

templates/meshmodel/components/1.24.2/destinationrule.Istio.meshery.layer5.io_meshmodel.json

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

templates/meshmodel/components/1.24.2/envoyfilter.Istio.meshery.layer5.io_meshmodel.json

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"id":"00000000-0000-0000-0000-000000000000","kind":"Gateway","apiVersion":"networking.istio.io/v1","displayName":"Gateway","format":"JSON","hostID":"00000000-0000-0000-0000-000000000000","metadata":{"logoURL":"https://github.com/istio/istio/blob/master/logo/istio-bluelogo-whitebackground-unframed.svg","primaryColor":"#466BB0","secondaryColor":"#93b0e6","shape":"circle","svgColor":"\u003csvg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" height=\"20\" width=\"20\" 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 height=\"20\" width=\"20\" 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"},"model":{"id":"00000000-0000-0000-0000-000000000000","name":"istio","version":"1.24.2","displayName":"ISTIO","hostID":"00000000-0000-0000-0000-000000000000","category":{"name":"Cloud Native Network","metadata":null},"metadata":{"logoURL":"https://github.com/istio/istio/blob/master/logo/istio-bluelogo-whitebackground-unframed.svg","primaryColor":"#466BB0","secondaryColor":"#93b0e6","shape":"circle","svgColor":"\u003csvg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" height=\"20\" width=\"20\" 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 height=\"20\" width=\"20\" 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"},"components":null,"relationships":null},"schema":"{\n \"properties\": {\n \"spec\": {\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 \"type\": \"string\"\n },\n \"description\": \"One or more labels that indicate a specific set of pods/VMs on which this gateway configuration should be applied.\",\n \"type\": \"object\"\n },\n \"servers\": {\n \"description\": \"A list of server specifications.\",\n \"items\": {\n \"properties\": {\n \"bind\": {\n \"description\": \"The ip or the Unix domain socket to which the listener should be bound to.\",\n \"type\": \"string\"\n },\n \"defaultEndpoint\": {\n \"type\": \"string\"\n },\n \"hosts\": {\n \"description\": \"One or more hosts exposed by this gateway.\",\n \"items\": {\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 \"type\": \"string\"\n },\n \"port\": {\n \"description\": \"The Port on which the proxy should listen for incoming connections.\",\n \"properties\": {\n \"name\": {\n \"description\": \"Label assigned to the port.\",\n \"type\": \"string\"\n },\n \"number\": {\n \"description\": \"A valid non-negative integer port number.\",\n \"maximum\": 4294967295,\n \"minimum\": 0,\n \"type\": \"integer\"\n },\n \"protocol\": {\n \"description\": \"The protocol exposed on the port.\",\n \"type\": \"string\"\n },\n \"targetPort\": {\n \"maximum\": 4294967295,\n \"minimum\": 0,\n \"type\": \"integer\"\n }\n },\n \"required\": [\n \"number\",\n \"protocol\",\n \"name\"\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` or `OPTIONAL_MUTUAL`.\",\n \"type\": \"string\"\n },\n \"caCrl\": {\n \"description\": \"OPTIONAL: The path to the file containing the certificate revocation list (CRL) to use in verifying a presented client side certificate.\",\n \"type\": \"string\"\n },\n \"cipherSuites\": {\n \"description\": \"Optional: If specified, only support the specified cipher list.\",\n \"items\": {\n \"type\": \"string\"\n },\n \"type\": \"array\"\n },\n \"credentialName\": {\n \"description\": \"For gateways running on Kubernetes, the name of the secret that holds the TLS certs including the CA certificates.\",\n \"type\": \"string\"\n },\n \"httpsRedirect\": {\n \"description\": \"If set to true, the load balancer will send a 301 redirect for all http connections, asking the clients to use HTTPS.\",\n \"type\": \"boolean\"\n },\n \"maxProtocolVersion\": {\n \"description\": \"Optional: Maximum TLS protocol version.\\n\\nValid Options: TLS_AUTO, TLSV1_0, TLSV1_1, TLSV1_2, TLSV1_3\",\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\\nValid Options: TLS_AUTO, TLSV1_0, TLSV1_1, TLSV1_2, TLSV1_3\",\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 \"description\": \"Optional: Indicates whether connections to this port should be secured using TLS.\\n\\nValid Options: PASSTHROUGH, SIMPLE, MUTUAL, AUTO_PASSTHROUGH, ISTIO_MUTUAL, OPTIONAL_MUTUAL\",\n \"enum\": [\n \"PASSTHROUGH\",\n \"SIMPLE\",\n \"MUTUAL\",\n \"AUTO_PASSTHROUGH\",\n \"ISTIO_MUTUAL\",\n \"OPTIONAL_MUTUAL\"\n ],\n \"type\": \"string\"\n },\n \"privateKey\": {\n \"description\": \"REQUIRED if mode is `SIMPLE` or `MUTUAL`.\",\n \"type\": \"string\"\n },\n \"serverCertificate\": {\n \"description\": \"REQUIRED if mode is `SIMPLE` or `MUTUAL`.\",\n \"type\": \"string\"\n },\n \"subjectAltNames\": {\n \"description\": \"A list of alternate names to verify the subject identity in the certificate presented by the client.\",\n \"items\": {\n \"type\": \"string\"\n },\n \"type\": \"array\"\n },\n \"verifyCertificateHash\": {\n \"description\": \"An optional list of hex-encoded SHA-256 hashes of the authorized client certificates.\",\n \"items\": {\n \"type\": \"string\"\n },\n \"type\": \"array\"\n },\n \"verifyCertificateSpki\": {\n \"description\": \"An optional list of base64-encoded SHA-256 hashes of the SPKIs of authorized client certificates.\",\n \"items\": {\n \"type\": \"string\"\n },\n \"type\": \"array\"\n }\n },\n \"type\": \"object\"\n }\n },\n \"required\": [\n \"port\",\n \"hosts\"\n ],\n \"type\": \"object\"\n },\n \"type\": \"array\"\n }\n },\n \"type\": \"object\"\n },\n \"status\": {\n \"properties\": {\n \"conditions\": {\n \"description\": \"Current service state of the resource.\",\n \"items\": {\n \"properties\": {\n \"lastProbeTime\": {\n \"description\": \"Last time we probed the condition.\",\n \"format\": \"date-time\",\n \"type\": \"string\"\n },\n \"lastTransitionTime\": {\n \"description\": \"Last time the condition transitioned from one status to another.\",\n \"format\": \"date-time\",\n \"type\": \"string\"\n },\n \"message\": {\n \"description\": \"Human-readable message indicating details about last transition.\",\n \"type\": \"string\"\n },\n \"reason\": {\n \"description\": \"Unique, one-word, CamelCase reason for the condition's last transition.\",\n \"type\": \"string\"\n },\n \"status\": {\n \"description\": \"Status is the status of the condition.\",\n \"type\": \"string\"\n },\n \"type\": {\n \"description\": \"Type is the type of the condition.\",\n \"type\": \"string\"\n }\n },\n \"type\": \"object\"\n },\n \"type\": \"array\"\n },\n \"observedGeneration\": {\n \"anyOf\": [\n {\n \"type\": \"integer\"\n },\n {\n \"type\": \"string\"\n }\n ],\n \"description\": \"Resource Generation to which the Reconciled Condition refers.\",\n \"x-kubernetes-int-or-string\": true\n },\n \"validationMessages\": {\n \"description\": \"Includes any errors or warnings detected by Istio's analyzers.\",\n \"items\": {\n \"properties\": {\n \"documentationUrl\": {\n \"description\": \"A url pointing to the Istio documentation for this specific error type.\",\n \"type\": \"string\"\n },\n \"level\": {\n \"description\": \"Represents how severe a message is.\\n\\nValid Options: UNKNOWN, ERROR, WARNING, INFO\",\n \"enum\": [\n \"UNKNOWN\",\n \"ERROR\",\n \"WARNING\",\n \"INFO\"\n ],\n \"type\": \"string\"\n },\n \"type\": {\n \"properties\": {\n \"code\": {\n \"description\": \"A 7 character code matching `^IST[0-9]{4}$` intended to uniquely identify the message type.\",\n \"type\": \"string\"\n },\n \"name\": {\n \"description\": \"A human-readable name for the message type.\",\n \"type\": \"string\"\n }\n },\n \"type\": \"object\"\n }\n },\n \"type\": \"object\"\n },\n \"type\": \"array\"\n }\n },\n \"type\": \"object\",\n \"x-kubernetes-preserve-unknown-fields\": true\n }\n },\n \"title\": \"Gateway\",\n \"type\": \"object\"\n}"}

0 commit comments

Comments
 (0)