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

Cadc 12356 Add support for desktop-app to Skaha API #464

Merged
merged 57 commits into from
Jul 21, 2023
Merged

Cadc 12356 Add support for desktop-app to Skaha API #464

merged 57 commits into from
Jul 21, 2023

Commits on May 1, 2023

  1. CADC-12356 Updated desktop-app creation to accept cores and ram and r… 

    …eturn desktop-app ID.
    @yeunga
    yeunga committed May 1, 2023
    Configuration menu
    Copy the full SHA
    70062c7 View commit details
    Browse the repository at this point in the history

  2. CADC-12356 Implemented skaha API for desktop-app. Updated unit tests.

    @yeunga
    yeunga committed May 1, 2023
    Configuration menu
    Copy the full SHA
    61f0d18 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2023

  1. CADC-12356 Added Skaha API DELETE /session/{session}/app/{appID}

    @yeunga
    yeunga committed May 3, 2023
    Configuration menu
    Copy the full SHA
    4ba3f7b View commit details
    Browse the repository at this point in the history

  2. CADC-12356 Updated swagger doc.

    @yeunga
    yeunga committed May 3, 2023
    Configuration menu
    Copy the full SHA
    8193bb7 View commit details
    Browse the repository at this point in the history

  3. CADC-12356 Updated swagger doc.

    @yeunga
    yeunga committed May 3, 2023
    Configuration menu
    Copy the full SHA
    480fcb6 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2023

  1. CADC-12356 Renamed LifeCycleTest and updated GetAction and PostAction… 

    … based on Brian's review comments.
    @yeunga
    yeunga committed May 5, 2023
    Configuration menu
    Copy the full SHA
    a6c8729 View commit details
    Browse the repository at this point in the history

  2. CADC-12356 Updated SessionLifecycleTest.

    @yeunga
    yeunga committed May 5, 2023
    Configuration menu
    Copy the full SHA
    be8f632 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2023

  1. CADC-12356 Incremented skaha version and added desktop-app integratio… 

    …n tests.
    @yeunga
    yeunga committed May 7, 2023
    Configuration menu
    Copy the full SHA
    f556818 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2023

  1. CADC-12356 Corrected comment.

    @yeunga
    yeunga committed May 10, 2023
    Configuration menu
    Copy the full SHA
    71dabe1 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2023

  1. CADC-12356 Updated build-menu.sh to start an xterm when launching a d… 

    …esktop-app. This change has not been tested on keel-dev yet. Currently keel-dev is down.
    @yeunga
    yeunga committed May 15, 2023
    Configuration menu
    Copy the full SHA
    5473f43 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2023

  1. CADC-12356 Updated start-software-sh.template to check user input aga… 

    …inst allowed optional values.
    @yeunga
    yeunga committed May 16, 2023
    Configuration menu
    Copy the full SHA
    64ca715 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2023

  1. CADC-12356 Updated start-software-sh.template to hang on to the xterm… 

    … when there is an error launching a desktop-app.
    @yeunga
    yeunga committed May 17, 2023
    Configuration menu
    Copy the full SHA
    be16694 View commit details
    Browse the repository at this point in the history

  2. CADC-12356 Added k8s-resources.properties to shaka-desktop to be used… 

    … by start-software-template.
    @yeunga
    yeunga committed May 17, 2023
    Configuration menu
    Copy the full SHA
    2ed398a View commit details
    Browse the repository at this point in the history

