From e71ed64112b373c9a4e9f3d6bd0ae6365950031a Mon Sep 17 00:00:00 2001 From: David Hovey Date: Tue, 19 Mar 2019 10:25:51 -0700 Subject: Added visio stencil for icons --- icons/visio/kubernetes-visio-stencil.vssx | Bin 0 -> 311788 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 icons/visio/kubernetes-visio-stencil.vssx diff --git a/icons/visio/kubernetes-visio-stencil.vssx b/icons/visio/kubernetes-visio-stencil.vssx new file mode 100644 index 00000000..118a172a Binary files /dev/null and b/icons/visio/kubernetes-visio-stencil.vssx differ -- cgit v1.2.3 From ad8546ddfd326ca88193678bd168a89084e81bc7 Mon Sep 17 00:00:00 2001 From: David Hovey Date: Thu, 6 Jun 2019 11:49:49 -0700 Subject: Added script to update visio stencil from png icons --- icons/tools/update-everything.sh | 4 ++++ icons/tools/update-visio.sh | 13 +++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 icons/tools/update-everything.sh create mode 100644 icons/tools/update-visio.sh diff --git a/icons/tools/update-everything.sh b/icons/tools/update-everything.sh new file mode 100644 index 00000000..da7ed4d9 --- /dev/null +++ b/icons/tools/update-everything.sh @@ -0,0 +1,4 @@ +#/bin/bash + +./tools/rasterize.sh +./tools/update-visio.sh \ No newline at end of file diff --git a/icons/tools/update-visio.sh b/icons/tools/update-visio.sh new file mode 100644 index 00000000..58bdd27e --- /dev/null +++ b/icons/tools/update-visio.sh @@ -0,0 +1,13 @@ +#/bin/bash + +CONTENT_PATH="${PWD}/../png" +OUTPUT_FILENAME="kubernetes-visio-stencil" + +curl -s -N https://raw.githubusercontent.com/hoveytechllc/visio-stencil-creator/master/scripts/build-and-run.sh | bash -s --content-path=${CONTENT_PATH} --output-filename=${OUTPUT_FILENAME} + +if [ -f ${CONTENT_PATH}/${OUTPUT_FILENAME}.vssx ]; then + mv ${CONTENT_PATH}/${OUTPUT_FILENAME} ./visio/${OUTPUT_FILENAME}.vssx +else + echo "ERROR -> Visio Stencil was not in expected path: "${CONTENT_PATH}/${OUTPUT_FILENAME} + exit 1 +fi -- cgit v1.2.3 From 97cf0c1c913b2078f19559646ded444f270c107f Mon Sep 17 00:00:00 2001 From: David Hovey Date: Thu, 6 Jun 2019 11:52:14 -0700 Subject: Fixed path of png icons --- icons/tools/update-visio.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icons/tools/update-visio.sh b/icons/tools/update-visio.sh index 58bdd27e..5b24dedb 100644 --- a/icons/tools/update-visio.sh +++ b/icons/tools/update-visio.sh @@ -1,6 +1,6 @@ #/bin/bash -CONTENT_PATH="${PWD}/../png" +CONTENT_PATH="${PWD}/png" OUTPUT_FILENAME="kubernetes-visio-stencil" curl -s -N https://raw.githubusercontent.com/hoveytechllc/visio-stencil-creator/master/scripts/build-and-run.sh | bash -s --content-path=${CONTENT_PATH} --output-filename=${OUTPUT_FILENAME} -- cgit v1.2.3 From 849efd24bc154da63abec484e0f454c7e7fd24ef Mon Sep 17 00:00:00 2001 From: David Hovey Date: Thu, 6 Jun 2019 12:01:11 -0700 Subject: Updating icon documentation --- icons/README.md | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/icons/README.md b/icons/README.md index 20c8effb..e6940947 100644 --- a/icons/README.md +++ b/icons/README.md @@ -2,7 +2,15 @@ These icons are a way to standardize Kubernetes architecture diagrams for presentation. Having uniform architecture diagrams improve understandibility. -## Generate png icons from svg +## Tools + +```shell +./tools/update-everything.sh +``` + +This script generates png from svg, and Visio Stencil from png. + +### Generate png icons from svg ```shell ./tools/rasterize.sh @@ -10,9 +18,17 @@ These icons are a way to standardize Kubernetes architecture diagrams for presen This script will convert all svg into png. It's based on a docker container defined [here](hack/svgconvertor/Dockefile) +### Generate Visio Stencil from png icons + +```shell +./tools/update-visio.sh +``` + +This script will convert png icons into Visio stencil using project from [here](https://github.com/hoveytechllc/visio-stencil-creator) + ## How to use these icons -Each icons can be found in differents formats +Each icon can be found in differents formats * [png](png) * [svg](svg) -- cgit v1.2.3 From 60ab42517181e73307f1916147192aede0498fc4 Mon Sep 17 00:00:00 2001 From: David Hovey Date: Thu, 6 Jun 2019 12:11:35 -0700 Subject: Update update-visio.sh Fix for visio script --- icons/tools/update-visio.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icons/tools/update-visio.sh b/icons/tools/update-visio.sh index 5b24dedb..70f352d7 100644 --- a/icons/tools/update-visio.sh +++ b/icons/tools/update-visio.sh @@ -3,7 +3,7 @@ CONTENT_PATH="${PWD}/png" OUTPUT_FILENAME="kubernetes-visio-stencil" -curl -s -N https://raw.githubusercontent.com/hoveytechllc/visio-stencil-creator/master/scripts/build-and-run.sh | bash -s --content-path=${CONTENT_PATH} --output-filename=${OUTPUT_FILENAME} +curl -s -N https://raw.githubusercontent.com/hoveytechllc/visio-stencil-creator/master/scripts/build-and-run.sh | bash -s -- --content-path=${CONTENT_PATH} --output-filename=${OUTPUT_FILENAME} if [ -f ${CONTENT_PATH}/${OUTPUT_FILENAME}.vssx ]; then mv ${CONTENT_PATH}/${OUTPUT_FILENAME} ./visio/${OUTPUT_FILENAME}.vssx -- cgit v1.2.3 From d01ed600fe4ed55df022ae6f643d2f4ee045cbb6 Mon Sep 17 00:00:00 2001 From: David Hovey Date: Thu, 6 Jun 2019 12:18:18 -0700 Subject: Added execute permissions for icon scripts --- icons/tools/update-everything.sh | 0 icons/tools/update-visio.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 icons/tools/update-everything.sh mode change 100644 => 100755 icons/tools/update-visio.sh diff --git a/icons/tools/update-everything.sh b/icons/tools/update-everything.sh old mode 100644 new mode 100755 diff --git a/icons/tools/update-visio.sh b/icons/tools/update-visio.sh old mode 100644 new mode 100755 -- cgit v1.2.3 From c86217df112866935ba02da2127dd9b92ecbc8cd Mon Sep 17 00:00:00 2001 From: David Hovey Date: Thu, 6 Jun 2019 12:36:49 -0700 Subject: Fix for visio script --- icons/tools/update-visio.sh | 2 +- icons/visio/kubernetes-visio-stencil.vssx | Bin 311788 -> 2297246 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/icons/tools/update-visio.sh b/icons/tools/update-visio.sh index 70f352d7..47ba1b46 100755 --- a/icons/tools/update-visio.sh +++ b/icons/tools/update-visio.sh @@ -6,7 +6,7 @@ OUTPUT_FILENAME="kubernetes-visio-stencil" curl -s -N https://raw.githubusercontent.com/hoveytechllc/visio-stencil-creator/master/scripts/build-and-run.sh | bash -s -- --content-path=${CONTENT_PATH} --output-filename=${OUTPUT_FILENAME} if [ -f ${CONTENT_PATH}/${OUTPUT_FILENAME}.vssx ]; then - mv ${CONTENT_PATH}/${OUTPUT_FILENAME} ./visio/${OUTPUT_FILENAME}.vssx + mv ${CONTENT_PATH}/${OUTPUT_FILENAME}.vssx ./visio/${OUTPUT_FILENAME}.vssx else echo "ERROR -> Visio Stencil was not in expected path: "${CONTENT_PATH}/${OUTPUT_FILENAME} exit 1 diff --git a/icons/visio/kubernetes-visio-stencil.vssx b/icons/visio/kubernetes-visio-stencil.vssx index 118a172a..e5870864 100644 Binary files a/icons/visio/kubernetes-visio-stencil.vssx and b/icons/visio/kubernetes-visio-stencil.vssx differ -- cgit v1.2.3 From 1250c9771e9a5f0cb6aab40e746612d5c5a670bb Mon Sep 17 00:00:00 2001 From: David Hovey Date: Thu, 6 Jun 2019 14:43:09 -0700 Subject: Changed implementation of visio stencil script --- icons/tools/update-visio.sh | 34 +++++++++++++++++++++--------- icons/visio/kubernetes-visio-stencil.vssx | Bin 2297246 -> 816603 bytes 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/icons/tools/update-visio.sh b/icons/tools/update-visio.sh index 47ba1b46..c56da036 100755 --- a/icons/tools/update-visio.sh +++ b/icons/tools/update-visio.sh @@ -1,13 +1,27 @@ -#/bin/bash +#!/bin/bash -CONTENT_PATH="${PWD}/png" -OUTPUT_FILENAME="kubernetes-visio-stencil" +ICONS_PATH=${PWD} -curl -s -N https://raw.githubusercontent.com/hoveytechllc/visio-stencil-creator/master/scripts/build-and-run.sh | bash -s -- --content-path=${CONTENT_PATH} --output-filename=${OUTPUT_FILENAME} +GITHUB_ORG="hoveytechllc" +REPO_NAME="visio-stencil-creator" -if [ -f ${CONTENT_PATH}/${OUTPUT_FILENAME}.vssx ]; then - mv ${CONTENT_PATH}/${OUTPUT_FILENAME}.vssx ./visio/${OUTPUT_FILENAME}.vssx -else - echo "ERROR -> Visio Stencil was not in expected path: "${CONTENT_PATH}/${OUTPUT_FILENAME} - exit 1 -fi +rm -fdr ./tools/${REPO_NAME} + +# Clone repository in current path +git clone https://github.com/${GITHUB_ORG}/${REPO_NAME}.git ./tools/${REPO_NAME} + +# build image using Dockerfile from github repository +docker build \ + -t ${REPO_NAME}:latest \ + -f ./tools/${REPO_NAME}/Dockerfile \ + ./tools/${REPO_NAME} + +# Run newly created Docker image +docker run \ + -v ${ICONS_PATH}:/app/content \ + ${REPO_NAME}:latest \ + "--image-pattern=**/labeled/*-256.png" \ + "--image-path=/app/content/png" \ + "--output-filename=/app/content/visio/kubernetes-visio-stencil.vssx" + +rm -fdr ./tools/${REPO_NAME} \ No newline at end of file diff --git a/icons/visio/kubernetes-visio-stencil.vssx b/icons/visio/kubernetes-visio-stencil.vssx index e5870864..eba36a70 100644 Binary files a/icons/visio/kubernetes-visio-stencil.vssx and b/icons/visio/kubernetes-visio-stencil.vssx differ -- cgit v1.2.3 From 73288861776fd8e1c7008fac42fee0e851f10eed Mon Sep 17 00:00:00 2001 From: David Hovey Date: Wed, 25 Sep 2019 17:30:43 -0700 Subject: Created script for building Docker image used with visio stencils, updating usage of Docker related Docker image --- icons/README.md | 2 ++ icons/tools/build-visio-stencil-creator.sh | 24 ++++++++++++++++++++++++ icons/tools/update-visio.sh | 22 ++++------------------ 3 files changed, 30 insertions(+), 18 deletions(-) create mode 100644 icons/tools/build-visio-stencil-creator.sh diff --git a/icons/README.md b/icons/README.md index e6940947..582e52b5 100644 --- a/icons/README.md +++ b/icons/README.md @@ -26,6 +26,8 @@ This script will convert all svg into png. It's based on a docker container defi This script will convert png icons into Visio stencil using project from [here](https://github.com/hoveytechllc/visio-stencil-creator) +A Docker image hosted on GCR (`k8s.gcr.io/visio-stencil-creator`), is used to generate the Visio stencil file. The script [./tools/build-visio-stencil-creator.sh](./tools/build-visio-stencil-creator.sh) can be used to update the Docker image if it needs to be built. + ## How to use these icons Each icon can be found in differents formats diff --git a/icons/tools/build-visio-stencil-creator.sh b/icons/tools/build-visio-stencil-creator.sh new file mode 100644 index 00000000..f6d73080 --- /dev/null +++ b/icons/tools/build-visio-stencil-creator.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +GITHUB_ORG="hoveytechllc" +REPO_NAME="visio-stencil-creator" +TAG_NAME="v1.0" + +GCR_REPO="hoveytech/${REPO_NAME}:${TAG_NAME}" + +rm -fdr ./tools/${REPO_NAME} + +# Clone repository in current path +git clone --branch release/${TAG_NAME} https://github.com/${GITHUB_ORG}/${REPO_NAME}.git ./tools/${REPO_NAME} + +# build image using Dockerfile from github repository +# Tag resulting image for pushing to k8s.gcr.io +docker build \ + -t ${GCR_REPO} \ + -f ./tools/${REPO_NAME}/Dockerfile \ + ./tools/${REPO_NAME} + +# Clean up source code +rm -fdr ./tools/${REPO_NAME} + +docker push ${GCR_REPO} \ No newline at end of file diff --git a/icons/tools/update-visio.sh b/icons/tools/update-visio.sh index c56da036..05b50c14 100755 --- a/icons/tools/update-visio.sh +++ b/icons/tools/update-visio.sh @@ -1,27 +1,13 @@ #!/bin/bash ICONS_PATH=${PWD} +DOCKER_IMAGE_REPO="k8s.gcr.io/visio-stencil-creator:v1.0" -GITHUB_ORG="hoveytechllc" -REPO_NAME="visio-stencil-creator" - -rm -fdr ./tools/${REPO_NAME} - -# Clone repository in current path -git clone https://github.com/${GITHUB_ORG}/${REPO_NAME}.git ./tools/${REPO_NAME} - -# build image using Dockerfile from github repository -docker build \ - -t ${REPO_NAME}:latest \ - -f ./tools/${REPO_NAME}/Dockerfile \ - ./tools/${REPO_NAME} - -# Run newly created Docker image +# Run docker image that generates Visio stencil +# using png images. docker run \ -v ${ICONS_PATH}:/app/content \ - ${REPO_NAME}:latest \ + ${DOCKER_IMAGE_REPO} \ "--image-pattern=**/labeled/*-256.png" \ "--image-path=/app/content/png" \ "--output-filename=/app/content/visio/kubernetes-visio-stencil.vssx" - -rm -fdr ./tools/${REPO_NAME} \ No newline at end of file -- cgit v1.2.3 From 668b6b9e610b7ba2a0d65a9484231cec01857682 Mon Sep 17 00:00:00 2001 From: David Hovey Date: Wed, 25 Sep 2019 17:43:25 -0700 Subject: Fixed repository name for visio stencil creator --- icons/tools/build-visio-stencil-creator.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icons/tools/build-visio-stencil-creator.sh b/icons/tools/build-visio-stencil-creator.sh index f6d73080..94e707a1 100644 --- a/icons/tools/build-visio-stencil-creator.sh +++ b/icons/tools/build-visio-stencil-creator.sh @@ -4,7 +4,7 @@ GITHUB_ORG="hoveytechllc" REPO_NAME="visio-stencil-creator" TAG_NAME="v1.0" -GCR_REPO="hoveytech/${REPO_NAME}:${TAG_NAME}" +GCR_REPO="gcr.k8s.io/${REPO_NAME}:${TAG_NAME}" rm -fdr ./tools/${REPO_NAME} -- cgit v1.2.3