Skip to content
This repository was archived by the owner on Mar 24, 2023. It is now read-only.

Commit a37e810

Browse files
Rob0hRob0h
authored
Support k8s list for init (#672)
1 parent 597f4be commit a37e810

Some content is hidden

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

46 files changed

+2118
-41
lines changed

‎integration/init/cockroach/expected/.ship/state.json

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
{
22
"v1": {
33
"config": {},
4-
"upstream": "https://raw.githubusercontent.com/cockroachdb/cockroach/v2.0.6/cloud/kubernetes/cockroachdb-statefulset-secure.yaml",
5-
"metadata": null,
64
"releaseName": "ship",
5+
"upstream": "https://raw.githubusercontent.com/cockroachdb/cockroach/v2.0.6/cloud/kubernetes/cockroachdb-statefulset-secure.yaml",
6+
"metadata": {
7+
"applicationType": "",
8+
"releaseNotes": "",
9+
"version": ""
10+
},
711
"contentSHA": "4e8ef4ad3601ea5b1970b22010af6b21bc6f16d849cb3af0e973cf2447f79009"
812
}
913
}

‎integration/init/factorio/expected/.ship/state.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"v1": {
33
"config": {},
44
"helmValues": "# Factorio image version\n# ref: https://quay.io/repository/games_on_k8s/factorio?tab=tags\nimage: quay.io/games_on_k8s/factorio\nimageTag: \"0.14.22\"\n\n# Configure resource requests and limits\n# ref: http://kubernetes.io/docs/user-guide/compute-resources/\nresources:\n requests:\n memory: 512Mi\n cpu: 500m\n\n# Most of these map to environment variables. See docker-factorio for details:\n# https://github.com/games-on-k8s/docker-factorio/blob/master/README.md#environment-variable-reference\nfactorioServer:\n name: Kubernetes Server\n description: Factorio running on Kubernetes\n port: 34197\n # Lock this server down with a password.\n # password: change.me\n maxPlayers: 255\n # Publishes this server in the server browser if true.\n # You'll want to set Factorio.User below if true, as it becomes required.\n isPublic: false\n verifyIdentity: false\n # Allows or disallows console commands. Must be one of: `true`, `false`, or `admins-only`.\n allowCommands: admins-only\n # Pause the server when nobody is connected?\n noAutoPause: \"false\"\n # You'll want to change this to NodePort if you are on AWS.\n serviceType: LoadBalancer\n\n autosave:\n # Auto-save interval in minutes.\n interval: 2\n slots: 3\n\n rcon:\n enabled: false\n port: 27015\n # Empty value here enables an auto-generated password.\n password: \"\"\n serviceType: LoadBalancer\n\nfactorio:\n # Your factorio.com User/pass is needed if factorioServer.IsPublic is true.\n user:\n username: your.username\n password: your.password\n\npersistence:\n ## factorio data Persistent Volume Storage Class\n ## If defined, storageClassName: \u003cstorageClass\u003e\n ## If set to \"-\", storageClassName: \"\", which disables dynamic provisioning\n ## If undefined (the default) or set to null, no storageClassName spec is\n ## set, choosing the default provisioner. (gp2 on AWS, standard on\n ## GKE, AWS \u0026 OpenStack)\n ##\n # storageClass: \"-\"\n savedGames:\n # Set this to false if you don't care to persist saved games between restarts.\n enabled: true\n size: 1Gi\n mods:\n enabled: false\n size: 128Mi\n",
5+
"releaseName": "factorio",
56
"helmValuesDefaults": "# Factorio image version\n# ref: https://quay.io/repository/games_on_k8s/factorio?tab=tags\nimage: quay.io/games_on_k8s/factorio\nimageTag: \"0.14.22\"\n\n# Configure resource requests and limits\n# ref: http://kubernetes.io/docs/user-guide/compute-resources/\nresources:\n requests:\n memory: 512Mi\n cpu: 500m\n\n# Most of these map to environment variables. See docker-factorio for details:\n# https://github.com/games-on-k8s/docker-factorio/blob/master/README.md#environment-variable-reference\nfactorioServer:\n name: Kubernetes Server\n description: Factorio running on Kubernetes\n port: 34197\n # Lock this server down with a password.\n # password: change.me\n maxPlayers: 255\n # Publishes this server in the server browser if true.\n # You'll want to set Factorio.User below if true, as it becomes required.\n isPublic: false\n verifyIdentity: false\n # Allows or disallows console commands. Must be one of: `true`, `false`, or `admins-only`.\n allowCommands: admins-only\n # Pause the server when nobody is connected?\n noAutoPause: \"false\"\n # You'll want to change this to NodePort if you are on AWS.\n serviceType: LoadBalancer\n\n autosave:\n # Auto-save interval in minutes.\n interval: 2\n slots: 3\n\n rcon:\n enabled: false\n port: 27015\n # Empty value here enables an auto-generated password.\n password: \"\"\n serviceType: LoadBalancer\n\nfactorio:\n # Your factorio.com User/pass is needed if factorioServer.IsPublic is true.\n user:\n username: your.username\n password: your.password\n\npersistence:\n ## factorio data Persistent Volume Storage Class\n ## If defined, storageClassName: \u003cstorageClass\u003e\n ## If set to \"-\", storageClassName: \"\", which disables dynamic provisioning\n ## If undefined (the default) or set to null, no storageClassName spec is\n ## set, choosing the default provisioner. (gp2 on AWS, standard on\n ## GKE, AWS \u0026 OpenStack)\n ##\n # storageClass: \"-\"\n savedGames:\n # Set this to false if you don't care to persist saved games between restarts.\n enabled: true\n size: 1Gi\n mods:\n enabled: false\n size: 128Mi\n",
67
"upstream": "https://github.com/helm/charts/tree/ffb84f85a861e765caade879491a75a6dd3091a5/stable/factorio",
78
"metadata": {
@@ -11,7 +12,6 @@
1112
"releaseNotes": "Add appVersion key for factorio (#4718)\n\n* Add appVersion key for factorio\n\nThe key \"appVersion\" is needed for ci testing, it's missing in this yaml. That sometimes will cause testing failure.\n\n* Missing starting space in line 20\n\nMissing starting space in line 20",
1213
"version": "0.3.1"
1314
},
14-
"releaseName": "factorio",
1515
"contentSHA": "d6135300cdb29c5f3914bdfbf29030db9cb6cd8ea4691c732019bec9fe6d5374"
1616
}
1717
}

