Skip to content

Commit 4a6f1e6

Browse files
author
Vivek Vishal
authored
Merge branch 'master' into error404p-redirect
2 parents bc62a63 + 75e0fca commit 4a6f1e6

File tree

57 files changed

+831
-33
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+831
-33
lines changed

.github/workflows/kanvas.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ jobs:
4343
mesheryToken: ${{ secrets.MESHERY_TOKEN }} # Meshery Cloud Authentication token, signin to meshery-cloud to get one, example: ey.....
4444
prNumber: ${{ env.PULL_NO }} # auto-filled from the above step
4545
application_type: Kubernetes Manifest # your application type, could be any of three: "Kubernetes Manifest", "Docker Compose", "Helm Chart"
46-
filePath: ${{ inputs.fileName == '' && 'https://meshery.github.io/meshery.io/charts/meshery-v0.8.50.tgz' || inputs.fileName }} # relative file-path from the root directory in the github-runner env, you might require to checkout the repository as described in step 2
46+
filePath: ${{ inputs.fileName == '' && 'install/deployment_yamls/k8s' || inputs.fileName }} # relative file-path from the root directory in the github-runner env, you might require to checkout the repository as described in step 2
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
annotations:
5+
kompose.cmd: kompose convert -f ../docker-compose.yaml
6+
kompose.version: 1.32.0 ()
7+
creationTimestamp: null
8+
labels:
9+
io.kompose.service: meshery-app-mesh
10+
name: meshery-app-mesh
11+
spec:
12+
selector:
13+
matchLabels:
14+
io.kompose.service: meshery-app-mesh
15+
replicas: 1
16+
strategy: {}
17+
template:
18+
metadata:
19+
creationTimestamp: null
20+
labels:
21+
io.kompose.service: meshery-app-mesh
22+
spec:
23+
serviceAccount: meshery-server
24+
containers:
25+
- image: meshery/meshery-app-mesh:stable-latest
26+
imagePullPolicy: Always
27+
name: meshery-app-mesh
28+
ports:
29+
- containerPort: 10005
30+
resources: {}
31+
restartPolicy: Always
32+
status: {}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
annotations:
5+
kompose.cmd: kompose convert -f ../docker-compose.yaml
6+
kompose.version: 1.32.0 ()
7+
creationTimestamp: null
8+
labels:
9+
io.kompose.service: meshery-app-mesh
10+
name: meshery-app-mesh
11+
spec:
12+
ports:
13+
- name: "10005"
14+
port: 10005
15+
targetPort: 10005
16+
selector:
17+
io.kompose.service: meshery-app-mesh
18+
status:
19+
loadBalancer: {}
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
annotations:
5+
kompose.cmd: kompose convert -f ../docker-compose.yaml
6+
kompose.version: 1.32.0 ()
7+
creationTimestamp: null
8+
labels:
9+
io.kompose.service: meshery-cilium
10+
name: meshery-cilium
11+
spec:
12+
selector:
13+
matchLabels:
14+
io.kompose.service: meshery-cilium
15+
replicas: 1
16+
strategy: {}
17+
template:
18+
metadata:
19+
creationTimestamp: null
20+
labels:
21+
io.kompose.service: meshery-cilium
22+
spec:
23+
serviceAccount: meshery-server
24+
containers:
25+
- image: layer5/meshery-cilium:stable-latest
26+
imagePullPolicy: Always
27+
name: meshery-cilium
28+
ports:
29+
- containerPort: 10012
30+
resources: {}
31+
restartPolicy: Always
32+
status: {}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
annotations:
5+
kompose.cmd: kompose convert -f ../docker-compose.yaml
6+
kompose.version: 1.32.0 ()
7+
creationTimestamp: null
8+
labels:
9+
io.kompose.service: meshery-cilium
10+
name: meshery-cilium
11+
spec:
12+
ports:
13+
- name: "10012"
14+
port: 10012
15+
targetPort: 10012
16+
selector:
17+
io.kompose.service: meshery-cilium
18+
status:
19+
loadBalancer: {}
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
annotations:
5+
kompose.cmd: kompose convert -f ../docker-compose.yaml
6+
kompose.version: 1.32.0 ()
7+
creationTimestamp: null
8+
labels:
9+
io.kompose.service: meshery-consul
10+
name: meshery-consul
11+
spec:
12+
selector:
13+
matchLabels:
14+
io.kompose.service: meshery-consul
15+
replicas: 1
16+
strategy: {}
17+
template:
18+
metadata:
19+
creationTimestamp: null
20+
labels:
21+
io.kompose.service: meshery-consul
22+
spec:
23+
serviceAccount: meshery-server
24+
containers:
25+
- image: layer5/meshery-consul:stable-latest
26+
imagePullPolicy: Always
27+
name: meshery-consul
28+
ports:
29+
- containerPort: 10002
30+
resources: {}
31+
restartPolicy: Always
32+
status: {}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
annotations:
5+
kompose.cmd: kompose convert -f ../docker-compose.yaml
6+
kompose.version: 1.32.0 ()
7+
# creationTimestamp: null
8+
labels:
9+
io.kompose.service: meshery-consul
10+
name: meshery-consul
11+
spec:
12+
ports:
13+
- name: "10002"
14+
port: 10002
15+
targetPort: 10002
16+
selector:
17+
io.kompose.service: meshery-consul
18+
status:
19+
loadBalancer: {}
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
annotations:
5+
kompose.cmd: kompose convert -f ../docker-compose.yaml
6+
kompose.version: 1.32.0 ()
7+
creationTimestamp: null
8+
labels:
9+
io.kompose.service: meshery
10+
name: meshery
11+
spec:
12+
selector:
13+
matchLabels:
14+
io.kompose.service: meshery
15+
replicas: 1
16+
strategy: {}
17+
template:
18+
metadata:
19+
creationTimestamp: null
20+
labels:
21+
io.kompose.service: meshery
22+
spec:
23+
serviceAccountName: meshery-server
24+
containers:
25+
- env:
26+
- name: EVENT
27+
value: mesheryLocal
28+
- name: PROVIDER_BASE_URLS
29+
value: https://cloud.layer5.io
30+
- name: ADAPTER_URLS
31+
value: meshery-istio:10000 meshery-linkerd:10001 meshery-consul:10002 meshery-nsm:10004 meshery-app-mesh:10005 meshery-kuma:10007 meshery-nginx-sm:10010
32+
image: layer5/meshery:stable-latest
33+
imagePullPolicy: Always
34+
name: meshery
35+
ports:
36+
- containerPort: 8080
37+
resources: {}
38+
restartPolicy: Always
39+
status: {}
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
annotations:
5+
kompose.cmd: kompose convert -f ../docker-compose.yaml
6+
kompose.version: 1.32.0 ()
7+
creationTimestamp: null
8+
labels:
9+
io.kompose.service: meshery-istio
10+
name: meshery-istio
11+
spec:
12+
selector:
13+
matchLabels:
14+
io.kompose.service: meshery-istio
15+
replicas: 1
16+
strategy: {}
17+
template:
18+
metadata:
19+
creationTimestamp: null
20+
labels:
21+
io.kompose.service: meshery-istio
22+
spec:
23+
serviceAccount: meshery-server
24+
containers:
25+
- image: layer5/meshery-istio:stable-latest
26+
imagePullPolicy: Always
27+
name: meshery-istio
28+
ports:
29+
- containerPort: 10000
30+
resources: {}
31+
restartPolicy: Always
32+
status: {}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
annotations:
5+
kompose.cmd: kompose convert -f ../docker-compose.yaml
6+
kompose.version: 1.32.0 ()
7+
creationTimestamp: null
8+
labels:
9+
io.kompose.service: meshery-istio
10+
name: meshery-istio
11+
spec:
12+
ports:
13+
- name: "10000"
14+
port: 10000
15+
targetPort: 10000
16+
selector:
17+
io.kompose.service: meshery-istio
18+
status:
19+
loadBalancer: {}

0 commit comments

Comments
 (0)