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.

Sign up for GitHub

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

Updated config.go - Externalizing svg data to meshmodel_metadata.json #106

Merged
merged 3 commits into from
Jan 25, 2023
Merged

Updated config.go - Externalizing svg data to meshmodel_metadata.json #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7170477
Update externalizing svg data
b0id Jan 18, 2023
d469440
Update externalizing svg data
b0id Jan 18, 2023
1f9cc78
lowercase keys w/ hyphens in meshmodel_metadata.json
b0id Jan 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions build/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package build

import (
"encoding/json"
"fmt"
"io"
"os"
"path/filepath"
"strings"
Expand All @@ -21,19 +23,12 @@ var MeshModelPath string
var AllVersions []string
var CRDNames []string

var meshmodelmetadata = map[string]interface{}{
"Primary Color": "#6B91C7",
"Secondary Color": "#9AB0CF",
"Shape": "circle",
"Logo URL": "https://github.com/cncf/artwork/blob/master/projects/cilium/icon/white/cilium_icon-white.svg?short_path=d2fbc08",
"SVG_Color": "<svg id=\"Layer_1\" data-name=\"Layer 1\" xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 300 304.21698\"><defs><style>.cls-1{fill:#cbdd72;}.cls-2{fill:#98ca3f;}.cls-3{fill:#6389c6;}.cls-4{fill:#e8282b;}.cls-5{fill:#f8c519;}.cls-6{fill:#f07525;}.cls-7{fill:#8162aa;}.cls-8{fill:#373737;}</style></defs><path class=\"cls-1\" d=\"M40.53139,62.5952h44.7715l22.38575,38.83793L85.30289,140.27106H40.53139L18.14564,101.43313Z\"/><path class=\"cls-2\" d=\"M40.53139,162.3871h44.7715l22.38575,38.56822L85.30289,239.52354H40.53139L18.14564,200.95532Z\"/><path class=\"cls-3\" d=\"M127.91673,211.47393h44.7715L195.074,250.04215l-22.38575,38.56822h-44.7715L105.531,250.04215Z\"/><path class=\"cls-4\" d=\"M127.91673,111.682h44.7715L195.074,150.52l-22.38575,38.83792h-44.7715L105.531,150.52Z\"/><path class=\"cls-5\" d=\"M127.91673,12.42954h44.7715L195.074,50.99776,172.68823,89.566h-44.7715L105.531,50.99776Z\"/><path class=\"cls-6\" d=\"M214.6278,62.5952h45.58062l22.79032,38.83793-22.79032,38.83793H214.6278l-22.79031-38.83793Z\"/><path class=\"cls-7\" d=\"M214.6278,162.3871h45.58062l22.79032,38.56822-22.79032,38.56822H214.6278l-22.79031-38.56822Z\"/><path class=\"cls-8\" d=\"M176.67452,104.66962h-53.4863L96.36091,150.94987l26.82731,45.95983h53.4863l27.03011-45.97708Zm-6.99407,79.91228H130.48651l-19.93464-33.56515,19.83322-34.01932h39.29536L189.497,151.01675Z\"/><path class=\"cls-8\" d=\"M176.67452,203.92211h-53.4863L96.36091,250.16028l26.82731,46.00191h53.4863l27.03011-46.00191Zm-6.99407,79.88853H130.48651l-19.93464-33.56621,19.83322-34.0382h39.29536l19.81652,34.0382Z\"/><path class=\"cls-8\" d=\"M176.67452,5.41714h-53.4863l-26.82731,46.297,26.82731,45.94311h53.4863l27.03011-45.94311ZM169.68045,85.372H130.48651L110.55187,51.71411l19.83322-33.99495h39.29536l19.74909,33.995Z\"/><path class=\"cls-8\" d=\"M264.05986,154.29587h-53.503l-26.81058,46.2797L210.55683,246.536h53.503L291.09,200.57557Zm-7.07875,79.89986h-39.194L197.95391,200.643l19.83324-34.07433h39.194l19.83377,34.00691Z\"/><path class=\"cls-8\" d=\"M264.05986,55.04338h-53.503l-26.81058,46.53377,26.81058,46.24573h53.503L291.09,101.57715Zm-7.07875,80.39667h-39.194l-19.83324-33.76149,19.83324-34.21837h39.194l19.83377,34.21837Z\"/><path class=\"cls-8\" d=\"M89.4251,154.29587H36.20743L9.515,200.57557,36.20743,246.536H89.4251l26.89419-45.96038Zm-7.02642,79.89986H43.40216L23.66818,200.643l19.734-34.07433H82.39868l19.734,34.07433Z\"/><path class=\"cls-8\" d=\"M89.4251,55.04338H36.20743L9.515,101.57715l26.69244,46.24573H89.4251l26.89419-46.24573Zm-7.02642,80.39667H43.40216l-19.734-33.79493,19.734-34.21892H82.39868l19.734,34.21892Z\"/></svg>",
"SVG_White": "<svg id=\"Layer_1\" data-name=\"Layer 1\" xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 300 304.21698\"><defs><style>.cls-1{fill:#fff;}</style></defs><path class=\"cls-1\" d=\"M176.67452,104.66962h-53.4863L96.36091,150.94987l26.82731,45.95983h53.4863l27.03011-45.97708Zm-6.99407,79.91228H130.48651l-19.93464-33.56515,19.83322-34.01932h39.29536L189.497,151.01675Z\"/><path class=\"cls-1\" d=\"M176.67452,203.92211h-53.4863L96.36091,250.16028l26.82731,46.00191h53.4863l27.03011-46.00191Zm-6.99407,79.88853H130.48651l-19.93464-33.56621,19.83322-34.0382h39.29536l19.81652,34.0382Z\"/><path class=\"cls-1\" d=\"M176.67452,5.41714h-53.4863l-26.82731,46.297,26.82731,45.94311h53.4863l27.03011-45.94311ZM169.68045,85.372H130.48651L110.55187,51.71411l19.83322-33.99495h39.29536l19.74909,33.995Z\"/><path class=\"cls-1\" d=\"M264.05986,154.29587h-53.503l-26.81058,46.2797L210.55683,246.536h53.503L291.09,200.57557Zm-7.07875,79.89986h-39.194L197.95391,200.643l19.83324-34.07433h39.194l19.83377,34.00691Z\"/><path class=\"cls-1\" d=\"M264.05986,55.04338h-53.503l-26.81058,46.53377,26.81058,46.24573h53.503L291.09,101.57715Zm-7.07875,80.39667h-39.194l-19.83324-33.76149,19.83324-34.21837h39.194l19.83377,34.21837Z\"/><path class=\"cls-1\" d=\"M89.4251,154.29587H36.20743L9.515,200.57557,36.20743,246.536H89.4251l26.89419-45.96038Zm-7.02642,79.89986H43.40216L23.66818,200.643l19.734-34.07433H82.39868l19.734,34.07433Z\"/><path class=\"cls-1\" d=\"M89.4251,55.04338H36.20743L9.515,101.57715l26.69244,46.24573H89.4251l26.89419-46.24573Zm-7.02642,80.39667H43.40216l-19.734-33.79493,19.734-34.21892H82.39868l19.734,34.21892Z\"/></svg>",
}
var Meshmodelmetadata = make(map[string]interface{})

var MeshModelConfig = adapter.MeshModelConfig{ //Move to build/config.go
Category: "Orchestration & Management",
SubCategory: "Service Mesh",
Metadata: meshmodelmetadata,
Metadata: Meshmodelmetadata,
}

// NewConfig creates the configuration for creating components
Expand All @@ -55,6 +50,16 @@ func NewConfig(version string) manifests.Config {
}

func init() {
//Initialize Metadata including logo svgs
f, _ := os.Open("./build/meshmodel_metadata.json")
defer func() {
if err := f.Close(); err != nil {
fmt.Printf("Error closing file: %s\n", err)
}
}()
byt, _ := io.ReadAll(f)

_ = json.Unmarshal(byt, &Meshmodelmetadata)
wd, _ := os.Getwd()
WorkloadPath = filepath.Join(wd, "templates", "oam", "workloads")
AllVersions, _ = utils.GetLatestReleaseTagsSorted("cilium", "cilium")
Expand Down
8 changes: 8 additions & 0 deletions build/meshmodel_metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"primary-color": "#6B91C7",
"secondary-color": "#9AB0CF",
"shape": "circle",
"logo-URL": "https://github.com/cncf/artwork/blob/master/projects/cilium/icon/white/cilium_icon-white.svg?short_path=d2fbc08",
"svg_color": "<svg id=\"Layer_1\" data-name=\"Layer 1\" xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 300 304.21698\"><defs><style>.cls-1{fill:#cbdd72;}.cls-2{fill:#98ca3f;}.cls-3{fill:#6389c6;}.cls-4{fill:#e8282b;}.cls-5{fill:#f8c519;}.cls-6{fill:#f07525;}.cls-7{fill:#8162aa;}.cls-8{fill:#373737;}</style></defs><path class=\"cls-1\" d=\"M40.53139,62.5952h44.7715l22.38575,38.83793L85.30289,140.27106H40.53139L18.14564,101.43313Z\"/><path class=\"cls-2\" d=\"M40.53139,162.3871h44.7715l22.38575,38.56822L85.30289,239.52354H40.53139L18.14564,200.95532Z\"/><path class=\"cls-3\" d=\"M127.91673,211.47393h44.7715L195.074,250.04215l-22.38575,38.56822h-44.7715L105.531,250.04215Z\"/><path class=\"cls-4\" d=\"M127.91673,111.682h44.7715L195.074,150.52l-22.38575,38.83792h-44.7715L105.531,150.52Z\"/><path class=\"cls-5\" d=\"M127.91673,12.42954h44.7715L195.074,50.99776,172.68823,89.566h-44.7715L105.531,50.99776Z\"/><path class=\"cls-6\" d=\"M214.6278,62.5952h45.58062l22.79032,38.83793-22.79032,38.83793H214.6278l-22.79031-38.83793Z\"/><path class=\"cls-7\" d=\"M214.6278,162.3871h45.58062l22.79032,38.56822-22.79032,38.56822H214.6278l-22.79031-38.56822Z\"/><path class=\"cls-8\" d=\"M176.67452,104.66962h-53.4863L96.36091,150.94987l26.82731,45.95983h53.4863l27.03011-45.97708Zm-6.99407,79.91228H130.48651l-19.93464-33.56515,19.83322-34.01932h39.29536L189.497,151.01675Z\"/><path class=\"cls-8\" d=\"M176.67452,203.92211h-53.4863L96.36091,250.16028l26.82731,46.00191h53.4863l27.03011-46.00191Zm-6.99407,79.88853H130.48651l-19.93464-33.56621,19.83322-34.0382h39.29536l19.81652,34.0382Z\"/><path class=\"cls-8\" d=\"M176.67452,5.41714h-53.4863l-26.82731,46.297,26.82731,45.94311h53.4863l27.03011-45.94311ZM169.68045,85.372H130.48651L110.55187,51.71411l19.83322-33.99495h39.29536l19.74909,33.995Z\"/><path class=\"cls-8\" d=\"M264.05986,154.29587h-53.503l-26.81058,46.2797L210.55683,246.536h53.503L291.09,200.57557Zm-7.07875,79.89986h-39.194L197.95391,200.643l19.83324-34.07433h39.194l19.83377,34.00691Z\"/><path class=\"cls-8\" d=\"M264.05986,55.04338h-53.503l-26.81058,46.53377,26.81058,46.24573h53.503L291.09,101.57715Zm-7.07875,80.39667h-39.194l-19.83324-33.76149,19.83324-34.21837h39.194l19.83377,34.21837Z\"/><path class=\"cls-8\" d=\"M89.4251,154.29587H36.20743L9.515,200.57557,36.20743,246.536H89.4251l26.89419-45.96038Zm-7.02642,79.89986H43.40216L23.66818,200.643l19.734-34.07433H82.39868l19.734,34.07433Z\"/><path class=\"cls-8\" d=\"M89.4251,55.04338H36.20743L9.515,101.57715l26.69244,46.24573H89.4251l26.89419-46.24573Zm-7.02642,80.39667H43.40216l-19.734-33.79493,19.734-34.21892H82.39868l19.734,34.21892Z\"/></svg>",
"svg_white": "<svg id=\"Layer_1\" data-name=\"Layer 1\" xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 300 304.21698\"><defs><style>.cls-1{fill:#fff;}</style></defs><path class=\"cls-1\" d=\"M176.67452,104.66962h-53.4863L96.36091,150.94987l26.82731,45.95983h53.4863l27.03011-45.97708Zm-6.99407,79.91228H130.48651l-19.93464-33.56515,19.83322-34.01932h39.29536L189.497,151.01675Z\"/><path class=\"cls-1\" d=\"M176.67452,203.92211h-53.4863L96.36091,250.16028l26.82731,46.00191h53.4863l27.03011-46.00191Zm-6.99407,79.88853H130.48651l-19.93464-33.56621,19.83322-34.0382h39.29536l19.81652,34.0382Z\"/><path class=\"cls-1\" d=\"M176.67452,5.41714h-53.4863l-26.82731,46.297,26.82731,45.94311h53.4863l27.03011-45.94311ZM169.68045,85.372H130.48651L110.55187,51.71411l19.83322-33.99495h39.29536l19.74909,33.995Z\"/><path class=\"cls-1\" d=\"M264.05986,154.29587h-53.503l-26.81058,46.2797L210.55683,246.536h53.503L291.09,200.57557Zm-7.07875,79.89986h-39.194L197.95391,200.643l19.83324-34.07433h39.194l19.83377,34.00691Z\"/><path class=\"cls-1\" d=\"M264.05986,55.04338h-53.503l-26.81058,46.53377,26.81058,46.24573h53.503L291.09,101.57715Zm-7.07875,80.39667h-39.194l-19.83324-33.76149,19.83324-34.21837h39.194l19.83377,34.21837Z\"/><path class=\"cls-1\" d=\"M89.4251,154.29587H36.20743L9.515,200.57557,36.20743,246.536H89.4251l26.89419-45.96038Zm-7.02642,79.89986H43.40216L23.66818,200.643l19.734-34.07433H82.39868l19.734,34.07433Z\"/><path class=\"cls-1\" d=\"M89.4251,55.04338H36.20743L9.515,101.57715l26.69244,46.24573H89.4251l26.89419-46.24573Zm-7.02642,80.39667H43.40216l-19.734-33.79493,19.734-34.21892H82.39868l19.734,34.21892Z\"/></svg>",
}