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.

Sign up for GitHub

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

Jump to bottom

Enable v1alpha2 for Pytorch operator #1441

Merged
merged 3 commits into from
Aug 30, 2018
Merged

Enable v1alpha2 for Pytorch operator #1441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97b62b3
Adding Pytorch operator installation doc
johnugeorge Jun 20, 2018
0662879
Removing user guide
johnugeorge Jun 21, 2018
594da08
Enable v1alpha2 for pytorch
johnugeorge Aug 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions kubeflow/pytorch-job/prototypes/pytorch-operator.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
// @optionalParam cloud string null String identifying the cloud to customize the deployment for.
// @optionalParam pytorchJobImage string gcr.io/kubeflow-images-public/pytorch-operator:v20180619-2e19016 The image for the PyTorchJob controller
// @optionalParam pytorchDefaultImage string null The default image to use for pytorch
// @optionalParam pytorchJobVersion string v1alpha1 which version of the PyTorchJob operator to use

local k = import "k.libsonnet";
local operator = import "kubeflow/pytorch-job/pytorch-operator.libsonnet";
Expand Down
137 changes: 130 additions & 7 deletions kubeflow/pytorch-job/pytorch-operator.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
{
all(params, env):: [
$.parts(params, env).pytorchJobDeploy(params.pytorchJobImage),
$.parts(params, env).configMap(params.cloud, params.pytorchDefaultImage),
$.parts(params, env).serviceAccount,
$.parts(params, env).operatorRole,
$.parts(params, env).operatorRoleBinding,
$.parts(params, env).crd,
],
$.parts(params, env).configMap(params.cloud, params.pytorchDefaultImage),
$.parts(params, env).serviceAccount,
$.parts(params, env).operatorRole,
$.parts(params, env).operatorRoleBinding,
] +

if params.pytorchJobVersion == "v1alpha2" then
[
$.parts(params, env).crdV1alpha2,
$.parts(params, env).pytorchJobDeployV1alpha2(params.pytorchJobImage),
]
else
[
$.parts(params, env).crd,
$.parts(params, env).pytorchJobDeploy(params.pytorchJobImage),
],

parts(params, env):: {
local namespace = if params.namespace != "null" then params.namespace else env.namespace,
Expand All @@ -27,6 +36,54 @@
},
},

crdV1alpha2: {
apiVersion: "apiextensions.k8s.io/v1beta1",
kind: "CustomResourceDefinition",
metadata: {
name: "pytorchjobs.kubeflow.org",
},
spec: {
group: "kubeflow.org",
version: "v1alpha2",
names: {
kind: "PyTorchJob",
singular: "pytorchjob",
plural: "pytorchjobs",
},
validation: {
openAPIV3Schema: {
properties: {
spec: {
properties: {
pytorchReplicaSpecs: {
properties: {
Worker: {
properties: {
replicas: {
type: "integer",
minimum: 1,
},
},
},
Master: {
properties: {
replicas: {
type: "integer",
minimum: 1,
maximum: 1,
},
},
},
},
},
},
},
},
},
},
},
},

pytorchJobDeploy(image): {
apiVersion: "extensions/v1beta1",
kind: "Deployment",
Expand Down Expand Up @@ -93,6 +150,72 @@
},
}, // pytorchJobDeploy

pytorchJobDeployV1alpha2(image): {
apiVersion: "extensions/v1beta1",
kind: "Deployment",
metadata: {
name: "pytorch-operator",
namespace: namespace,
},
spec: {
replicas: 1,
template: {
metadata: {
labels: {
name: "pytorch-operator",
},
},
spec: {
containers: [
{
command: [
"/pytorch-operator.v2",
"--alsologtostderr",
"-v=1",
],
env: [
{
name: "MY_POD_NAMESPACE",
valueFrom: {
fieldRef: {
fieldPath: "metadata.namespace",
},
},
},
{
name: "MY_POD_NAME",
valueFrom: {
fieldRef: {
fieldPath: "metadata.name",
},
},
},
],
image: image,
name: "pytorch-operator",
volumeMounts: [
{
mountPath: "/etc/config",
name: "config-volume",
},
],
},
],
serviceAccountName: "pytorch-operator",
volumes: [
{
configMap: {
name: "pytorch-operator-config",
},
name: "config-volume",
},
],
},
},
},
}, // pytorchJobDeployV1alpha2


// Default value for
defaultControllerConfig(pytorchDefaultImage):: if pytorchDefaultImage != "" && pytorchDefaultImage != "null" then
{
Expand Down