‎integration/init/git-single-file-gogetter/expected/.ship/state.json

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
{
22
"v1": {
33
"config": {},
4-
"upstream": "github.com/replicatedhq/test-charts/blob/3427d6997bd150c60caa00ba0298fdfe17e3ed04/plain-k8s/frontend-deployment.yaml",
5-
"metadata": null,
64
"releaseName": "ship",
5+
"upstream": "github.com/replicatedhq/test-charts/blob/3427d6997bd150c60caa00ba0298fdfe17e3ed04/plain-k8s/frontend-deployment.yaml",
6+
"metadata": {
7+
"applicationType": "",
8+
"releaseNotes": "",
9+
"version": ""
10+
},
711
"contentSHA": "9fa025c3fdbcc02c7de8e9c74c8058d16b2aada04917895685504b387563afda"
812
}
913
}

‎integration/init/git-single-file/expected/.ship/state.json

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
{
22
"v1": {
33
"config": {},
4-
"upstream": "github.com/replicatedhq/test-charts/blob/3427d6997bd150c60caa00ba0298fdfe17e3ed04/plain-k8s/frontend-deployment.yaml",
5-
"metadata": null,
64
"releaseName": "ship",
5+
"upstream": "github.com/replicatedhq/test-charts/blob/3427d6997bd150c60caa00ba0298fdfe17e3ed04/plain-k8s/frontend-deployment.yaml",
6+
"metadata": {
7+
"applicationType": "",
8+
"releaseNotes": "",
9+
"version": ""
10+
},
711
"contentSHA": "9fa025c3fdbcc02c7de8e9c74c8058d16b2aada04917895685504b387563afda"
812
}
913
}

‎integration/init/jaeger/expected/.ship/state.json

