Skip to content

Commit

Permalink
Remove OAM and update adapter library
Browse files Browse the repository at this point in the history
Signed-off-by: Ashish Tiwari <[email protected]>
  • Loading branch information
Revolyssup committed Apr 19, 2023
1 parent 5f01c22 commit 2b97313
Show file tree
Hide file tree
Showing 1,975 changed files with 1,504 additions and 4,091 deletions.
4 changes: 2 additions & 2 deletions build/meshmodel_metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"secondaryColor": "#93b0e6",
"shape": "circle",
"logoURL": "https://github.com/istio/istio/blob/master/logo/istio-bluelogo-whitebackground-unframed.svg",
"svgColor": "<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" viewBox=\"0 0 160 240\"><g id=\"logo\" fill=\"#466BB0\"><rect id=\"background\" width=\"160\" height=\"240\" fill=\"#fff\"/><polygon id=\"hull\" points=\"0 210 160 210 60 240\"/><polygon id=\"mainsail\" points=\"0 200 60 190 60 80\"/><polygon id=\"headsail\" points=\"70 190 160 200 70 0\"/></g></svg>\n",
"svgWhite": "<svg viewBox=\"6.386270046234131 3.7419400215148926 18.227430820465088 25.258059978485107\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M6.38627 24.7904L13.2215 23.738V12.1613L6.38627 24.7904Z\" fill=\"white\"/><path d=\"M6.38627 25.8427H24.6137L13.2215 29L6.38627 25.8427Z\" fill=\"white\"/><path d=\"M14.3608 23.7379L24.6137 24.7904L14.3608 3.74194V23.7379Z\" fill=\"white\"/></svg>"
"svgColor": "<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" height=\"20\" width=\"20\" viewBox=\"0 0 160 240\"><g id=\"logo\" fill=\"#466BB0\"><rect id=\"background\" width=\"160\" height=\"240\" fill=\"#fff\"/><polygon id=\"hull\" points=\"0 210 160 210 60 240\"/><polygon id=\"mainsail\" points=\"0 200 60 190 60 80\"/><polygon id=\"headsail\" points=\"70 190 160 200 70 0\"/></g></svg>\n",
"svgWhite": "<svg height=\"20\" width=\"20\" viewBox=\"6.386270046234131 3.7419400215148926 18.227430820465088 25.258059978485107\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M6.38627 24.7904L13.2215 23.738V12.1613L6.38627 24.7904Z\" fill=\"white\"/><path d=\"M6.38627 25.8427H24.6137L13.2215 29L6.38627 25.8427Z\" fill=\"white\"/><path d=\"M14.3608 23.7379L24.6137 24.7904L14.3608 3.74194V23.7379Z\" fill=\"white\"/></svg>"
}
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ replace (

require (
github.com/aspenmesh/istio-vet v0.0.0-20200806222806-9c8e9a962b9f
github.com/layer5io/meshery-adapter-library v0.6.6
github.com/layer5io/meshery-adapter-library v0.6.7
github.com/layer5io/meshkit v0.6.34
github.com/layer5io/service-mesh-performance v0.3.4
gopkg.in/yaml.v2 v2.4.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -583,8 +583,8 @@ github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6Fm
github.com/layer5io/kuttl v0.4.1-0.20200723152044-916f10574334/go.mod h1:UmrVd7x+bNVKrpmKgTtfRiTKHZeNPcMjQproJ0vGwhE=
github.com/layer5io/learn-layer5/smi-conformance v0.0.0-20210317075357-06b4f88b3e34 h1:QaViadDOBCMDUwYx78kfRvHMkzRVnh/GOhm3s2gxoP4=
github.com/layer5io/learn-layer5/smi-conformance v0.0.0-20210317075357-06b4f88b3e34/go.mod h1:BQPLwdJt7v7y0fXIejI4whR9zMyX07Wjt5xrbgEmHLw=
github.com/layer5io/meshery-adapter-library v0.6.6 h1:CTFGwA+8UT/bvC++KOFk7JAbTEo9hANubWuXX0672kE=
github.com/layer5io/meshery-adapter-library v0.6.6/go.mod h1:7vsze4Cd0pzKtbD+BARNa/vt+GYSzmkhKA6unmAD0qc=
github.com/layer5io/meshery-adapter-library v0.6.7 h1:d0NpqTwF4djt0SWKpIGjEl6BTFK9Li32ynYx5BS5A8E=
github.com/layer5io/meshery-adapter-library v0.6.7/go.mod h1:7vsze4Cd0pzKtbD+BARNa/vt+GYSzmkhKA6unmAD0qc=
github.com/layer5io/meshkit v0.6.34 h1:O6reRSDNZOIEvmU1SFYIoocdrYaBWYffvohXGAwcw10=
github.com/layer5io/meshkit v0.6.34/go.mod h1:eNje6+B3/EkAkyvNHgeelwD7pPEf12eTh8iPMgMGfiM=
github.com/layer5io/service-mesh-performance v0.3.2-0.20210122142912-a94e0658b021/go.mod h1:W153amv8aHAeIWxO7b7d7Vibt9RhaEVh4Uh+RG+BumQ=
Expand Down
9 changes: 8 additions & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ func registerWorkloads(port string, log logger.Handler) {
}

log.Info("Registering latest workload components for version ", version)

err := adapter.CreateComponents(adapter.StaticCompConfig{
URL: url,
Method: gm,
Expand All @@ -203,6 +202,14 @@ func registerWorkloads(port string, log logger.Handler) {
log.Error(err)
return
}
// err := adapter.CreateComponents(adapter.StaticCompConfig{
// URL: url,
// Method: gm,
// MeshModelPath: build.MeshModelPath,
// MeshModelConfig: build.MeshModelConfig,
// DirName: version,
// Config: build.NewConfig(version),
// })

//The below log is checked in the workflows. If you change this log, reflect that change in the workflow where components are generated
log.Info("Component creation completed for version ", version)
Expand Down

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": {"name":"Cloud Native Network","metadata":null},"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","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":{"name":"istio","version":"1.10.0-alpha.0","displayName":"ISTIO","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"}},"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}"}

This file was deleted.

This file was deleted.

Loading

0 comments on commit 2b97313

Please sign in to comment.