Skip to content

Commit

Permalink
Update dev.kubeflow.org (kubeflow#130)
Browse files Browse the repository at this point in the history
* Update dev.kubeflow.org

* Update dev.kubeflow.org to use master so that we can see the latest changes.
* In particular we want to see the central UI
* recreate_app.sh shouldn't hardcode the client secret; the secret is
  created from a GCS file by redeploy_app.sh

* Update the README; the command for redeploy_app.sh was incorrect.
* Recreate the default environment because the cluster has changed.

Related to kubeflow#805 Verify Central UI is working.

* Autoformat jsonnet.

* * Modify recreate_app.sh so we automatically check out the files from master
  for the GitHub issue summarization example. Those won't be recreated
  automatically.

* Restore params.

* Autoformat all the files.
  • Loading branch information
jlewi authored and k8s-ci-robot committed May 17, 2018
1 parent 39401ac commit 895e684
Show file tree
Hide file tree
Showing 9 changed files with 189 additions and 162 deletions.
2 changes: 1 addition & 1 deletion dev-kubeflow-org/README.md
Expand Up @@ -11,7 +11,7 @@ To upgrade the deployment.

1. Run `recreate_app.sh`

1. Run `redeploy.sh`
1. Run `redeploy_app.sh`

# Istio setup

Expand Down

This file was deleted.

@@ -0,0 +1,30 @@
apiVersion: 0.1.0
gitVersion:
commitSha: fe9fc2aa3cceba6266ced46ee828ba21ee0152bd
refSpec: master
kind: ksonnet.io/registry
libraries:
argo:
path: argo
version: master
core:
path: core
version: master
new-package-stub:
path: new-package-stub
version: master
openmpi:
path: openmpi
version: master
pachyderm:
path: pachyderm
version: master
pytorch-job:
path: pytorch-job
version: master
tf-job:
path: tf-job
version: master
tf-serving:
path: tf-serving
version: master
22 changes: 11 additions & 11 deletions dev-kubeflow-org/ks-app/app.yaml
Expand Up @@ -10,26 +10,26 @@ kind: ksonnet.io/app
libraries:
core:
gitVersion:
commitSha: 20bdb46ee436b56fb9e3690d2a383b2afc8989f4
refSpec: v0.1.0-rc.4
commitSha: fe9fc2aa3cceba6266ced46ee828ba21ee0152bd
refSpec: master
name: core
registry: kubeflow
seldon:
gitVersion:
commitSha: 20bdb46ee436b56fb9e3690d2a383b2afc8989f4
refSpec: v0.1.0-rc.4
commitSha: fe9fc2aa3cceba6266ced46ee828ba21ee0152bd
refSpec: master
name: seldon
registry: kubeflow
tf-job:
gitVersion:
commitSha: 20bdb46ee436b56fb9e3690d2a383b2afc8989f4
refSpec: v0.1.0-rc.4
commitSha: fe9fc2aa3cceba6266ced46ee828ba21ee0152bd
refSpec: master
name: tf-job
registry: kubeflow
tf-serving:
gitVersion:
commitSha: 20bdb46ee436b56fb9e3690d2a383b2afc8989f4
refSpec: v0.1.0-rc.4
commitSha: fe9fc2aa3cceba6266ced46ee828ba21ee0152bd
refSpec: master
name: tf-serving
registry: kubeflow
name: ks-app
Expand All @@ -42,8 +42,8 @@ registries:
uri: github.com/ksonnet/parts/tree/master/incubator
kubeflow:
gitVersion:
commitSha: 20bdb46ee436b56fb9e3690d2a383b2afc8989f4
refSpec: v0.1.0-rc.4
commitSha: fe9fc2aa3cceba6266ced46ee828ba21ee0152bd
refSpec: master
protocol: github
uri: github.com/kubeflow/kubeflow/tree/v0.1.0-rc.4/kubeflow
uri: github.com/kubeflow/kubeflow/tree/master/kubeflow
version: 0.0.1
9 changes: 1 addition & 8 deletions dev-kubeflow-org/ks-app/components/cert-manager.jsonnet
@@ -1,19 +1,12 @@
local env = std.extVar("__ksonnet/environments");
local params = std.extVar("__ksonnet/params").components["cert-manager"];
// TODO(https://github.com/ksonnet/ksonnet/issues/222): We have to add namespace as an explicit parameter
// because ksonnet doesn't support inheriting it from the environment yet.

local k = import "k.libsonnet";
local certManager = import "kubeflow/core/cert-manager.libsonnet";

local name = params.name;
local acmeEmail = params.acmeEmail;
local acmeUrl = params.acmeUrl;

// updatedParams uses the environment namespace if
// the namespace parameter is not explicitly set
local updatedParams = params {
namespace: if params.namespace == "null" then env.namespace else params.namespace,
};

certManager.parts(updatedParams.namespace).certManagerParts(acmeEmail, acmeUrl)
certManager.parts(updatedParams.namespace).certManagerParts(params.acmeEmail, params.acmeUrl)
12 changes: 2 additions & 10 deletions dev-kubeflow-org/ks-app/components/iap-ingress.jsonnet
Expand Up @@ -10,15 +10,7 @@ local updatedParams = params {
namespace: if params.namespace == "null" then env.namespace else params.namespace,
};

local name = params.name;
local namespace = updatedParams.namespace;
local secretName = params.secretName;
local ipName = params.ipName;
local hostname = params.hostname;
local issuer = params.issuer;
local envoyImage = params.envoyImage;
local disableJwtCheckingParam = params.disableJwtChecking;
local disableJwtChecking = util.toBool(disableJwtCheckingParam);
local oauthSecretName = params.oauthSecretName;
local disableJwtChecking = util.toBool(params.disableJwtChecking);

iap.parts(namespace).ingressParts(secretName, ipName, hostname, issuer, envoyImage, disableJwtChecking, oauthSecretName)
iap.parts(namespace).ingressParts(params.secretName, params.ipName, params.hostname, params.issuer, params.envoyImage, disableJwtChecking, params.oauthSecretName)

0 comments on commit 895e684

Please sign in to comment.