Merge ~mthaddon/charm-k8s-ingress/+git/charm-k8s-ingress:no-containersa into charm-k8s-ingress:master

Proposed by Tom Haddon
Status: Merged
Approved by: Jon Seager
Approved revision: cedd64c777513d412f5c7789ec22920c023b440c
Merged at revision: 934614fe40a4c5b40772f9f91ca4fab0d95d4cd1
Proposed branch: ~mthaddon/charm-k8s-ingress/+git/charm-k8s-ingress:no-containersa
Merge into: charm-k8s-ingress:master
Diff against target: 40 lines (+1/-11)
3 files modified
README.md (+1/-1)
dev/null (+0/-1)
metadata.yaml (+0/-9)
Reviewer Review Type Date Requested Status
🤖 prod-jenkaas-is (community) continuous-integration Approve
ingress-charmers Pending
Review via email: mp+401204@code.launchpad.net

Commit message

Remove unnecessary containers. Will show spurious errors in debug-log until lp#1924280 is fixed

To post a comment you must log in.
Revision history for this message
🤖 prod-jenkaas-is (prod-jenkaas-is) wrote :

A CI job is currently in progress. A follow up comment will be added when it completes.

Revision history for this message
🤖 prod-jenkaas-is (prod-jenkaas-is) wrote :

FAILED: Continuous integration, rev:fed317e24d35272b71aa48dc711666136d71cbaa

No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want jenkins to rebuild you need to trigger it yourself):
https://code.launchpad.net/~mthaddon/charm-k8s-ingress/+git/charm-k8s-ingress/+merge/401204/+edit-commit-message

https://jenkins.canonical.com/is/job/lp-charm-k8s-ingress-ci/36/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/is/job/lp-charm-test/75/
    None: https://jenkins.canonical.com/is/job/lp-update-mp/91737/

Click here to trigger a rebuild:
https://jenkins.canonical.com/is/job/lp-charm-k8s-ingress-ci/36//rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

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

Revision history for this message
Tom Haddon (mthaddon) wrote :

CI seems to be failing due to https://github.com/canonical/charmcraft/issues/287 - will follow up on this.

Revision history for this message
🤖 prod-jenkaas-is (prod-jenkaas-is) wrote :

A CI job is currently in progress. A follow up comment will be added when it completes.

Revision history for this message
🤖 prod-jenkaas-is (prod-jenkaas-is) wrote :

PASSED: Continuous integration, rev:cedd64c777513d412f5c7789ec22920c023b440c
https://jenkins.canonical.com/is/job/lp-charm-k8s-ingress-ci/38/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/is/job/lp-charm-test/77/
    None: https://jenkins.canonical.com/is/job/lp-update-mp/91858/

Click here to trigger a rebuild:
https://jenkins.canonical.com/is/job/lp-charm-k8s-ingress-ci/38//rebuild

review: Approve (continuous-integration)
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 934614fe40a4c5b40772f9f91ca4fab0d95d4cd1

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/README.md b/README.md
2index dd63bdf..e850ea9 100644
3--- a/README.md
4+++ b/README.md
5@@ -29,7 +29,7 @@ which should be set to the contents of your kubernetes client configuration.
6 If you're using microk8s you can get this via `microk8s config`. As an example
7 you could deploy this charm as follows:
8 ```
9-juju deploy ./nginx-ingress-integrator.charm ingress --resource placeholder-image='google/pause' --config kube-config="$(microk8s config)"
10+juju deploy ./nginx-ingress-integrator.charm ingress --config kube-config="$(microk8s config)"
11 ```
12 To create an ingress for your service, you'd then add a relation to a charm
13 that supports the `ingress` relation. As an example:
14diff --git a/manifest.yaml b/manifest.yaml
15deleted file mode 100644
16index 0967ef4..0000000
17--- a/manifest.yaml
18+++ /dev/null
19@@ -1 +0,0 @@
20-{}
21diff --git a/metadata.yaml b/metadata.yaml
22index c29373d..09af63e 100644
23--- a/metadata.yaml
24+++ b/metadata.yaml
25@@ -9,15 +9,6 @@ bases:
26 - name: ubuntu
27 channel: 20.04/stable
28
29-containers:
30- placeholder:
31- resource: placeholder-image
32-
33-resources:
34- placeholder-image:
35- type: oci-image
36- description: A placeholder image, operator code won't do anything with it.
37-
38 provides:
39 ingress:
40 interface: ingress

Subscribers

People subscribed via source and target branches

to all changes: