Merge pull request #679 from cderici/k8s-bundle-series-imagepullbackoff

[JUJU-1155] Avoid incorrectly setting `series: kubernetes` for sidecar charms in k8s bundles

Author: juanmanuel-tirado

examples/deploy_local_big_k8s_bundle.py

@@ -0,0 +1,33 @@
+"""
+This example:
+
+1. Connects to the current model
+2. Deploy a bundle and waits until it reports itself active
+3. Destroys the units and applications
+
+"""
+from juju import jasyncio
+from juju.model import Model
+
+
+async def main():
+    model = Model()
+    print('Connecting to model')
+    # Connect to current model with current user, per Juju CLI
+    await model.connect()
+
+    try:
+        print('Deploying bundle')
+        await model.deploy(
+            './examples/k8s-local-bundle/big-k8s-bundle.yaml',
+            channel='edge',
+            trust=True,
+        )
+    finally:
+        print('Disconnecting from model')
+        await model.disconnect()
+        print("Success")
+
+
+if __name__ == '__main__':
+    jasyncio.run(main())

examples/k8s-local-bundle/big-k8s-bundle.yaml

@@ -0,0 +1,12 @@
+bundle: kubernetes
+name: magma-orc8r
+description: |
+  Orchestrator is a Magma service that provides a simple and consistent way to 
+  configure and monitor the wireless network securely. The metrics acquired through the platform 
+  allows you to see the analytics and traffic flows of the wireless users through the Magma web UI.
+applications:
+  nms-magmalte:
+    charm: magma-nms-magmalte
+    channel: edge
+    scale: 1
+    trust: true

juju/bundle.py

@@ -257,6 +257,7 @@ async def fetch_plan(self, charm_url, origin, overlays=[]):
                     self.overlay_removed_charms.add(charm_name)
 
         self.bundle = await self._validate_bundle(self.bundle)
+
         if is_local:
             self.bundle = await self._handle_local_charms(self.bundle, bundle_dir)
 
@@ -316,6 +317,7 @@ async def _resolve_charms(self):
         deployed = dict()
 
         specs = self.applications_specs
+
         for name in self.applications:
             spec = specs[name]
             app = self.model.applications.get(name, None)
@@ -593,8 +595,7 @@ async def run(self, context):
             raise JujuError("expected origin to be valid for application {} and charm {} with channel {}".format(self.application, str(url), str(channel)))
 
         if self.series is None or self.series == "":
-            self.series = context.bundle.get("bundle",
-                                             context.bundle.get("series", None))
+            self.series = context.bundle.get("series", None)
 
         if Schema.CHARM_STORE.matches(url.schema):
             resources = await context.model._add_store_resources(