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.

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

Trim sandbox #727

Merged
merged 12 commits into from
Feb 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11,571 changes: 1,747 additions & 9,824 deletions deployment/sandbox/flyte_generated.yaml

Large diffs are not rendered by default.

103 changes: 13 additions & 90 deletions deployment/test/flyte_generated.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -580,14 +580,16 @@ data:
rate: 10
capacity: 100
enabled_plugins.yaml: |
##
# TODO It is important to enable the plugins that you want to deploy here.
tasks:
task-plugins:
enabled-plugins:
- container
- sidecar
- k8s-array
default-for-task-types:
container: container
sidecar: sidecar
container_array: k8s-array
k8s.yaml: |
plugins:
k8s:
Expand All @@ -604,11 +606,7 @@ data:
resource_manager.yaml: |
propeller:
resourcemanager:
type: redis
resourceMaxQuota: 10000
redis:
hostPath: redis-resource-manager:6379
hostKey: mypassword
type: noop
storage.yaml: |+
storage:
type: minio
Expand All @@ -629,7 +627,7 @@ data:
kubernetes-url: "http://localhost:30082"
kind: ConfigMap
metadata:
name: flyte-propeller-config-45fc6m5292
name: flyte-propeller-config-569h4b5459
namespace: flyte
---
apiVersion: v1
Expand Down Expand Up @@ -724,23 +722,6 @@ spec:
selector:
app: postgres
---
apiVersion: v1
kind: Service
metadata:
labels:
app: redis-resource-manager
name: redis-resource-manager
namespace: flyte
spec:
ports:
- name: redis
port: 6379
protocol: TCP
targetPort: redis
selector:
app: redis-resource-manager
type: ClusterIP
---
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down Expand Up @@ -964,7 +945,7 @@ spec:
- sh
- -c
- until pg_isready -h postgres -p 5432; do echo waiting for database; sleep 2; done;
image: postgres:10.1
image: postgres:10.16-alpine
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice!

