charm-k8s-ingress

Merge ~mthaddon/charm-k8s-ingress/+git/charm-k8s-ingress:rename-to-ingress into charm-k8s-ingress:master

  1. Git
  2. lp:~mthaddon/charm-k8s-ingress/+git/charm-k8s-ingress
  3. rename-to-ingress
  4. Merge into master
Proposed by Tom Haddon
Status: Merged
Approved by: Jon Seager
Approved revision: be00615ba20d883e0f8354680d1b6b31dc0a1a92
Merged at revision: fcd61e6b17062f3e16d119299ccef2801103f6af
Proposed branch: ~mthaddon/charm-k8s-ingress/+git/charm-k8s-ingress:rename-to-ingress
Merge into: charm-k8s-ingress:master
Diff against target: 120 lines (+19/-19)
3 files modified
Makefile (+2/-2)
README.md (+16/-16)
metadata.yaml (+1/-1)
Reviewer Review Type Date Requested Status
🤖 prod-jenkaas-is (community) continuous-integration Approve
ingress-charmers Pending
Review via email: mp+400238@code.launchpad.net

Commit message

Rename charm from k8s-ingress to ingress for simplification

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
🤖 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
🤖 prod-jenkaas-is (prod-jenkaas-is) wrote :

PASSED: Continuous integration, rev:be00615ba20d883e0f8354680d1b6b31dc0a1a92
https://jenkins.canonical.com/is/job/lp-charm-k8s-ingress-ci/9/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/is/job/lp-charm-test/39/
    None: https://jenkins.canonical.com/is/job/lp-update-mp/51172/

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

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

