wordpress-charmers team mailing list archive

[Stuart Bishop <stuart.bishop@xxxxxxxxxxxxx>]

Review: Approve

This looks good. One comment inline for some minor code shuffling. Try not to include black code reformats together with other reviews.

Diff comments:

> diff --git a/reactive/wordpress.py b/reactive/wordpress.py
> index 39ea6dc..e47f971 100644
> --- a/reactive/wordpress.py
> +++ b/reactive/wordpress.py
> @@ -108,12 +108,24 @@ def make_pod_spec():
>      # PodSpec v1? https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.13/#podspec-v1-core
>      spec = {
>          "containers": [
> -            {"name": hookenv.charm_name(), "image": config["image"], "ports": ports, "config": container_config}
> +            {
> +                "name": hookenv.charm_name(),
> +                "imageDetails": {"imagePath": config["image"]},
> +                "ports": ports,
> +                "config": container_config,
> +            }
>          ]
>      }
> +    if config.get("image_user") and config.get("image_pass"):
> +        spec.get("containers")[0].get("imageDetails")["username"] = config["image_user"]
> +        spec.get("containers")[0].get("imageDetails")["password"] = config["image_pass"]

You need to move these three lines down after the log of 'Container environment config (sans secrets)', because secrets.

>      out = io.StringIO()
> -    pprint(spec, out)
> -    hookenv.log("Container spec (sans secrets) <<EOM\n{}\nEOM".format(out.getvalue()))
> +    pprint(spec.get("containers")[0].get("config"), out)
> +    hookenv.log(
> +        "Container environment config (sans secrets) <<EOM\n{}\nEOM".format(
> +            out.getvalue()
> +        )
> +    )
>  
>      # Add the secrets after logging
>      config_with_secrets = full_container_config()


-- 
https://code.launchpad.net/~barryprice/charm-k8s-wordpress/+git/charm-k8s-wordpress/+merge/377904
Your team Wordpress Charmers is subscribed to branch charm-k8s-wordpress:master.