name: check-db-ready
- command:
- flyteadmin
Expand All @@ -988,9 +969,8 @@ spec:
- /etc/flyte/config/*.yaml
- migrate
- seed-projects
- flytesnacks
- flytetester
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we remove this one as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's used by the current version of flytetester image used in endtoend tests.... once that migrates off, then we can

- flyteexamples
- flytesnacks
image: ghcr.io/lyft/flyteadmin:v0.3.29
imagePullPolicy: IfNotPresent
name: seed-projects
Expand Down Expand Up @@ -1074,7 +1054,7 @@ spec:
serviceAccountName: flytepropeller
volumes:
- configMap:
name: flyte-propeller-config-45fc6m5292
name: flyte-propeller-config-569h4b5459
name: config-volume
---
apiVersion: apps/v1
Expand Down Expand Up @@ -1127,7 +1107,10 @@ spec:
app: postgres
spec:
containers:
- image: postgres:10.1
- env:
- name: POSTGRES_HOST_AUTH_METHOD
value: trust
image: postgres:10.16-alpine
name: postgres
ports:
- containerPort: 5432
Expand All @@ -1139,66 +1122,6 @@ spec:
- emptyDir: {}
name: postgres-storage
---
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: redis
namespace: flyte
spec:
replicas: 1
selector:
matchLabels:
app: redis-resource-manager
serviceName: redis-resource-manager
template:
metadata:
labels:
app: redis-resource-manager
spec:
containers:
- env:
- name: REDIS_PASSWORD
value: mypassword
image: docker.io/bitnami/redis:4.0.2-r1
imagePullPolicy: IfNotPresent
livenessProbe:
exec:
command:
- redis-cli
- ping
failureThreshold: 3
initialDelaySeconds: 30
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 5
name: redis-resource-manager
ports:
- containerPort: 6379
name: redis
protocol: TCP
readinessProbe:
exec:
command:
- redis-cli
- ping
failureThreshold: 3
initialDelaySeconds: 5
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 1
resources:
requests:
cpu: 200m
memory: 128Mi
volumeMounts:
- mountPath: /bitnami
name: redis-data
dnsPolicy: ClusterFirst
restartPolicy: Always
volumes:
- emptyDir: {}
name: redis-data
---
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
Expand Down
112 changes: 69 additions & 43 deletions kustomize/overlays/sandbox/admin/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,47 +7,73 @@ spec:
template:
spec:
volumes:
- name: resource-templates
configMap:
name: clusterresource-template
- name: resource-templates
configMap:
name: clusterresource-template
initContainers:
- name: check-db-ready
image: postgres:10.1
command: ['sh', '-c',
'until pg_isready -h postgres -p 5432;
do echo waiting for database; sleep 2; done;']
- name: run-migrations
image: flyteadmin:v0.3.29
imagePullPolicy: IfNotPresent
command: ["flyteadmin", "--logtostderr", "--config", "/etc/flyte/config/*.yaml",
"migrate", "run"]
volumeMounts:
- name: config-volume
mountPath: /etc/flyte/config
- name: seed-projects
image: flyteadmin:v0.3.29
imagePullPolicy: IfNotPresent
command: ["flyteadmin", "--logtostderr", "--config", "/etc/flyte/config/*.yaml",
"migrate", "seed-projects", "flytesnacks", "flytetester", "flyteexamples"]
volumeMounts:
- name: config-volume
mountPath: /etc/flyte/config
- name: sync-cluster-resources
image: flyteadmin:v0.3.29
imagePullPolicy: IfNotPresent
command: ["flyteadmin", "--logtostderr", "--config", "/etc/flyte/config/*.yaml", "clusterresource", "sync"]
volumeMounts:
- name: resource-templates
mountPath: /etc/flyte/clusterresource/templates
- name: config-volume
mountPath: /etc/flyte/config
- name: check-db-ready
image: postgres:10.16-alpine
EngHabu marked this conversation as resolved.
Show resolved Hide resolved
command: [
"sh",
"-c",
"until pg_isready -h postgres -p 5432;
do echo waiting for database; sleep 2; done;",
]
- name: run-migrations
image: flyteadmin:v0.3.29
imagePullPolicy: IfNotPresent
command:
[
"flyteadmin",
"--logtostderr",
"--config",
"/etc/flyte/config/*.yaml",
"migrate",
"run",
]
volumeMounts:
- name: config-volume
mountPath: /etc/flyte/config
- name: seed-projects
image: flyteadmin:v0.3.29
imagePullPolicy: IfNotPresent
command:
[
"flyteadmin",
"--logtostderr",
"--config",
"/etc/flyte/config/*.yaml",
"migrate",
"seed-projects",
"flytesnacks",
]
volumeMounts:
- name: config-volume
mountPath: /etc/flyte/config
- name: sync-cluster-resources
image: flyteadmin:v0.3.29
imagePullPolicy: IfNotPresent
command:
[
"flyteadmin",
"--logtostderr",
"--config",
"/etc/flyte/config/*.yaml",
"clusterresource",
"sync",
]
volumeMounts:
- name: resource-templates
mountPath: /etc/flyte/clusterresource/templates
- name: config-volume
mountPath: /etc/flyte/config
containers:
- name: flyteadmin
resources:
limits:
memory: "200Mi"
cpu: "0.1"
ephemeral-storage: "100Mi"
- name: flyteadmin
resources:
limits:
memory: "200Mi"
cpu: "0.1"
ephemeral-storage: "100Mi"
---
apiVersion: v1
kind: Service
Expand All @@ -56,7 +82,7 @@ metadata:
namespace: flyte
spec:
ports:
- name: redoc
protocol: TCP
port: 87
targetPort: 8087
- name: redoc
protocol: TCP
port: 87
targetPort: 8087
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,8 @@ tasks:
enabled-plugins:
- container
- sidecar
- spark
- k8s-array
- pytorch
default-for-task-types:
container: container
sidecar: sidecar
spark: spark
container_array: k8s-array
pytorch: pytorch

This file was deleted.

16 changes: 0 additions & 16 deletions kustomize/overlays/sandbox/config/propeller/plugins/spark.yaml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
propeller:
resourcemanager:
type: noop
37 changes: 20 additions & 17 deletions kustomize/overlays/sandbox/dependencies/database/database.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,25 @@ spec:
- name: postgres-storage
emptyDir: {}
containers:
- image: "postgres:10.1"
name: postgres
ports:
- containerPort: 5432
- image: postgres
name: postgres
volumeMounts:
- name: postgres-storage
mountPath: /var/lib/postgresql/data
env:
- name: POSTGRES_HOST_AUTH_METHOD
value: trust
ports:
- containerPort: 5432
name: postgres
volumeMounts:
- name: postgres-storage
mountPath: /var/lib/postgresql/data
---
apiVersion: v1
kind: Service
metadata:
name: postgres
namespace: flyte
spec:
ports:
- port: 5432
selector:
app: postgres
apiVersion: v1
kind: Service
metadata:
name: postgres
namespace: flyte
spec:
ports:
- port: 5432
selector:
app: postgres
Loading