Merge pull request #61273 from juju-solutions/bug/actions-charm-env

Automatic merge from submit-queue (batch tested with PRs 60980, 61273, 60811, 61021, 61367). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Use charm env in actions to get have charmhelpers available **What this PR does / why we need it**: Due to changes in the base layer the actions in the Juju charms do not have access to charmhelpers in the default environment. This PR fixes this issue. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #61273 from juju-solutions/bug/actions-charm-env
5d2e4e2d · Kubernetes Submit Queue · GitHub · d383ca10 · d6c62198 · 5d2e4e2d
Unverified Commit 5d2e4e2d authored Mar 22, 2018 by Kubernetes Submit Queue Committed by GitHub Mar 22, 2018
4 changed files
--- a/cluster/juju/layers/kubernetes-master/actions/create-rbd-pv
+++ b/cluster/juju/layers/kubernetes-master/actions/create-rbd-pv
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
 # Copyright 2015 The Kubernetes Authors.
 #

--- a/cluster/juju/layers/kubernetes-master/actions/namespace-create
+++ b/cluster/juju/layers/kubernetes-master/actions/namespace-create
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
 import os
 from yaml import safe_load as load
 from charmhelpers.core.hookenv import (

--- a/cluster/juju/layers/kubernetes-worker/actions/microbot
+++ b/cluster/juju/layers/kubernetes-worker/actions/microbot
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
 # Copyright 2015 The Kubernetes Authors.
 #

--- a/cluster/juju/layers/kubernetes-worker/actions/registry
+++ b/cluster/juju/layers/kubernetes-worker/actions/registry
-#!/usr/bin/python3
+#!/usr/local/sbin/charm-env python3
 #
 # For a usage examples, see README.md
 #