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

Remove -E from find command as it is not supported by GNU find #357

Merged
merged 5 commits into from
Mar 8, 2018
Merged

Remove -E from find command as it is not supported by GNU find #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d6b4bc0
Remove -E from find command as it is not supported by GNU find
Mar 5, 2018
767a34b
Run autoformat_jsonnet.sh
Mar 5, 2018
8683970
Remove $script_dir - format from $(pwd)
Mar 6, 2018
deff2df
Merge remote-tracking branch 'upstream/master' into fix_autoformat
Mar 7, 2018
5034b70
Merge remote-tracking branch 'upstream/master' into fix_autoformat
Mar 8, 2018
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
2 changes: 1 addition & 1 deletion components/k8s-model-server/images/releaser/components/params.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
// Test deploying a GPU model.
gpu_model: {
http_proxy_image: "gcr.io/kubeflow/http-proxy:1.0",
model_path: "gs://some-bucket/some/model",
model_path: "gs://some-bucket/some/model",
model_server_image: "gcr.io/kubeflow-images-staging/tf-model-server-gpu:v20180305-pr362-7f250ae-5cc7",
name: "gpu_model",
namespace: "default",
Expand Down
4 changes: 2 additions & 2 deletions components/k8s-model-server/images/releaser/components/workflows.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
local params = std.extVar("__ksonnet/params").components.workflows;

local k = import 'k.libsonnet';
local workflows = import 'workflows.libsonnet';
local k = import "k.libsonnet";
local workflows = import "workflows.libsonnet";

std.prune(k.core.v1.list.new([workflows.parts(params.namespace, params.name, overrides=params).e2e]))
228 changes: 116 additions & 112 deletions components/k8s-model-server/images/releaser/components/workflows.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,24 +22,24 @@

// Default parameters.
defaultParams:: {
bucket: "mlkube-testing_temp",
commit: "master",
// Name of the secret containing GCP credentials.
gcpCredentialsSecretName: "kubeflow-testing-credentials",
name: "new9",
namespace: "kubeflow-test-infra",
// The name of the NFS volume claim to use for test files.
nfsVolumeClaim: "nfs-external",
prow_env: "REPO_OWNER=kubeflow,REPO_NAME=kubeflow,PULL_BASE_SHA=master",
registry: "gcr.io/mlkube-testing",
versionTag: "latest",
// The default image to use for the steps in the Argo workflow.
testing_image: "gcr.io/mlkube-testing/kubeflow-testing",
tf_testing_image: "gcr.io/kubeflow-ci/tf-test-worker:1.0",
project: "mlkube-testing",
cluster: "kubeflow-testing",
zone: "us-east1-d",
build_image: false,
bucket: "mlkube-testing_temp",
commit: "master",
// Name of the secret containing GCP credentials.
gcpCredentialsSecretName: "kubeflow-testing-credentials",
name: "new9",
namespace: "kubeflow-test-infra",
// The name of the NFS volume claim to use for test files.
nfsVolumeClaim: "nfs-external",
prow_env: "REPO_OWNER=kubeflow,REPO_NAME=kubeflow,PULL_BASE_SHA=master",
registry: "gcr.io/mlkube-testing",
versionTag: "latest",
// The default image to use for the steps in the Argo workflow.
testing_image: "gcr.io/mlkube-testing/kubeflow-testing",
tf_testing_image: "gcr.io/kubeflow-ci/tf-test-worker:1.0",
project: "mlkube-testing",
cluster: "kubeflow-testing",
zone: "us-east1-d",
build_image: false,
},

parts(namespace, name, overrides={}):: {
Expand Down Expand Up @@ -79,100 +79,102 @@
// py scripts to use.
local kubeflowTestingPy = srcRootDir + "/kubeflow/testing/py";

// Location where build_image.sh
// Location where build_image.sh
local imageDir = srcRootDir + "/kubeflow/kubeflow/components/k8s-model-server/images";

local cpuImage = params.registry + "/tf-model-server-cpu" + ":" + params.versionTag;
local gpuImage = params.registry + "/tf-model-server-gpu" + ":" + params.versionTag;
local cpuImage = params.registry + "/tf-model-server-cpu" + ":" + params.versionTag;
local gpuImage = params.registry + "/tf-model-server-gpu" + ":" + params.versionTag;

// Build an Argo template to execute a particular command.
// step_name: Name for the template
// command: List to pass as the container command.
local buildTemplate(step_name, command, env_vars=[], sidecars=[])= {
name: step_name,
container: {
command: command,
image: testing_image,
env: [
{
// Add the source directories to the python path.
name: "PYTHONPATH",
value: kubeflowPy + ":" + kubeflowTestingPy,
},
{
name: "GOOGLE_APPLICATION_CREDENTIALS",
value: "/secret/gcp-credentials/key.json",
},
{
name: "GITHUB_TOKEN",
valueFrom: {
secretKeyRef: {
name: "github-token",
key: "github_token",
},
local buildTemplate(step_name, command, env_vars=[], sidecars=[]) = {
name: step_name,
container: {
command: command,
image: testing_image,
env: [
{
// Add the source directories to the python path.
name: "PYTHONPATH",
value: kubeflowPy + ":" + kubeflowTestingPy,
},
{
name: "GOOGLE_APPLICATION_CREDENTIALS",
value: "/secret/gcp-credentials/key.json",
},
{
name: "GITHUB_TOKEN",
valueFrom: {
secretKeyRef: {
name: "github-token",
key: "github_token",
},
},
] + prow_env + env_vars,
volumeMounts: [
{
name: dataVolume,
mountPath: mountPath,
},
{
name: "github-token",
mountPath: "/secret/github-token",
},
{
name: "gcp-credentials",
mountPath: "/secret/gcp-credentials",
},
],
},
sidecars: sidecars,
}; // buildTemplate
},
] + prow_env + env_vars,
volumeMounts: [
{
name: dataVolume,
mountPath: mountPath,
},
{
name: "github-token",
mountPath: "/secret/github-token",
},
{
name: "gcp-credentials",
mountPath: "/secret/gcp-credentials",
},
],
},
sidecars: sidecars,
}; // buildTemplate


local buildImageTemplate(step_name, dockerfile, image) =
buildTemplate(
step_name,
[
// We need to explicitly specify bash because
// build_image.sh is not in the container its a volume mounted file.
"/bin/bash", "-c",
imageDir + "/build_image.sh "
+ imageDir + "/" + dockerfile + " "
+ image,
],
[
{
name: "DOCKER_HOST",
value: "127.0.0.1",
},
],
[{
name: "dind",
image: "docker:17.10-dind",
securityContext: {
privileged: true,
},
mirrorVolumeMounts: true,
}],
); // buildImageTemplate
local buildImageTemplate(step_name, dockerfile, image) =
buildTemplate(
step_name,
[
// We need to explicitly specify bash because
// build_image.sh is not in the container its a volume mounted file.
"/bin/bash",
"-c",
imageDir + "/build_image.sh "
+ imageDir + "/" + dockerfile + " "
+ image,
],
[
{
name: "DOCKER_HOST",
value: "127.0.0.1",
},
],
[{
name: "dind",
image: "docker:17.10-dind",
securityContext: {
privileged: true,
},
mirrorVolumeMounts: true,
}],
); // buildImageTemplate
local e2e_tasks_base = [
{name: "checkout",
template: "checkout",
{
name: "checkout",
template: "checkout",
},

{
name: "create-pr-symlink",
template: "create-pr-symlink",
dependencies: ["checkout"],
},

{
name: "test-tf-serving",
template: "test-tf-serving",
dependencies: ["deploy-tf-serving"]
dependencies: ["deploy-tf-serving"],
},
];
local e2e_tasks = e2e_tasks_base + if build_image then [
Expand All @@ -184,29 +186,31 @@
{
name: "deploy-tf-serving",
template: "deploy-tf-serving",
dependencies: ["build-tf-serving-cpu"]
},] else [
dependencies: ["build-tf-serving-cpu"],
},
] else [
{
name: "deploy-tf-serving",
template: "deploy-tf-serving",
dependencies: ["checkout"],
},];
},
];
local deploy_tf_serving_command = [
"python",
"-m",
"testing.test_deploy",
"--project=" + project,
"--cluster=" + cluster,
"--zone=" + zone,
"--github_token=$(GITHUB_TOKEN)",
"--namespace=" + stepsNamespace,
"--test_dir=" + testDir,
"--artifacts_dir=" + artifactsDir,
"setup",
"--deploy_tf_serving=true",
"python",
"-m",
"testing.test_deploy",
"--project=" + project,
"--cluster=" + cluster,
"--zone=" + zone,
"--github_token=$(GITHUB_TOKEN)",
"--namespace=" + stepsNamespace,
"--test_dir=" + testDir,
"--artifacts_dir=" + artifactsDir,
"setup",
"--deploy_tf_serving=true",
] + if build_image then ["--model_server_image=" + cpuImage] else [];

{
{
apiVersion: "argoproj.io/v1alpha1",
kind: "Workflow",
metadata: {
Expand Down Expand Up @@ -243,10 +247,10 @@
templates: [
{
name: "e2e",
dag: {
tasks: e2e_tasks,
}, //dag
}, // e2e
dag: {
tasks: e2e_tasks,
}, //dag
}, // e2e
{
name: "exit-handler",
steps: [
Expand Down
4 changes: 2 additions & 2 deletions components/k8s-model-server/images/releaser/environments/prow/params.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
local params = import "../../components/params.libsonnet";
params + {
params {
components+: {
// Insert component parameter overrides here. Ex:
// guestbook +: {
// name: "guestbook-dev",
// replicas: params.global.replicas,
// },
workflows +: {
workflows+: {
name: "jlewi-tf-serving-release-v20180303-pr339-72bc7b1-98f7-98f7",
namespace: "kubeflow-test-infra",
prow_env: "JOB_NAME=tf-serving-release,JOB_TYPE=presubmit,REPO_NAME=kubeflow,REPO_OWNER=kubeflow,BUILD_NUMBER=98f7,PULL_NUMBER=339,PULL_PULL_SHA=72bc7b1",
Expand Down
30 changes: 15 additions & 15 deletions components/k8s-model-server/images/releaser/environments/releasing/.metadata/k.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ local hidden = {
},
},

mapContainersWithName(names, f) ::
mapContainersWithName(names, f)::
local nameSet =
if std.type(names) == "array"
then std.set(names)
Expand All @@ -32,46 +32,46 @@ local hidden = {
),
};

k8s + {
apps:: apps + {
v1beta1:: apps.v1beta1 + {
k8s {
apps:: apps {
v1beta1:: apps.v1beta1 {
local v1beta1 = apps.v1beta1,

daemonSet:: v1beta1.daemonSet + {
daemonSet:: v1beta1.daemonSet {
mapContainers(f):: hidden.mapContainers(f),
mapContainersWithName(names, f):: hidden.mapContainersWithName(names, f),
},

deployment:: v1beta1.deployment + {
deployment:: v1beta1.deployment {
mapContainers(f):: hidden.mapContainers(f),
mapContainersWithName(names, f):: hidden.mapContainersWithName(names, f),
},
},
},

core:: core + {
v1:: core.v1 + {
core:: core {
v1:: core.v1 {
list:: {
new(items)::
{apiVersion: "v1"} +
{kind: "List"} +
{ apiVersion: "v1" } +
{ kind: "List" } +
self.items(items),

items(items):: if std.type(items) == "array" then {items+: items} else {items+: [items]},
items(items):: if std.type(items) == "array" then { items+: items } else { items+: [items] },
},
},
},

extensions:: extensions + {
v1beta1:: extensions.v1beta1 + {
extensions:: extensions {
v1beta1:: extensions.v1beta1 {
local v1beta1 = extensions.v1beta1,

daemonSet:: v1beta1.daemonSet + {
daemonSet:: v1beta1.daemonSet {
mapContainers(f):: hidden.mapContainers(f),
mapContainersWithName(names, f):: hidden.mapContainersWithName(names, f),
},

deployment:: v1beta1.deployment + {
deployment:: v1beta1.deployment {
mapContainers(f):: hidden.mapContainers(f),
mapContainersWithName(names, f):: hidden.mapContainersWithName(names, f),
},
Expand Down
Loading