CR changes

Author: Avi-Robusta

README.rst

@@ -11,6 +11,6 @@ How to support your specific jdk
 | 'java-toolkit jmap PID_HERE'
 | 'java-toolkit jstack PID_HERE'
 
-| For building you can either use skaffold or gcloud
-| For gcloud run the following command
-| 'gcloud builds submit --config ./cloudbuild.yaml .'
+| For building you can use skaffold
+| For running on Google Cloud we have a faster build with skaffold
+| 'skaffold run -p gcloud-build'

cloudbuild.yaml

@@ -15,10 +15,6 @@ COPY src /app/src
 
 RUN /root/.local/bin/poetry install
 RUN cat additional_bash_commands.sh >> ~/.bashrc
-#COPY jdk_11_9 /app/openjdk3
 COPY --from=openjdk:11.0.14-jdk /usr/local/openjdk-11  /app/openjdk
-#COPY --from=adoptopenjdk/openjdk11-openj9:jdk-11.0.14_9_openj9-0.30.0-alpine /opt/java/openjdk  /app/openjdk2
 
-CMD exec /bin/bash -c "trap : TERM INT; sleep infinity & wait"
-
-#run on jenkens
+CMD exec /bin/bash -c "trap : TERM INT; sleep infinity & wait"

dockerfile

@@ -7,6 +7,6 @@ RUN ["jar", "-cvfm", "HelloWorld.jar", "/java_files/manifest.MF", "/hello_world/
 
 FROM openjdk:11.0.14-jre
 COPY --from=0 /HelloWorld.jar ./
-RUN apt-get update  && apt-get install -y procps inotify-tools
+RUN apt-get update
 ENTRYPOINT ["java", "-jar", "HelloWorld.jar", "1111"]
 

java_test_pod/Dockerfile

@@ -0,0 +1,5 @@
+docker buildx build \
+  --platform linux/amd64 \
+  --tag $IMAGE \
+  --push \
+  $BUILD_CONTEXT

java_test_pod/build_on_apple_m1.sh

@@ -0,0 +1,38 @@
+apiVersion: skaffold/v2beta1
+kind: Config
+metadata:
+  name: java-test-pod
+build:
+  artifacts:
+  - image: gcr.io/genuine-flight-317411/java-toolkit/test_java_pod
+    docker:
+      dockerfile: dockerfile
+  local:
+    push: true
+    concurrency: 0
+deploy:
+  kubectl:
+    manifests:
+    - test_pod_config.yaml
+
+
+profiles:
+- name: apple-m1-dev
+  build:
+    artifacts:
+      - image: gcr.io/genuine-flight-317411/java-toolkit/test_java_pod
+        context: .
+        custom:
+          buildCommand: ./build_on_apple_m1.sh
+    local:
+      push: true
+      concurrency: 0
+- name: gcloud-build
+  build:
+    googleCloudBuild:
+        projectId: genuine-flight-317411
+    artifacts:
+      - image: gcr.io/genuine-flight-317411/java-toolkit/test_java_pod
+        context: .
+        docker:
+          dockerfile: Dockerfile

java_test_pod/skaffold.yaml

@@ -27,3 +27,12 @@ profiles:
     local:
       push: true
       concurrency: 0
+- name: gcloud-build
+  build:
+    googleCloudBuild:
+        projectId: genuine-flight-317411
+    artifacts:
+      - image: us-central1-docker.pkg.dev/genuine-flight-317411/java-toolkit/jtk-11
+        context: .
+        docker:
+          dockerfile: dockerfile

skaffold.yaml

@@ -11,7 +11,6 @@ def run_command(cmd: str, verbose: bool):
         typer.echo(f"output recieved: \n{output.decode()}")
     return output.decode()
 
-def run_cmd_in_proc_namespace(pid, command_to_run, verbose):
-    NSENTER_CMD = "nsenter -t {} -p -m {}"
-    nsenter_cmd_formatted = NSENTER_CMD.format(pid, command_to_run)
-    return run_command(nsenter_cmd_formatted, verbose)
+def run_cmd_in_proc_namespace(pid: int, command_to_run: str, verbose: bool):
+    nsenter_cmd = f"nsenter -t {pid} -a {command_to_run}"
+    return run_command(nsenter_cmd, verbose)

src/java_toolkit/common/utils/remote_ns_cmd.py

@@ -2,31 +2,23 @@
 from os import path
 
 class TmpRemotePodMounter(object):
-    remote_mnt_path =""
-    local_mnt_path =""
-    src_dir =""
-    verbose = False
-    MKDIR_POD_CMD="mkdir -p {}"
-    RMDIR_POD_CMD="rm -R {}"
-    COPY_CMD="cp -R {} {}"
-    ROOT_PROC_NS="/proc/{}/cwd{}"
 
     def __init__(self, pid: str, src_dir: str, local_mnt_path: str, verbose: bool):
         self.verbose = verbose
         self.src_dir = src_dir
         self.local_mnt_path = local_mnt_path
-        self.remote_mnt_path = self.ROOT_PROC_NS.format(pid,local_mnt_path)
+        self.remote_mnt_path = f"/proc/{pid}/cwd{local_mnt_path}"
 
     def __enter__(self):
-        mkdir_cmd = self.MKDIR_POD_CMD.format(self.remote_mnt_path)
+        mkdir_cmd = f"mkdir -p {self.remote_mnt_path}"
         run_command(mkdir_cmd, self.verbose)
-        cp_cmd=self.COPY_CMD.format(self.src_dir, self.remote_mnt_path)
+        cp_cmd= f"cp -R {self.src_dir} {self.remote_mnt_path}"
         run_command(cp_cmd, self.verbose)
         return self
 
     def get_mounted_jdk_dir(self):
-            return path.join(self.local_mnt_path, path.basename(self.src_dir) )
+        return path.join(self.local_mnt_path, path.basename(self.src_dir) )
 
     def __exit__(self, exc_type, exc_val, exc_tb):
-        rm_dir_cmd = self.RMDIR_POD_CMD.format(self.remote_mnt_path)
+        rm_dir_cmd = f"rm -R {self.remote_mnt_path}"
         run_command(rm_dir_cmd, self.verbose)