+63
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
{
2+
"v1": {
3+
"config": {},
4+
"releaseName": "ship",
5+
"upstream": "https://github.com/jaegertracing/jaeger-kubernetes/blob/59e7afcae7b2f3bc109695cfda2a5c116cea4391/jaeger-production-template.yml",
6+
"metadata": {
7+
"applicationType": "",
8+
"releaseNotes": "",
9+
"version": "",
10+
"lists": [
11+
{
12+
"apiVersion": "v1",
13+
"path": "base/jaeger-production-template.yml",
14+
"items": [
15+
{
16+
"kind": "Deployment",
17+
"metadata": {
18+
"name": "jaeger-collector",
19+
"namespace": ""
20+
}
21+
},
22+
{
23+
"kind": "Service",
24+
"metadata": {
25+
"name": "jaeger-collector",
26+
"namespace": ""
27+
}
28+
},
29+
{
30+
"kind": "Service",
31+
"metadata": {
32+
"name": "zipkin",
33+
"namespace": ""
34+
}
35+
},
36+
{
37+
"kind": "Deployment",
38+
"metadata": {
39+
"name": "jaeger-query",
40+
"namespace": ""
41+
}
42+
},
43+
{
44+
"kind": "Service",
45+
"metadata": {
46+
"name": "jaeger-query",
47+
"namespace": ""
48+
}
49+
},
50+
{
51+
"kind": "DaemonSet",
52+
"metadata": {
53+
"name": "jaeger-agent",
54+
"namespace": ""
55+
}
56+
}
57+
]
58+
}
59+
]
60+
},
61+
"contentSHA": "5bd1e74a2eb0229845cb846302720bd692273c4117ff85838fd3c1759a174298"
62+
}
63+
}

‎integration/init/jaeger/expected/base/DaemonSet-jaeger-agent.yaml

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
apiVersion: extensions/v1beta1
2+
kind: DaemonSet
3+
metadata:
4+
labels:
5+
app: jaeger
6+
jaeger-infra: agent-daemonset
7+
name: jaeger-agent
8+
spec:
9+
template:
10+
metadata:
11+
annotations:
12+
prometheus.io/port: "5778"
13+
prometheus.io/scrape: "true"
14+
labels:
15+
app: jaeger
16+
jaeger-infra: agent-instance
17+
spec:
18+
containers:
19+
- args:
20+
- --config-file=/conf/agent.yaml
21+
image: jaegertracing/jaeger-agent:1.6.0
22+
name: agent-instance
23+
ports:
24+
- containerPort: 5775
25+
protocol: UDP
26+
- containerPort: 6831
27+
protocol: UDP
28+
- containerPort: 6832
29+
protocol: UDP
30+
- containerPort: 5778
31+
protocol: TCP
32+
volumeMounts:
33+
- mountPath: /conf
34+
name: jaeger-configuration-volume
35+
dnsPolicy: ClusterFirstWithHostNet
36+
hostNetwork: true
37+
volumes:
38+
- configMap:
39+
items:
40+
- key: agent
41+
path: agent.yaml
42+
name: jaeger-configuration
43+
name: jaeger-configuration-volume

‎integration/init/jaeger/expected/base/Deployment-jaeger-collector.yaml

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
apiVersion: extensions/v1beta1
2+
kind: Deployment
3+
metadata:
4+
labels:
5+
app: jaeger
6+
jaeger-infra: collector-deployment
7+
name: jaeger-collector
8+
spec:
9+
replicas: 1
10+
strategy:
11+
type: Recreate
12+
template:
13+
metadata:
14+
annotations:
15+
prometheus.io/port: "14268"
16+
prometheus.io/scrape: "true"
17+
labels:
18+
app: jaeger
19+
jaeger-infra: collector-pod
20+
spec:
21+
containers:
22+
- args:
23+
- --config-file=/conf/collector.yaml
24+
env:
25+
- name: SPAN_STORAGE_TYPE
26+
valueFrom:
27+
configMapKeyRef:
28+
key: span-storage-type
29+
name: jaeger-configuration
30+
image: jaegertracing/jaeger-collector:1.6.0
31+
name: jaeger-collector
32+
ports:
33+
- containerPort: 14267
34+
protocol: TCP
35+
- containerPort: 14268
36+
protocol: TCP
37+
- containerPort: 9411
38+
protocol: TCP
39+
readinessProbe:
40+
httpGet:
41+
path: /
42+
port: 14269
43+
volumeMounts:
44+
- mountPath: /conf
45+
name: jaeger-configuration-volume
46+
volumes:
47+
- configMap:
48+
items:
49+
- key: collector
50+
path: collector.yaml
51+
name: jaeger-configuration
52+
name: jaeger-configuration-volume

