cherry pick missing commits into v1.3-branch (kubeflow#5836)

* Update notebook server base images (kubeflow#5804) (cherry picked from commit ebc0c4f) * Update second layer docker images to new tags and some python deps (kubeflow#5809) (cherry picked from commit 3dbc352) * Update image tags and python packages in pytorch and tensorflow full dockerfiles (kubeflow#5817) (cherry picked from commit e8250b9) * Add CI format checks for the Jupyter web app (kubeflow#5811) * jwa(front): Add npm rule for checking the format Signed-off-by: Kimonas Sotirchos <[email protected]> * ci: Add common tasks for format checks Signed-off-by: Kimonas Sotirchos <[email protected]> * ci(jwa): Add format check tasks Signed-off-by: Kimonas Sotirchos <[email protected]> * jwa(back): Fix formatting Signed-off-by: Kimonas Sotirchos <[email protected]> * jwa(front): Fix formatting Run `npm run format:write` on frontend Signed-off-by: Kimonas Sotirchos <[email protected]> * jwa(front): Include prettier in package.json Signed-off-by: Kimonas Sotirchos <[email protected]> * jwa(docker): Don't copy node_modules in Dockerfile Signed-off-by: Kimonas Sotirchos <[email protected]> * web-apps: Add global dockerignore file Signed-off-by: Kimonas Sotirchos <[email protected]> * jwa: Remove unused dockerignore file Signed-off-by: Kimonas Sotirchos <[email protected]> * jwa(make): Don't include dockerignore and cleanup Signed-off-by: Kimonas Sotirchos <[email protected]> (cherry picked from commit 43e03d4) * initial notebook server images README.md (kubeflow#5818) (cherry picked from commit 923a7c8) * Fix profile-controller CRD pruning issue (kubeflow#5822) * api: Add marker for preserving unknown fields in Plugins Signed-off-by: Yannis Zarkadas <[email protected]> * manifests: Regenerate manifests Signed-off-by: Yannis Zarkadas <[email protected]> (cherry picked from commit 8a12599) * Remove Logo Trademarks from the Jupyter Web App and make logos configurable (kubeflow#5823) * rebase: Make logos configurable in configmap and remove trademark references Rebased to remove the changes to the package-lock.json * review: add suggested changes and add image group section to README (cherry picked from commit d73e468) * Make notebook limits configurable with a multiplication factor (kubeflow#5815) * Make notebook limits configurable with a multiplication factor * Make limits configurable under advanced section * run prettier to format frontend code * fix formatting and add rounding in backend * Return error if limit is smaller than request * Allow disabling limitFactor by setting it to none * review: remove camelCase in python backend * fix: update spawner_ui_config.yaml in manifests directory * review: fix setting limits backend * review: remove unnecessary check from backend (cherry picked from commit 2ed54bc) Co-authored-by: DavidSpek <[email protected]> Co-authored-by: Kimonas Sotirchos <[email protected]> Co-authored-by: Yannis Zarkadas <[email protected]>
StatCan · Sep 9, 2022 · 0fb0655 · 0fb0655
1 parent ca45a13
commit 0fb0655
Show file tree

Hide file tree

Showing 15 changed files with 42 additions and 36 deletions.
diff --git a/...web-apps/jupyter/frontend/src/app/pages/form/form-default/volume/volume.component.spec.ts b/...web-apps/jupyter/frontend/src/app/pages/form/form-default/volume/volume.component.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { VolumeComponent } from './volume.component';
+
+describe('VolumeComponent', () => {
+  let component: VolumeComponent;
+  let fixture: ComponentFixture<VolumeComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [VolumeComponent],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(VolumeComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/components/example-notebook-servers/codeserver-python/Dockerfile b/components/example-notebook-servers/codeserver-python/Dockerfile
@@ -1,6 +1,4 @@
-# Use the respective Makefile to pass the appropriate BASE_IMG and build the image correctly
-ARG BASE_IMG=<codeserver>
-FROM $BASE_IMG
+FROM public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/codeserver:master-ebc0c4f0
 
 USER root
 

diff --git a/components/example-notebook-servers/codeserver/Dockerfile b/components/example-notebook-servers/codeserver/Dockerfile
@@ -1,6 +1,4 @@
-# Use the respective Makefile to pass the appropriate BASE_IMG and build the image correctly
-ARG BASE_IMG=<base>
-FROM $BASE_IMG
+FROM public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/base:master-1831e436
 
 USER root
 

diff --git a/components/example-notebook-servers/jupyter-pytorch-full/cpu.Dockerfile b/components/example-notebook-servers/jupyter-pytorch-full/cpu.Dockerfile
@@ -1,6 +1,4 @@
-# Use the respective Makefile to pass the appropriate BASE_IMG and build the image correctly
-ARG BASE_IMG=<jupyter-pytorch>
-FROM $BASE_IMG
+FROM public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-pytorch:master-3dbc352f
 
 # install - requirements.txt
 COPY --chown=jovyan:users requirements.txt /tmp/requirements.txt

diff --git a/components/example-notebook-servers/jupyter-pytorch-full/cuda.Dockerfile b/components/example-notebook-servers/jupyter-pytorch-full/cuda.Dockerfile
@@ -1,6 +1,4 @@
-# Use the respective Makefile to pass the appropriate BASE_IMG and build the image correctly
-ARG BASE_IMG=<jupyter-pytorch-cuda>
-FROM $BASE_IMG
+FROM public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-pytorch-cuda:master-3dbc352f
 
 # install - requirements.txt
 COPY --chown=jovyan:users requirements.txt /tmp/requirements.txt

diff --git a/components/example-notebook-servers/jupyter-pytorch/cpu.Dockerfile b/components/example-notebook-servers/jupyter-pytorch/cpu.Dockerfile
@@ -1,6 +1,4 @@
-# Use the respective Makefile to pass the appropriate BASE_IMG and build the image correctly
-ARG BASE_IMG=<jupyter>
-FROM $BASE_IMG
+FROM public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter:master-ebc0c4f0
 
 # install - requirements.txt
 COPY --chown=jovyan:users cpu-requirements.txt /tmp/requirements.txt

diff --git a/components/example-notebook-servers/jupyter-pytorch/cuda.Dockerfile b/components/example-notebook-servers/jupyter-pytorch/cuda.Dockerfile
@@ -1,6 +1,4 @@
-# Use the respective Makefile to pass the appropriate BASE_IMG and build the image correctly
-ARG BASE_IMG=<jupyter>
-FROM $BASE_IMG
+FROM public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter:master-ebc0c4f0
 
 # nvidia configs
 ENV NVIDIA_VISIBLE_DEVICES all

diff --git a/components/example-notebook-servers/jupyter-scipy/Dockerfile b/components/example-notebook-servers/jupyter-scipy/Dockerfile
@@ -1,6 +1,4 @@
-# Use the respective Makefile to pass the appropriate BASE_IMG and build the image correctly
-ARG BASE_IMG=<jupyter>
-FROM $BASE_IMG
+FROM public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter:master-ebc0c4f0
 
 # install - requirements.txt
 COPY --chown=jovyan:users requirements.txt /tmp/requirements.txt

diff --git a/components/example-notebook-servers/jupyter-tensorflow-full/cpu.Dockerfile b/components/example-notebook-servers/jupyter-tensorflow-full/cpu.Dockerfile
@@ -1,6 +1,4 @@
-# Use the respective Makefile to pass the appropriate BASE_IMG and build the image correctly
-ARG BASE_IMG=<jupyter-tensorflow>
-FROM $BASE_IMG
+FROM public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-tensorflow:master-3dbc352f
 
 # install - requirements.txt
 COPY --chown=jovyan:users requirements.txt /tmp/requirements.txt

diff --git a/components/example-notebook-servers/jupyter-tensorflow-full/cuda.Dockerfile b/components/example-notebook-servers/jupyter-tensorflow-full/cuda.Dockerfile
@@ -1,6 +1,5 @@
-# Use the respective Makefile to pass the appropriate BASE_IMG and build the image correctly
-ARG BASE_IMG=<jupyter-tensorflow-cuda>
-FROM $BASE_IMG
+FROM public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-tensorflow-cuda:master-3dbc352f
+
 # install - requirements.txt
 COPY --chown=jovyan:users requirements.txt /tmp/requirements.txt
 RUN python3 -m pip install -r /tmp/requirements.txt --quiet --no-cache-dir \

diff --git a/components/example-notebook-servers/jupyter-tensorflow/cpu.Dockerfile b/components/example-notebook-servers/jupyter-tensorflow/cpu.Dockerfile
@@ -1,6 +1,4 @@
-# Use the respective Makefile to pass the appropriate BASE_IMG and build the image correctly
-ARG BASE_IMG=<jupyter>
-FROM $BASE_IMG
+FROM public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter:master-ebc0c4f0
 
 # install - requirements.txt
 COPY --chown=jovyan:users cpu-requirements.txt /tmp/requirements.txt

diff --git a/components/example-notebook-servers/jupyter-tensorflow/cuda.Dockerfile b/components/example-notebook-servers/jupyter-tensorflow/cuda.Dockerfile
@@ -1,6 +1,4 @@
-# Use the respective Makefile to pass the appropriate BASE_IMG and build the image correctly
-ARG BASE_IMG=<jupyter>
-FROM $BASE_IMG
+FROM public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter:master-ebc0c4f0
 
 USER root
 

diff --git a/components/example-notebook-servers/jupyter/Dockerfile b/components/example-notebook-servers/jupyter/Dockerfile
@@ -1,6 +1,4 @@
-# Use the respective Makefile to pass the appropriate BASE_IMG and build the image correctly
-ARG BASE_IMG=<base>
-FROM $BASE_IMG
+FROM public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/base:master-1831e436
 
 USER root
 

diff --git a/components/profile-controller/go.sum b/components/profile-controller/go.sum
@@ -344,6 +344,8 @@ github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN
 github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA=
 github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
+github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
+github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI=
@@ -390,6 +392,7 @@ github.com/onsi/ginkgo/v2 v2.0.0 h1:CcuG/HvWNkkaqCUpJifQY8z7qEMBJya6aLPx6ftGyjQ=
 github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
 github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
@@ -672,6 +675,7 @@ golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

diff --git a/py/kubeflow/kubeflow/ci/jwa_tests.py b/py/kubeflow/kubeflow/ci/jwa_tests.py
@@ -39,6 +39,7 @@ def build(self):
         context = "dir://%s/components/crud-web-apps" % self.src_dir
         destination = "jwa-test"
 
+        # check that the image can be build
         kaniko_task = self.create_kaniko_task(task_template, dockerfile,
                                               context, destination,
                                               no_push=True)