Skip to content

Commit

Permalink
Merge branch 'main' into TLSENG-46
Browse files Browse the repository at this point in the history
  • Loading branch information
saltiyazan committed Sep 19, 2024
2 parents 2054808 + fc3ee4b commit 175517d
Show file tree
Hide file tree
Showing 14 changed files with 3,129 additions and 889 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ jobs:
arch:
- arch: amd64
runner: ubuntu-22.04
- arch: arm64
runner: [self-hosted, linux, ARM64, medium, jammy]
runs-on: ${{ matrix.arch.runner }}
steps:
- uses: actions/checkout@v4
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/publish-charm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ jobs:
arch:
- arch: amd64
runner: ubuntu-22.04
- arch: arm64
runner: [self-hosted, linux, ARM64, medium, jammy]

runs-on: ${{ matrix.arch.runner }}
steps:
- name: Checkout
Expand All @@ -33,7 +32,7 @@ jobs:
run: echo "charm_path=$(find . -name '*.charm' -type f -print)" >> $GITHUB_OUTPUT

- name: Upload charm to Charmhub
uses: canonical/charming-actions/[email protected].2
uses: canonical/charming-actions/[email protected].3
with:
built-charm-path: ${{ steps.charm-path.outputs.charm_path }}
credentials: "${{ secrets.CHARMCRAFT_AUTH }}"
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ charmcraft pack
Deploy it by using:

```shell
juju deploy ./gocert-k8s_ubuntu-22.04-amd64.charm --resource gocert-image=ghcr.io/canonical/gocert
juju deploy ./notary-k8s_ubuntu-22.04-amd64.charm --resource notary-image=ghcr.io/canonical/notary
```
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
# gocert-k8s-operator
# notary-k8s-operator
Manage your certificates in charms

## OCI Images

- GoCert: [ghcr.io/canonical/gocert](https://github.com/canonical/gocert)
- Notary: [ghcr.io/canonical/notary](https://github.com/canonical/notary)

# gocert
# notary

Charmhub package name: gocert
More information: https://charmhub.io/gocert
Charmhub package name: notary
More information: https://charmhub.io/notary

GoCert helps you manage your certificates, from simple all the way up to enterprise deployments.
Notary helps you manage your certificates, from simple all the way up to enterprise deployments.

## Other resources

- [Read more](https://github.com/canonical/gocert/blob/main/README.md)
- [Read more](https://github.com/canonical/notary/blob/main/README.md)

- [Contributing](CONTRIBUTING.md)

Expand Down
39 changes: 17 additions & 22 deletions charmcraft.yaml
Original file line number Diff line number Diff line change
@@ -1,23 +1,26 @@

name: gocert-k8s
name: notary-k8s
type: charm
title: GoCert
title: Notary
summary: Certificate management made easy

description: |
GoCert helps you manage certificate requests and their associated certificates.
Charmed GoCert helps you automatically receive CSRs and distribute certificates to the applications
Notary helps you manage certificate requests and their associated certificates.
Charmed Notary helps you automatically receive CSRs and distribute certificates to the applications
you've deployed in your model.
links:
documentation: https://discourse.charmhub.io/t/gocert-docs-index/15216
issues:
- https://github.com/canonical/gocert-k8s-operator/issues
- https://github.com/canonical/notary-k8s-operator/issues
source:
- https://github.com/canonical/gocert-k8s-operator
- https://github.com/canonical/notary-k8s-operator
website:
- https://charmhub.io/gocert-k8s
- https://charmhub.io/notary-k8s

base: [email protected]
platforms:
amd64:

provides:
certificates:
Expand All @@ -34,22 +37,14 @@ requires:
interface: ingress
limit: 1

bases:
- build-on:
- name: ubuntu
channel: "22.04"
run-on:
- name: ubuntu
channel: "22.04"

containers:
gocert:
resource: gocert-image
notary:
resource: notary-image
mounts:
- storage: config
location: /etc/gocert/config
location: /etc/notary/config
- storage: database
location: /var/lib/gocert/database
location: /var/lib/notary/database

storage:
config:
Expand All @@ -60,10 +55,10 @@ storage:
minimum-size: 1G

resources:
gocert-image:
notary-image:
type: oci-image
description: OCI image for the 'GoCert' application
upstream-source: ghcr.io/canonical/gocert:0.0.3
description: OCI image for the Notary application
upstream-source: ghcr.io/canonical/notary:0.0.3

parts:
charm:
Expand Down
37 changes: 30 additions & 7 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,38 +6,61 @@
#
annotated-types==0.7.0
# via pydantic
anyio==4.4.0
# via httpx
certifi==2024.7.4
# via requests
# via
# httpcore
# httpx
# requests
cffi==1.17.0
# via cryptography
charset-normalizer==3.3.2
# via requests
cosl==0.0.23
cosl==0.0.33
# via -r requirements.in
cryptography==43.0.0
cryptography==43.0.1
# via -r requirements.in
h11==0.14.0
# via httpcore
httpcore==1.0.5
# via httpx
httpx==0.27.2
# via lightkube
idna==3.7
# via requests
ops==2.15.0
# via
# anyio
# httpx
# requests
lightkube==0.15.4
# via cosl
lightkube-models==1.30.0.8
# via lightkube
ops==2.16.1
# via
# -r requirements.in
# cosl
pycparser==2.22
# via cffi
pydantic==2.8.2
pydantic==2.9.1
# via
# -r requirements.in
# cosl
pydantic-core==2.20.1
pydantic-core==2.23.3
# via pydantic
pyyaml==6.0.2
# via
# cosl
# lightkube
# ops
requests==2.32.3
# via -r requirements.in
rpds-py==0.18.0
# via -r requirements.in
sniffio==1.3.1
# via
# anyio
# httpx
tenacity==9.0.0
# via cosl
typing-extensions==4.12.2
Expand Down
Loading

0 comments on commit 175517d

Please sign in to comment.