‎integration/init/jaeger/expected/base/Deployment-jaeger-query.yaml

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
apiVersion: extensions/v1beta1
2+
kind: Deployment
3+
metadata:
4+
labels:
5+
app: jaeger
6+
jaeger-infra: query-deployment
7+
name: jaeger-query
8+
spec:
9+
replicas: 1
10+
strategy:
11+
type: Recreate
12+
template:
13+
metadata:
14+
annotations:
15+
prometheus.io/port: "16686"
16+
prometheus.io/scrape: "true"
17+
labels:
18+
app: jaeger
19+
jaeger-infra: query-pod
20+
spec:
21+
containers:
22+
- args:
23+
- --config-file=/conf/query.yaml
24+
env:
25+
- name: SPAN_STORAGE_TYPE
26+
valueFrom:
27+
configMapKeyRef:
28+
key: span-storage-type
29+
name: jaeger-configuration
30+
image: jaegertracing/jaeger-query:1.6.0
31+
name: jaeger-query
32+
ports:
33+
- containerPort: 16686
34+
protocol: TCP
35+
readinessProbe:
36+
httpGet:
37+
path: /
38+
port: 16687
39+
volumeMounts:
40+
- mountPath: /conf
41+
name: jaeger-configuration-volume
42+
volumes:
43+
- configMap:
44+
items:
45+
- key: query
46+
path: query.yaml
47+
name: jaeger-configuration
48+
name: jaeger-configuration-volume

‎integration/init/jaeger/expected/base/Service-jaeger-collector.yaml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
labels:
5+
app: jaeger
6+
jaeger-infra: collector-service
7+
name: jaeger-collector
8+
spec:
9+
ports:
10+
- name: jaeger-collector-tchannel
11+
port: 14267
12+
protocol: TCP
13+
targetPort: 14267
14+
- name: jaeger-collector-http
15+
port: 14268
16+
protocol: TCP
17+
targetPort: 14268
18+
- name: jaeger-collector-zipkin
19+
port: 9411
20+
protocol: TCP
21+
targetPort: 9411
22+
selector:
23+
jaeger-infra: collector-pod
24+
type: ClusterIP

‎integration/init/jaeger/expected/base/Service-jaeger-query.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
labels:
5+
app: jaeger
6+
jaeger-infra: query-service
7+
name: jaeger-query
8+
spec:
9+
ports:
10+
- name: jaeger-query
11+
port: 80
12+
protocol: TCP
13+
targetPort: 16686
14+
selector:
15+
jaeger-infra: query-pod
16+
type: LoadBalancer

‎integration/init/jaeger/expected/base/Service-zipkin.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
labels:
5+
app: jaeger
6+
jaeger-infra: zipkin-service
7+
name: zipkin
8+
spec:
9+
ports:
10+
- name: jaeger-collector-zipkin
11+
port: 9411
12+
protocol: TCP
13+
targetPort: 9411
14+
selector:
15+
jaeger-infra: collector-pod
16+
type: ClusterIP

‎integration/init/jaeger/expected/base/kustomization.yaml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
kind: ""
2+
apiversion: ""
3+
resources:
4+
- DaemonSet-jaeger-agent.yaml
5+
- Deployment-jaeger-collector.yaml
6+
- Deployment-jaeger-query.yaml
7+
- Service-jaeger-collector.yaml
8+
- Service-jaeger-query.yaml
9+
- Service-zipkin.yaml

‎integration/init/jaeger/expected/overlays/ship/kustomization.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
kind: ""
2+
apiversion: ""
3+
bases:
4+
- ../../base

0 commit comments

Comments
 (0)