Merge pull request #2 from omnivector-solutions/support_ubuntu

Support ubuntu

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -0,0 +1,57 @@
+name: Bug Report
+description: File a bug report
+labels: ["Type: Bug", "Status: Triage"]
+body:
+  - type: markdown
+    attributes:
+      value: >
+        Thanks for taking the time to fill out this bug report! Before submitting your issue, please make
+        sure you are using the latest version of the charm. If not, please switch to the latest version of this charm
+        before posting your report to make sure it's not already solved.
+  - type: textarea
+    id: bug-description
+    attributes:
+      label: Bug Description
+      description: >
+        Provide a description of the issue you are facing. If applicable, add screenshots to help explain the problem.
+    validations:
+      required: true
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: To Reproduce
+      description: >
+        Please provide a step-by-step instruction of how to reproduce the behavior.
+      placeholder: |
+        1. `juju deploy ...`
+        2. `juju relate ...`
+        3. `juju status --relations`
+    validations:
+      required: true
+  - type: textarea
+    id: environment
+    attributes:
+      label: Environment
+      description: >
+        We need to know a bit more about the context in which you run the charm.
+        - Are you running Juju locally, on lxd, in multipass or on some other platform?
+        - What track and channel you deployed the charm from (ie. `latest/edge` or similar).
+        - Version of any applicable components, like the juju snap, the model controller, lxd, microk8s, and/or multipass.
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: >
+        Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+        Fetch the logs using `juju debug-log --replay`. Additional details on how to retrieve logs are available in the juju 
+        documentation at https://juju.is/docs/olm/juju-logs.
+      render: shell
+    validations:
+      required: true
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+

.github/ISSUE_TEMPLATE/enhancement_proposal.yaml

@@ -0,0 +1,17 @@
+name: Enhancement Proposal
+description: File an enhancement proposal
+labels: ["Type: Enhancement", "Status: Triage"]
+body:
+  - type: markdown
+    attributes:
+      value: >
+        Thank you for taking the time to fill out this enhancement proposal! Before submitting your proposal, please
+        make sure there isn't a pre-existing similar proposal. If there is, please join that discussion instead.
+  - type: textarea
+    id: enhancement-proposal
+    attributes:
+      label: Enhancement Proposal
+      description: >
+        Describe the enhancement you would like to see in as much detail as needed.
+    validations:
+      required: true

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,23 @@
+## Description
+
+> Provide a description of the purpose of this pull request, as well as its
+motivation and context. Is it a new feature? A bug fix? Does it address an existing issue?
+
+## How was the code tested?
+
+> Describe the conditions under which the code has been tested.
+> * Did you run the defined integration and units under `tests/`?
+> * Did you write new tests? Where are they located in the repository?
+> * Which undercloud did you use to perform the tests? LXD, vSphere, AWS, etc.
+> * What operating system did you test the charms on? Ubuntu 22.04, Ubuntu 20.04, CentOS 7, etc.
+
+## Related issues and/or tasks
+
+> Link any related issues or project board tasks to this pull request.
+
+## Checklist
+
+- [ ] I am the author of these changes, or I have the rights to submit them.
+- [ ] I have added the relevant changes to the README and/or documentation.
+- [ ] I have self reviewed my own code.
+- [ ] All requested changes and/or review comments have been resolved.

.github/workflows/ci.yaml

@@ -0,0 +1,41 @@
+# Copyright 2023 Canonical Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: nvidia charm tests
+on:
+  workflow_call:
+  pull_request:
+
+jobs:
+  inclusive-naming-check:
+    name: Inclusive naming check
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Run tests
+        uses: get-woke/woke-action@v0
+        with:
+          fail-on-error: true
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Install dependencies
+        run: python3 -m pip install tox
+      - name: Run linters
+        run: tox -e lint

.github/workflows/release.yaml

@@ -0,0 +1,44 @@
+# Copyright 2023 Canonical Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: Release to latest/edge
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  ci-tests:
+    uses: ./.github/workflows/ci.yaml
+
+  release-to-charmhub:
+    name: Release to CharmHub
+    needs:
+      - ci-tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Create version file
+        run: git describe --tags --always --dirty > version
+      - name: Select charmhub channel
+        uses: canonical/charming-actions/[email protected]
+        id: channel
+      - name: Upload charm to charmhub
+        uses: canonical/charming-actions/[email protected]
+        with:
+          credentials: "${{ secrets.CHARMCRAFT_AUTH }}"
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+          channel: "${{ steps.channel.outputs.name }}"

charmcraft.yaml

@@ -4,6 +4,12 @@ bases:
       - name: ubuntu
         channel: "22.04"
     run-on:
+      - name: ubuntu
+        channel: "20.04"
+        architectures: [amd64]
+      - name: ubuntu
+        channel: "22.04"
+        architectures: [amd64]
       - name: centos
         channel: "7"
         architectures: [amd64]

config.yaml

@@ -3,4 +3,4 @@ options:
     type: string
     default: "nvidia-driver-latest-dkms"
     description: |
-      Driver package to be installed.
+      Driver package to be installed (centos only).

metadata.yaml

@@ -20,6 +20,8 @@ tags:
     - nvidia
 
 series:
+    - jammy
+    - focal
     - centos7
 
 requires:

src/charm.py

@@ -2,7 +2,12 @@
 """Nvidia Operator Charm."""
 import logging
 
-from nvidia_ops_manager import NvidiaDriverOpsError, NvidiaOpsManager
+from nvidia_ops_manager import (
+    NvidiaDriverOpsError,
+    NvidiaOpsManagerCentos,
+    NvidiaOpsManagerUbuntu,
+    os_release,
+)
 from ops.charm import CharmBase
 from ops.main import main
 from ops.model import ActiveStatus, BlockedStatus, WaitingStatus
@@ -17,9 +22,10 @@ def __init__(self, *args):
         """Initialize the charm."""
         super().__init__(*args)
 
-        driver_package = self.config.get("driver-package")
-
-        self._nvidia_ops_manager = NvidiaOpsManager(driver_package)
+        if os_release()["ID"] == "ubuntu":
+            self._nvidia_ops_manager = NvidiaOpsManagerUbuntu()
+        else:
+            self._nvidia_ops_manager = NvidiaOpsManagerCentos(self.config.get("driver-package"))
 
         event_handler_bindings = {
             self.on.install: self._on_install,