Skip to content

Commit c39f47b

Browse files
committed
Avoid setting series to kubernetes for sidecar charms in k8s bundles
Fixes #677
1 parent f3e6ab2 commit c39f47b

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

juju/bundle.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ async def fetch_plan(self, charm_url, origin, overlays=[]):
257257
self.overlay_removed_charms.add(charm_name)
258258

259259
self.bundle = await self._validate_bundle(self.bundle)
260+
260261
if is_local:
261262
self.bundle = await self._handle_local_charms(self.bundle, bundle_dir)
262263

@@ -316,6 +317,7 @@ async def _resolve_charms(self):
316317
deployed = dict()
317318

318319
specs = self.applications_specs
320+
319321
for name in self.applications:
320322
spec = specs[name]
321323
app = self.model.applications.get(name, None)
@@ -593,8 +595,7 @@ async def run(self, context):
593595
raise JujuError("expected origin to be valid for application {} and charm {} with channel {}".format(self.application, str(url), str(channel)))
594596

595597
if self.series is None or self.series == "":
596-
self.series = context.bundle.get("bundle",
597-
context.bundle.get("series", None))
598+
self.series = context.bundle.get("series", None)
598599

599600
if Schema.CHARM_STORE.matches(url.schema):
600601
resources = await context.model._add_store_resources(

0 commit comments

Comments
 (0)