Change successfully merged at revision fcd61e6b17062f3e16d119299ccef2801103f6af

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index 2d7e3ee..c371fc0 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -8,7 +8,7 @@ lint: blacken
6
7 # We actually use the build directory created by charmcraft,
8 # but the .charm file makes a much more convenient sentinel.
9-unittest: k8s-ingress.charm
10+unittest: ingress.charm
11 @tox -e unit
12
13 test: lint unittest
14@@ -17,7 +17,7 @@ clean:
15 @echo "Cleaning files"
16 @git clean -fXd
17
18-k8s-ingress.charm: src/*.py requirements.txt
19+ingress.charm: src/*.py requirements.txt
20 charmcraft build
21
22 .PHONY: lint test unittest clean
23diff --git a/README.md b/README.md
24index 7458fdc..4dcbc5c 100644
25--- a/README.md
26+++ b/README.md
27@@ -29,24 +29,24 @@ juju add-model ingress-test
28 ```
29 Now from the directory where you've run `charmcraft build` as above:
30 ```
31-juju deploy ./k8s-ingress.charm --resource placeholder-image='google/pause'
32+juju deploy ./ingress.charm --resource placeholder-image='google/pause'
33 ```
34 This is currently failing with the following error in `juju debug-log`.
35 ```
36-unit-k8s-ingress-0: 05:12:02 INFO juju.worker.uniter awaiting error resolution for "config-changed" hook
37-unit-k8s-ingress-0: 05:12:03 ERROR unit.k8s-ingress/0.juju-log Uncaught exception while in charm code:
38+unit-ingress-0: 05:12:02 INFO juju.worker.uniter awaiting error resolution for "config-changed" hook
39+unit-ingress-0: 05:12:03 ERROR unit.ingress/0.juju-log Uncaught exception while in charm code:
40 Traceback (most recent call last):
41 File "./src/charm.py", line 80, in <module>
42 main(CharmK8SIngressCharm)
43- File "/var/lib/juju/agents/unit-k8s-ingress-0/charm/venv/ops/main.py", line 402, in main
44+ File "/var/lib/juju/agents/unit-ingress-0/charm/venv/ops/main.py", line 402, in main
45 _emit_charm_event(charm, dispatcher.event_name)
46- File "/var/lib/juju/agents/unit-k8s-ingress-0/charm/venv/ops/main.py", line 140, in _emit_charm_event
47+ File "/var/lib/juju/agents/unit-ingress-0/charm/venv/ops/main.py", line 140, in _emit_charm_event
48 event_to_emit.emit(*args, **kwargs)
49- File "/var/lib/juju/agents/unit-k8s-ingress-0/charm/venv/ops/framework.py", line 278, in emit
50+ File "/var/lib/juju/agents/unit-ingress-0/charm/venv/ops/framework.py", line 278, in emit
51 framework._emit(event)
52- File "/var/lib/juju/agents/unit-k8s-ingress-0/charm/venv/ops/framework.py", line 722, in _emit
53+ File "/var/lib/juju/agents/unit-ingress-0/charm/venv/ops/framework.py", line 722, in _emit
54 self._reemit(event_path)
55- File "/var/lib/juju/agents/unit-k8s-ingress-0/charm/venv/ops/framework.py", line 767, in _reemit
56+ File "/var/lib/juju/agents/unit-ingress-0/charm/venv/ops/framework.py", line 767, in _reemit
57 custom_handler(event)
58 File "./src/charm.py", line 75, in _on_config_changed
59 self._get_pods()
60@@ -54,14 +54,14 @@ Traceback (most recent call last):
61 self.k8s_auth()
62 File "./src/charm.py", line 59, in k8s_auth
63 kubernetes.config.load_incluster_config()
64- File "/var/lib/juju/agents/unit-k8s-ingress-0/charm/venv/kubernetes/config/incluster_config.py", line 118, in load_incluster_config
65+ File "/var/lib/juju/agents/unit-ingress-0/charm/venv/kubernetes/config/incluster_config.py", line 118, in load_incluster_config
66 InClusterConfigLoader(
67- File "/var/lib/juju/agents/unit-k8s-ingress-0/charm/venv/kubernetes/config/incluster_config.py", line 54, in load_and_set
68+ File "/var/lib/juju/agents/unit-ingress-0/charm/venv/kubernetes/config/incluster_config.py", line 54, in load_and_set
69 self._load_config()
70- File "/var/lib/juju/agents/unit-k8s-ingress-0/charm/venv/kubernetes/config/incluster_config.py", line 73, in _load_config
71+ File "/var/lib/juju/agents/unit-ingress-0/charm/venv/kubernetes/config/incluster_config.py", line 73, in _load_config
72 raise ConfigException("Service token file does not exists.")
73 kubernetes.config.config_exception.ConfigException: Service token file does not exists.
74-unit-k8s-ingress-0: 05:12:03 ERROR juju.worker.uniter.operation hook "config-changed" (via hook dispatching script: dispatch) failed: exit status 1
75+unit-ingress-0: 05:12:03 ERROR juju.worker.uniter.operation hook "config-changed" (via hook dispatching script: dispatch) failed: exit status 1
76 ```
77 Per https://github.com/kubernetes-client/python/issues/1331 the file it's looking for is
78 /var/run/secrets/kubernetes.io/serviceaccount/token, but this file isn't present in the
79@@ -73,12 +73,12 @@ To work around this, we've added a `kube-config` config option. This should be t
80 kubernetes client configuration. If you're using microk8s you can get this via `microk8s config`,
81 and you'd then deploy the charm as follows:
82 ```
83-juju deploy ./k8s-ingress.charm --resource placeholder-image='google/pause' --config kube-config="$(microk8s config)"
84+juju deploy ./ingress.charm --resource placeholder-image='google/pause' --config kube-config="$(microk8s config)"
85 ```
86 We've also added some initial config options to configure the ingress. As an
87 example:
88 ```
89-juju config k8s-ingress service-namespace=ingress-test service-name=gunicorn service-port=80 service-hostname=foo.internal
90+juju config ingress service-namespace=ingress-test service-name=gunicorn service-port=80 service-hostname=foo.internal
91 ```
92 This will give you something like this (deployed alongside the non-sidecar
93 version of the charm for comparison):
94@@ -94,12 +94,12 @@ ingress-test microk8s-localhost microk8s/localhost 2.9-rc7 unsupported 18:1
95 App Version Status Scale Charm Store Channel Rev OS Address Message
96 gunicorn active 1 gunicorn local 3 ubuntu
97 gunicorn-old gunicorn-app:edge active 1 gunicorn local 1 kubernetes 10.152.183.69
98-k8s-ingress active 1 k8s-ingress local 3 ubuntu
99+ingress active 1 ingress local 3 ubuntu
100
101 Unit Workload Agent Address Ports Message
102 gunicorn-old/1* active idle 10.1.234.25 80/TCP
103 gunicorn/0* active idle 10.1.234.21
104-k8s-ingress/0* active idle 10.1.234.28
105+ingress/0* active idle 10.1.234.28
106
107 mthaddon@tenaya:~/repos/charm-k8s-ingress/charm-k8s-ingress$ microk8s.kubectl describe ingress -n ingress-test gunicorn-ingress
108 Name: gunicorn-ingress
109diff --git a/metadata.yaml b/metadata.yaml
110index bf3d62e..100436a 100644
111--- a/metadata.yaml
112+++ b/metadata.yaml
113@@ -1,6 +1,6 @@
114 # Copyright 2021 Tom Haddon
115 # See LICENSE file for licensing details.
116-name: k8s-ingress
117+name: ingress
118 description: |
119 An operator to configure a kubernetes ingress.
120 summary: |

Subscribers

People subscribed via source and target branches

to all changes: