Merge ~moon127/charm-k8s-discourse/+git/charm-k8s-discourse:lib-resource-fixes into charm-k8s-discourse:master

Proposed by Gareth Woolridge
Status: Merged
Approved by: Jay Kuri
Approved revision: 3bf539514f1db577e366f086d4fef18fa2eb6793
Merged at revision: 9665a8144fabfab74ba5cb8eb7ae8c3f5e1394b0
Proposed branch: ~moon127/charm-k8s-discourse/+git/charm-k8s-discourse:lib-resource-fixes
Merge into: charm-k8s-discourse:master
Diff against target: 28 lines (+5/-1)
3 files modified
dev/null (+0/-1)
lib/oci_image.py (+1/-0)
metadata.yaml (+4/-0)
Reviewer Review Type Date Requested Status
Canonical IS Reviewers Pending
Discourse Charm Maintainers Pending
Review via email: mp+383139@code.launchpad.net

Commit message

Fix oci-image lib link, add resource to metadata.yaml

To post a comment you must log in.
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

Change successfully merged at revision 9665a8144fabfab74ba5cb8eb7ae8c3f5e1394b0

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/oci_image.py b/lib/oci_image.py
2new file mode 120000
3index 0000000..2ff7f3f
4--- /dev/null
5+++ b/lib/oci_image.py
6@@ -0,0 +1 @@
7+../mod/resource-oci-image/oci_image.py
8\ No newline at end of file
9diff --git a/lib/resource-oci-image b/lib/resource-oci-image
10deleted file mode 120000
11index c54f0b8..0000000
12--- a/lib/resource-oci-image
13+++ /dev/null
14@@ -1 +0,0 @@
15-../mod/resource-oci-image/
16\ No newline at end of file
17diff --git a/metadata.yaml b/metadata.yaml
18index 1d7c86f..524d143 100644
19--- a/metadata.yaml
20+++ b/metadata.yaml
21@@ -12,3 +12,7 @@ series:
22 provide:
23 website:
24 interface: http
25+resources:
26+ discourse_image:
27+ type: oci-image
28+ description: Image used for discourse pod.

Subscribers

People subscribed via source and target branches