Skip to content

Commit

Permalink
Go mod versions (#164)
Browse files Browse the repository at this point in the history
Admin and propeller to use versions that use go mod for dependency management.  There was a bug in Admin that was fixed which is why we've gone one version beyond.

See related issue: #129

Also,
* Removing a broken key in propeller config that's been removed
  • Loading branch information
wild-endeavor authored Jan 29, 2020
1 parent b1e0a56 commit b6c38ae
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 26 deletions.
19 changes: 9 additions & 10 deletions deployment/sandbox/flyte_generated.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -719,10 +719,9 @@ data:
plugins:
qubole:
quboleTokenKey: "FLYTE_QUBOLE_CLIENT_TOKEN"
quboleLimit: 10
kind: ConfigMap
metadata:
name: flyte-qubole-config-t7226b4tck
name: flyte-qubole-config-9tcd8mk2c2
namespace: flyte
---
apiVersion: v1
Expand Down Expand Up @@ -964,7 +963,7 @@ spec:
- --config
- /etc/flyte/config/flyteadmin_config.yaml
- serve
image: docker.io/lyft/flyteadmin:v0.1.6
image: docker.io/lyft/flyteadmin:v0.2.1
imagePullPolicy: IfNotPresent
name: flyteadmin
ports:
Expand Down Expand Up @@ -1015,7 +1014,7 @@ spec:
- /etc/flyte/config/flyteadmin_config.yaml
- migrate
- run
image: docker.io/lyft/flyteadmin:v0.1.6
image: docker.io/lyft/flyteadmin:v0.2.1
imagePullPolicy: IfNotPresent
name: run-migrations
volumeMounts:
Expand All @@ -1030,7 +1029,7 @@ spec:
- seed-projects
- flytesnacks
- flytetester
image: docker.io/lyft/flyteadmin:v0.1.6
image: docker.io/lyft/flyteadmin:v0.2.1
imagePullPolicy: IfNotPresent
name: seed-projects
volumeMounts:
Expand All @@ -1043,7 +1042,7 @@ spec:
- /etc/flyte/config/flyteadmin_config.yaml
- clusterresource
- sync
image: docker.io/lyft/flyteadmin:v0.1.6
image: docker.io/lyft/flyteadmin:v0.2.1
imagePullPolicy: IfNotPresent
name: sync-cluster-resources
volumeMounts:
Expand Down Expand Up @@ -1119,7 +1118,7 @@ spec:
labels:
app: flytepropeller
app.kubernetes.io/name: flytepropeller
app.kubernetes.io/version: 0.1.16
app.kubernetes.io/version: 0.2.0
spec:
containers:
- args:
Expand All @@ -1134,7 +1133,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.name
image: docker.io/lyft/flytepropeller:v0.1.16
image: docker.io/lyft/flytepropeller:v0.2.0
imagePullPolicy: IfNotPresent
name: flytepropeller
ports:
Expand All @@ -1158,7 +1157,7 @@ spec:
serviceAccountName: flytepropeller
volumes:
- configMap:
name: flyte-qubole-config-t7226b4tck
name: flyte-qubole-config-9tcd8mk2c2
name: qubole-config-volume
- configMap:
name: flyte-container-config-5k78b9cm42
Expand Down Expand Up @@ -1439,7 +1438,7 @@ spec:
- /etc/flyte/config/flyteadmin_config.yaml
- clusterresource
- sync
image: docker.io/lyft/flyteadmin:v0.1.6
image: docker.io/lyft/flyteadmin:v0.2.1
imagePullPolicy: IfNotPresent
name: sync-cluster-resources
volumeMounts:
Expand Down
14 changes: 7 additions & 7 deletions deployment/test/flyte_generated.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ spec:
- --config
- /etc/flyte/config/flyteadmin_config.yaml
- serve
image: docker.io/lyft/flyteadmin:v0.1.6
image: docker.io/lyft/flyteadmin:v0.2.1
imagePullPolicy: IfNotPresent
name: flyteadmin
ports:
Expand Down Expand Up @@ -683,7 +683,7 @@ spec:
- /etc/flyte/config/flyteadmin_config.yaml
- migrate
- run
image: docker.io/lyft/flyteadmin:v0.1.6
image: docker.io/lyft/flyteadmin:v0.2.1
imagePullPolicy: IfNotPresent
name: run-migrations
volumeMounts:
Expand All @@ -698,7 +698,7 @@ spec:
- seed-projects
- flytesnacks
- flytetester
image: docker.io/lyft/flyteadmin:v0.1.6
image: docker.io/lyft/flyteadmin:v0.2.1
imagePullPolicy: IfNotPresent
name: seed-projects
volumeMounts:
Expand All @@ -711,7 +711,7 @@ spec:
- /etc/flyte/config/flyteadmin_config.yaml
- clusterresource
- sync
image: docker.io/lyft/flyteadmin:v0.1.6
image: docker.io/lyft/flyteadmin:v0.2.1
imagePullPolicy: IfNotPresent
name: sync-cluster-resources
volumeMounts:
Expand Down Expand Up @@ -750,7 +750,7 @@ spec:
labels:
app: flytepropeller
app.kubernetes.io/name: flytepropeller
app.kubernetes.io/version: 0.1.16
app.kubernetes.io/version: 0.2.0
spec:
containers:
- args:
Expand All @@ -763,7 +763,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.name
image: docker.io/lyft/flytepropeller:v0.1.16
image: docker.io/lyft/flytepropeller:v0.2.0
imagePullPolicy: IfNotPresent
name: flytepropeller
ports:
Expand Down Expand Up @@ -1009,7 +1009,7 @@ spec:
- /etc/flyte/config/flyteadmin_config.yaml
- clusterresource
- sync
image: docker.io/lyft/flyteadmin:v0.1.6
image: docker.io/lyft/flyteadmin:v0.2.1
imagePullPolicy: IfNotPresent
name: sync-cluster-resources
volumeMounts:
Expand Down
4 changes: 2 additions & 2 deletions kustomize/base/admindeployment/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ spec:
name: flyte-admin-config
initContainers:
- name: run-migrations
image: docker.io/lyft/flyteadmin:v0.1.6
image: docker.io/lyft/flyteadmin:v0.2.1
imagePullPolicy: IfNotPresent
command: ["flyteadmin", "--logtostderr", "--config", "/etc/flyte/config/flyteadmin_config.yaml", "migrate", "run"]
volumeMounts:
- name: config-volume
mountPath: /etc/flyte/config
containers:
- name: flyteadmin
image: docker.io/lyft/flyteadmin:v0.1.6
image: docker.io/lyft/flyteadmin:v0.2.1
imagePullPolicy: IfNotPresent
command: ["flyteadmin", "--logtostderr", "--config", "/etc/flyte/config/flyteadmin_config.yaml", "serve"]
ports:
Expand Down
4 changes: 2 additions & 2 deletions kustomize/base/propeller/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
labels:
app: flytepropeller
app.kubernetes.io/name: flytepropeller
app.kubernetes.io/version: 0.1.16
app.kubernetes.io/version: 0.2.0
annotations:
prometheus.io/scrape: "true"
prometheus.io/port: "10254"
Expand All @@ -31,7 +31,7 @@ spec:
name: flyte-plugin-config
containers:
- name: flytepropeller
image: docker.io/lyft/flytepropeller:v0.1.16
image: docker.io/lyft/flytepropeller:v0.2.0
command:
- flytepropeller
args:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@ spec:
'until pg_isready -h postgres -p 5432;
do echo waiting for database; sleep 2; done;']
- name: run-migrations
image: docker.io/lyft/flyteadmin:v0.1.6
image: docker.io/lyft/flyteadmin:v0.2.1
imagePullPolicy: IfNotPresent
command: ["flyteadmin", "--logtostderr", "--config", "/etc/flyte/config/flyteadmin_config.yaml",
"migrate", "run"]
volumeMounts:
- name: config-volume
mountPath: /etc/flyte/config
- name: seed-projects
image: docker.io/lyft/flyteadmin:v0.1.6
image: docker.io/lyft/flyteadmin:v0.2.1
imagePullPolicy: IfNotPresent
command: ["flyteadmin", "--logtostderr", "--config", "/etc/flyte/config/flyteadmin_config.yaml",
"migrate", "seed-projects", "flytesnacks", "flytetester"]
volumeMounts:
- name: config-volume
mountPath: /etc/flyte/config
- name: sync-cluster-resources
image: docker.io/lyft/flyteadmin:v0.1.6
image: docker.io/lyft/flyteadmin:v0.2.1
imagePullPolicy: IfNotPresent
command: ["flyteadmin", "--logtostderr", "--config", "/etc/flyte/config/flyteadmin_config.yaml", "clusterresource", "sync"]
volumeMounts:
Expand Down
2 changes: 1 addition & 1 deletion kustomize/overlays/sandbox/admindeployment/cron.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
serviceAccountName: flyteadmin
containers:
- name: sync-cluster-resources
image: docker.io/lyft/flyteadmin:v0.1.6
image: docker.io/lyft/flyteadmin:v0.2.1
imagePullPolicy: IfNotPresent
command: ["flyteadmin", "--logtostderr", "--config", "/etc/flyte/config/flyteadmin_config.yaml", "clusterresource", "sync"]
volumeMounts:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
plugins:
qubole:
quboleTokenKey: "FLYTE_QUBOLE_CLIENT_TOKEN"
quboleLimit: 10

0 comments on commit b6c38ae

Please sign in to comment.