Skip to content

Commit da9defc

Browse files
Merge branch 'layer5io:master' into master
2 parents 0ac1075 + 212d245 commit da9defc

File tree

4 files changed

+58
-22
lines changed

4 files changed

+58
-22
lines changed
Lines changed: 11 additions & 0 deletions
Loading

src/components/AdventuresVol/adventures-vol.style.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,6 @@ export const AdventuresVolWrapper = styled.div`
9999
}
100100
101101
.handbook__card:hover .handbook__card--head {
102-
color: ${props => props.theme.text};
102+
color: white;
103103
}
104104
`;

src/sections/Meshery/Meshery-platforms/index.js

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ const supported_platforms = [
4242
<Code codeString={dedent`curl -L https://meshery.io/install | PLATFORM=docker bash -`
4343
}
4444
/>
45+
<h2 style={{ marginTop: "20px" }}>Using mesheryctl</h2>
46+
<Code codeString={dedent`mesheryctl system context create docker --platform docker --set
47+
mesheryctl system start`
48+
}
49+
/>
4550
<h2 style={{ marginTop: "20px" }}>Docker Extension</h2>
4651
<Code codeString={dedent`docker extension install meshery/docker-extension-meshery:stable-latest`
4752
}
@@ -82,7 +87,13 @@ const supported_platforms = [
8287
<h2>Helm Chart</h2>
8388
<p>Install on Kubernetes using Helm:</p>
8489
<Code codeString={dedent`helm repo add meshery https://meshery.io/charts/
85-
helm install my-meshery meshery/meshery --version 2.1.2`}
90+
helm install my-meshery meshery/meshery --version 2.1.2`}
91+
/>
92+
<h3 style={{ marginTop: "20px" }}>Using kubectl</h3>
93+
<Code codeString={dedent`kubectl create ns meshery
94+
helm repo add meshery https://meshery.io/charts
95+
helm install meshery-operator meshery/meshery-operator -n meshery
96+
helm install meshery meshery/meshery -n meshery`}
8697
/>
8798
</>
8899
)
@@ -100,19 +111,19 @@ const supported_platforms = [
100111
</>
101112
)
102113
},
103-
{
104-
icon: Kind,
105-
name: "Kind",
106-
steps: (
107-
<>
108-
<h2>Kind User</h2>
109-
<Code codeString={dedent`export KUBECONFIG=$HOME/.kube/config
110-
kubectl create namespace meshery
111-
helm install meshery --namespace meshery install/kubernetes/helm/meshery`}
112-
/>
113-
</>
114-
)
115-
},
114+
// {
115+
// icon: Kind,
116+
// name: "Kind",
117+
// steps: (
118+
// <>
119+
// <h2>Kind User</h2>
120+
// <Code codeString={dedent`export KUBECONFIG=$HOME/.kube/config
121+
// kubectl create namespace meshery
122+
// helm install meshery --namespace meshery install/kubernetes/helm/meshery`}
123+
// />
124+
// </>
125+
// )
126+
// },
116127
{
117128
icon: Kubernetes,
118129
name: "Kubernetes",
@@ -131,9 +142,12 @@ const supported_platforms = [
131142
name: "Linux",
132143
steps: (
133144
<>
134-
<h2>Bash User</h2>
145+
<h3>Install Using Kubernetes</h3>
135146
<Code codeString={dedent`curl -L https://meshery.io/install | PLATFORM=kubernetes bash -`}
136147
/>
148+
<h3 style={{ marginTop: "20px" }}>Install Using Docker</h3>
149+
<Code codeString={dedent`curl -L https://meshery.io/install | PLATFORM=docker bash -` }
150+
/>
137151
</>
138152
)
139153
},
@@ -221,7 +235,7 @@ const MesheryPlatforms = () => {
221235
</Col>
222236
))}
223237
</Row>
224-
<Container style={{ transition: "height 0.5s ease-in-out", height: currentPlatform.name == "Docker" ? "320px" : installationStepsHeight, overflow: "hidden" }}>
238+
<Container style={{ transition: "height 0.5s ease-in-out", height: (currentPlatform.name === "Docker" || currentPlatform.name === "Helm" || currentPlatform.name === "Linux" ) ? "30rem" : installationStepsHeight, overflow: "hidden" }}>
225239
<Row className="installation-steps" >
226240
{currentPlatform.name && currentPlatform.steps}
227241
</Row>

src/sections/Meshmap/Meshmap-design/meshmap-design-integrations.js

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { ReactComponent as IntegrationsImage } from "./images/integration-image-
44
import UnderlineImg from "./images/underline.svg";
55
import { useInView } from "react-intersection-observer";
66
import { useState } from "react";
7+
import { useStaticQuery, graphql } from "gatsby";
78
// import { useStyledDarkMode } from "../../../theme/app/useStyledDarkMode";
89

910
const IntegrationsSectionWrapper = styled.div`
@@ -97,10 +98,20 @@ const MeshmapIntegrationsSection = () => {
9798
const [diagramRef, inView] = useInView({ threshold: 0.6 });
9899
const [imageInView, setimageInView] = useState(false);
99100

100-
if (inView && !imageInView)
101-
setimageInView(true);
102-
else if (imageInView && !inView)
103-
setimageInView(false);
101+
const integrations = useStaticQuery(graphql`
102+
query {
103+
allMdx(
104+
filter: {
105+
fields: { collection: { eq: "integrations" } }
106+
frontmatter: { published: { eq: true } }
107+
}
108+
) {
109+
totalCount
110+
}
111+
}
112+
`);
113+
if (inView && !imageInView) setimageInView(true);
114+
else if (imageInView && !inView) setimageInView(false);
104115

105116
// const { isDark } = useStyledDarkMode();
106117

@@ -110,7 +121,7 @@ const MeshmapIntegrationsSection = () => {
110121
<IntegrationsImage alt="integrations-img" className={imageInView ? "diagram-visible" : "diagram-hidden"} />
111122
</div>
112123
<div className="hero-text">
113-
<h1>220+ Built-in Integrations</h1>
124+
<h1>{Math.ceil(integrations.allMdx.totalCount / 10) * 10}+ Built-in Integrations</h1>
114125
<img className="underline-img" src={UnderlineImg}/>
115126
<h4>Support for all of your Cloud Native Infrastructure and Applications.</h4>
116127
</div>

0 commit comments

Comments
 (0)