Commits on May 29, 2023

  1. CADC-12356 Added app ID to launch-desktop-app.

    @yeunga
    yeunga committed May 29, 2023
    Configuration menu
    Copy the full SHA
    6c349ed View commit details
    Browse the repository at this point in the history

  2. CADC-12356 Incremented skaha-tomcat deployment version to 0.9.23. Thi… 

    …s assumes that CADC-12493 will be released first.
    @yeunga
    yeunga committed May 29, 2023
    Configuration menu
    Copy the full SHA
    9a0c0ae View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2023

  1. CADC-12356 Updated skaha version and skaha-desktop version. Added mis… 

    …sing config parameters in catalina.properties.
    @yeunga
    yeunga committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    6984ad8 View commit details
    Browse the repository at this point in the history

  2. CADC-12356 Fixed templates and kustomization.

    @yeunga
    yeunga committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    9f28dde View commit details
    Browse the repository at this point in the history

  3. CADC-12356 Fixed software-sh.template

    @yeunga
    yeunga committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    22f3106 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2023

  1. CADC-12356 Fixed placement issue of sleep-forever.sh.

    @yeunga
    yeunga committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    dcadab7 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2023

  1. CADC-12356 Added /config in desktop for k8s-resources.properties.

    Alinga Yeung committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    2d0fb38 View commit details
    Browse the repository at this point in the history

  2. CADC-12356 Added /config to desktop in keel-prod.

    @yeunga
    yeunga committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    0c3d0ef View commit details
    Browse the repository at this point in the history

  3. CADC-12356 Fixed default core and ram values in start-software-sh.tem… 

    …plate.
    @yeunga
    yeunga committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    139657e View commit details
    Browse the repository at this point in the history

  4. CADC-12356 Updated start-software-sh.template to check the status of … 

    …a desktop app.
    @yeunga
    yeunga committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    bfa3c75 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2023

  1. CADC-12356 Updated check status logic in start-software-sh.template.

    Alinga Yeung committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    0291b1a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into cadc-12356

    @yeunga
    yeunga authored Jun 8, 2023
    Configuration menu
    Copy the full SHA
    57d244e View commit details
    Browse the repository at this point in the history

  3. CADC-12356 Resolved merge conflicts.

    @yeunga
    yeunga committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    1ac3d42 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2023

  1. CADC-12356 xterm was not available on skaha-desktop. Added installati… 

    …on of xterm to skaha-desktop Docker file.
    @yeunga
    yeunga committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    e13789e View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2023

  1. CADC-12356 Resolved conflicts when merging codes from master branch.

    @yeunga
    yeunga committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    0263aad View commit details
    Browse the repository at this point in the history

  2. CADC-12356 Changed start-software-sh.template to use system cURL as s… 

    …uggested by Dustin.
    @yeunga
    yeunga committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    c992bde View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. CADC-12356 Changed skaha-tomcat to version 0.12.0.

    @yeunga
    yeunga committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    9ae8067 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2023

  1. CADC-12356 Reworked based on review comments. Fixed an integration te… 

    …st issue resulted from removing image.canfar.net as a harbor host in dev.
    @yeunga
    yeunga committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    6db5d89 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2023

  1. CADC-12356 Fixed skaha integration tests.

    @yeunga
    yeunga committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    ae6fd1d View commit details
    Browse the repository at this point in the history

  2. CADC-12356 Updated xfce-applications.menu to stop Applications->Syste… 

    …m->XTerm from being displayed. However an xterm/console was still instantiated when skaha-desktop was launched.
    @yeunga
    yeunga committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    b482114 View commit details
    Browse the repository at this point in the history

  3. CADC-12356 Updated /config/k8s-resources.properties to /desktop-confi… 

    …g/k8s-resources.properties.
    @yeunga
    yeunga committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    c123ffc View commit details
    Browse the repository at this point in the history

  4. CADC-12356 Removed XTerm menu item from Applications->Other.

    @yeunga
    yeunga committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    1d3a077 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. CADC-12356 Updated skaha-desktop Dockerfile and software-sh.template … 

    …to use gnome-terminal instread of xterm to avoid an xterm being launched on skaha-desktop startup. Now there is a added menu item (Applications->System->Terminal) that needs to be removed.
    @yeunga
    yeunga committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    7b63de6 View commit details
    Browse the repository at this point in the history

  2. CADC-12356 minor update.

    @yeunga
    yeunga committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    51d6f38 View commit details
    Browse the repository at this point in the history

  3. CADC-12356 Added code to hide the Terminal from Applications->System … 

    …and Applications-<Other.
    @yeunga
    yeunga committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    dd16966 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. CADC-12356 Removed desktop-config and use curl command to get the k8s… 

    …-resources.properties.
    @yeunga
    yeunga committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    9e15882 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2023

  1. CADC-12356 Cleaned up start-software-sh.template. Updated skaha-deskt… 

    …op Dockerfile. jq needs to be installed after epel-release has been installed.
    @yeunga
    yeunga committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    b793f48 View commit details
    Browse the repository at this point in the history

  2. CADC-12356 Cleaned up catalina.properties files in skaha/config.

    @yeunga
    yeunga committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    4844bc3 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2023

  1. CADC-12356 Updated check_status() in start-software-sh.template to pr… 

    …ovide error info.
    @yeunga
    yeunga committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    7ce9028 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2023

  1. CADC-12356 Changed user interaction in start-software-sh.template.

    @yeunga
    yeunga committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    751fe8a View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2023

  1. CADC-12356 Updated error handling in start-software-sh.template.

    @yeunga
    yeunga committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    8a1c90d View commit details
    Browse the repository at this point in the history

  2. CADC-12356 Removed timer on user input prompt in start-software-sh.te… 

    …mplate.
    @yeunga
    yeunga committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    574e90d View commit details
    Browse the repository at this point in the history

  3. CADC-12356 Updated launch scripts and resource context.

    @yeunga
    yeunga committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    f5502be View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. CADC-12356 Resolved merge conflicts.

    @yeunga
    yeunga committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    c758be4 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2023

  1. CADC-12356 Updated user prompts in start-software-sh.template.

    @yeunga
    yeunga committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    58e58ca View commit details
    Browse the repository at this point in the history

  2. CADC-12356 Fixed syntax errors in start-software-sh.template.

    @yeunga
    yeunga committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    7cd5a43 View commit details
    Browse the repository at this point in the history

  3. CADC-12356 Fixed title in software-sh.template.

    @yeunga
    yeunga committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    982173f View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2023

  1. CADC-12356 Changed the way we handle desktop app launch failures.

    @yeunga
    yeunga committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    9fb307e View commit details
    Browse the repository at this point in the history

  2. CADC-12356 Added more log messages.

    @yeunga
    yeunga committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    7011614 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2023

  1. CADC-12356 Updated desktop app launcher to retry indefinitely on erro… 

    …rs until a status is returned. Also check status while status is 'Pending'.
    @yeunga
    yeunga committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    6d29b3d View commit details
    Browse the repository at this point in the history

  2. CADC-12356 Removed unnecessary statements from desktop app launcher s… 

    …cript.
    @yeunga
    yeunga committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    bcd7106 View commit details
    Browse the repository at this point in the history

  3. cadc-12356 Minor update to desktop app launcher.

    @yeunga
    yeunga committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    0318cd7 View commit details
    Browse the repository at this point in the history

  4. CADC-12356 Added a 1 sec delay to allow time for a user to read the s… 

    …uccessful message.
    @yeunga
    yeunga committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    0c7161a View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2023

  1. CADC-12356 Resolved merge conflicts.

    @yeunga
    yeunga committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    85744a2 View commit details
    Browse the repository at this point in the history