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

CSS-4744 - Merge main forward into feature-rebac #984

Merged
merged 51 commits into from
Jul 12, 2023
Merged

CSS-4744 - Merge main forward into feature-rebac #984

merged 51 commits into from
Jul 12, 2023

Commits on Nov 11, 2022

  1. Minor fix for the jimmctl model-status command.

    @alesstimec
    alesstimec committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    543c5bd View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2022

  1. Local dev env (#867)

    @ale8k
    ale8k authored Dec 16, 2022
    Configuration menu
    Copy the full SHA
    263d447 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2023

  1. Merge branch 'main' into cmd-model-status-fix-01

    @alesstimec
    alesstimec authored Jan 16, 2023
    Configuration menu
    Copy the full SHA
    bc3d053 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2023

  1. Merge pull request #862 from alesstimec/cmd-model-status-fix-01 

    Minor fix for the jimmctl model-status command.
    @alesstimec
    alesstimec authored Jan 19, 2023
    Configuration menu
    Copy the full SHA
    0b819ad View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2023

  1. Refactor the add model method.

    @alesstimec
    alesstimec committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    b545d24 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into refactor-jimm-add-model

    @alesstimec
    alesstimec authored Feb 17, 2023
    Configuration menu
    Copy the full SHA
    95a6add View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2023

  1. Merge pull request #903 from alesstimec/refactor-jimm-add-model 

    Refactor the add model method.
    @alesstimec
    alesstimec authored Mar 9, 2023
    Configuration menu
    Copy the full SHA
    714ba39 View commit details
    Browse the repository at this point in the history

  2. Removed push from ci workflow.

    @alesstimec
    alesstimec committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    8888bab View commit details
    Browse the repository at this point in the history

  3. Merge pull request #908 from alesstimec/workflows-ci-remove-push 

    Removed push from ci workflow.
    @alesstimec
    alesstimec authored Mar 9, 2023
    Configuration menu
    Copy the full SHA
    a7e48c6 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2023

  1. check and remove jimm snap during upgrades 

    Upgrades throw a CalledProcessError because `snap install`
returns an error when the snap is already installed.

Fix is to check whether jimm snap is installed and if so, remove it.
    Thomas Cuthbert committed Mar 15, 2023
    Configuration menu
    Copy the full SHA
    df9f601 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #910 from tcuthbert/fix_snap_upgrade 

    check and remove jimm snap during upgrades
    @alesstimec
    alesstimec authored Mar 15, 2023
    Configuration menu
    Copy the full SHA
    32097b1 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2023

  1. Update to Juju 2.9.42 and some compatibility changes.

    @alesstimec
    alesstimec committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    b2111b5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #914 from alesstimec/update-to-juju-2.9.42 

    Update to Juju 2.9.42 and some compatibility changes.
    @alesstimec
    alesstimec authored Mar 21, 2023
    Configuration menu
    Copy the full SHA
    65473ed View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2023

  1. Fix add-controller (#923)

    @ale8k
    ale8k authored Mar 31, 2023
    Configuration menu
    Copy the full SHA
    bccb20b View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2023

  1. Adds Sphinx documentation according to the Diataxis framework.

    @alesstimec
    alesstimec committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    53fb047 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into sphinx-documentation

    @alesstimec
    alesstimec authored Apr 14, 2023
    Configuration menu
    Copy the full SHA
    0e03b29 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #927 from alesstimec/sphinx-documentation 

    CSS-2522 Adds Sphinx documentation according to the Diataxis framework.
    @alesstimec
    alesstimec authored Apr 14, 2023
    Configuration menu
    Copy the full SHA
    445db94 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2023

  1. Tutorial on group and access management. 

    - also adds an explanation section on jaas tags
    @alesstimec
    alesstimec committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    735537b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #929 from alesstimec/docs-group-management 

    CSS-2435 Tutorial on group and access management.
    @alesstimec
    alesstimec authored Apr 19, 2023
    Configuration menu
    Copy the full SHA
    805eee4 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2023

  1. Fix for compose and updated instructions (#943)

    @kian99
    kian99 authored May 17, 2023
    Configuration menu
    Copy the full SHA
    9efc548 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2023

  1. Updated to juju 3.1.4

    @alesstimec
    alesstimec committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    7fc363a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #959 from alesstimec/update-juju-3.1.4 

    Updated to juju 3.1.4
    @alesstimec
    alesstimec authored Jun 20, 2023
    Configuration menu
    Copy the full SHA
    f60f4a5 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. Switches machine charm to data platform libs.

    @alesstimec
    alesstimec committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    4c544b6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #962 from alesstimec/machine-charm-data-platform-l… 

    …ibs-postgres

Switches machine charm to data platform libs.
    @alesstimec
    alesstimec authored Jun 21, 2023
    Configuration menu
    Copy the full SHA
    df43a22 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2023

  1. backport ci/cd and supporting files (#963)

    @kian99
    kian99 authored Jun 22, 2023
    Configuration menu
    Copy the full SHA
    65d37d4 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2023

  1. Css 4587 backport generic fixes (#965) 

    * Added documentation and setup files

* Improve docker compose

* Merged backport ci/cd

* Fix compose for two exposed services

* Added improved setup instructions

* Further improvements

* Eliminated unnecessary sections
    @kian99
    kian99 authored Jun 26, 2023
    Configuration menu
    Copy the full SHA
    5a2af0d View commit details
    Browse the repository at this point in the history

  2. Css 4116/backport crossmodel queries (#964) 

    * Model status parser

* Bring in API definition

* Bring in storage facade calls

* Update jimmtest api

* Add api call

* Add API params

* Facade call

* Initial backport of parser

* Fix relation test

* PR comments

* Refactor according to PR comments

* pr comments
    @ale8k
    ale8k authored Jun 26, 2023
    Configuration menu
    Copy the full SHA
    46c42ea View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. Fix for vault image (#967)

    @kian99
    kian99 authored Jun 27, 2023
    Configuration menu
    Copy the full SHA
    3677f62 View commit details
    Browse the repository at this point in the history

  2. Removed documentation folder (#966) 

    Co-authored-by: Ales Stimec <[email protected]>
    @kian99 @alesstimec
    kian99 and alesstimec authored Jun 27, 2023
    Configuration menu
    Copy the full SHA
    093b9ff View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2023

  1. Backport working workflows from feature-rebac (#975) 

    * Backport working workflows from feature-rebac

* Only only v1 tags on main to trigger release
    @kian99
    kian99 authored Jun 29, 2023
    Configuration menu
    Copy the full SHA
    cec35fe View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2023

  1. Backported workflow fixes from feature-rebac (#980)

    @kian99
    kian99 authored Jun 30, 2023
    Configuration menu
    Copy the full SHA
    ba68eaa View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2023

  1. Backports charm changes from feature-rebac into main.

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

  2. Minor tweaks

    @kian99
    kian99 committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    ffb8099 View commit details
    Browse the repository at this point in the history

  3. Fix for the dashboard relation.

    @alesstimec
    alesstimec committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    027864c View commit details
    Browse the repository at this point in the history

  4. Merge pull request #4 from kian99/ales-backport-2 

    Minor tweaks
    @alesstimec
    alesstimec authored Jul 3, 2023
    Configuration menu
    Copy the full SHA
    ba3065d View commit details
    Browse the repository at this point in the history

  5. Fix for the dashboard relation.

    @alesstimec
    alesstimec committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    a34498c View commit details
    Browse the repository at this point in the history

  6. Merge pull request #982 from alesstimec/backport-charm-changes-from-f… 

    …eature-rebac

CSS-4547 Backports charm changes from feature-rebac into main.
    @alesstimec
    alesstimec authored Jul 3, 2023
    Configuration menu
    Copy the full SHA
    b8373d8 View commit details
    Browse the repository at this point in the history

  7. Merged main and removed conflicts

    @kian99
    kian99 committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    ea0af4f View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2023

  1. Added build tag to include version info in Docker build (#983)

    @kian99
    kian99 authored Jul 4, 2023
    Configuration menu
    Copy the full SHA
    1700cee View commit details
    Browse the repository at this point in the history

  2. k8s charm: Fix for the vault relation. 

    Charm now persists vault data in unit state and ensures the file
is pushed to the workload container on every update.
    @alesstimec
    alesstimec committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    0346934 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #985 from alesstimec/k8s-charm-vault-relation-fix 

    CSS-4705 k8s charm: Fix for the vault relation.
    @alesstimec
    alesstimec authored Jul 4, 2023
    Configuration menu
    Copy the full SHA
    36c3016 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into merge-main-forward

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

  5. Updated pydantic requirement

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

Commits on Jul 5, 2023

  1. Pin pydantic version (#987)

    @kian99
    kian99 authored Jul 5, 2023
    Configuration menu
    Copy the full SHA
    304ff29 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2023

  1. General fixes after QA 

    - fix for the dashboard relation: keys using _ instead of -
- properly rendering config.js for the dashboard
    @alesstimec
    alesstimec committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    afd1613 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #988 from alesstimec/general-fixes-after-qa-01 

    General fixes after QA
    @alesstimec
    alesstimec authored Jul 7, 2023
    Configuration menu
    Copy the full SHA
    73c3379 View commit details
    Browse the repository at this point in the history

  3. JIMM k8s charm fixes (#989) 

    Co-authored-by: Ales Stimec <[email protected]>
    @kian99 @alesstimec
    kian99 and alesstimec authored Jul 7, 2023
    Configuration menu
    Copy the full SHA
    87f6d69 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2023

  1. Fix for dashboard file (#993)

    @kian99
    kian99 authored Jul 10, 2023
    Configuration menu
    Copy the full SHA
    842c07a View commit details
    Browse the repository at this point in the history

  2. Merged main and fixed conflicts

    @kian99
    kian99 committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    0883ba6 View commit details
    Browse the repository at this point in the history

  3. Merged feature-rebac

    @kian99
    kian99 committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    2374232 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2023

  1. Merge branch 'feature-rebac' into merge-main-forward

    @kian99
    kian99 authored Jul 12, 2023
    Configuration menu
    Copy the full SHA
    3395a75 View commit details
    Browse the repository at this point in the history