From 031f850ffe78cd4bb551ecbf624fa1648c5c576d Mon Sep 17 00:00:00 2001
From: Jason Schmidt <j.schmidt@f5.com>
Date: Mon, 14 Nov 2022 15:52:33 -0700
Subject: [PATCH 1/3] fix: update where we put/get secrets

---
 bin/start_kube.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/start_kube.sh b/bin/start_kube.sh
index 37ff417..1d8e69d 100755
--- a/bin/start_kube.sh
+++ b/bin/start_kube.sh
@@ -266,13 +266,13 @@ fi
 # Admin password for grafana (see note in __main__.py in prometheus project as to why not encrypted)
 # This is for the deployment that is setup as part of the the prometheus operator driven prometheus-kube-stack.
 #
-if pulumi config get prometheus:adminpass -C ${script_dir}/../pulumi/python/config >/dev/null 2>&1; then
+if pulumi config get prometheus:adminpass -C "${script_dir}"/../pulumi/python/kubernetes/secrets >/dev/null 2>&1; then
   echo "Existing password found for grafana admin user"
 else
   echo "Create a password for the grafana admin user; this password will be used to access the Grafana dashboard"
-  echo "This should be an alphanumeric string without any shell special characters; it is presented in plain text"
-  echo "due to current limitations with Pulumi secrets. You will need this password to access the Grafana dashboard."
-  pulumi config set prometheus:adminpass -C ${script_dir}/../pulumi/python/config
+  echo "This should be an alphanumeric string without any shell special characters. You will need this password to"
+  echo "access the Grafana dashboard."
+	pulumi config set prometheus:adminpass --secret -C "${script_dir}"/../pulumi/python/kubernetes/secrets
 fi
 
 #

From 25eee5b0370871c7b4ce0220bd6cc73013ee21af Mon Sep 17 00:00:00 2001
From: Jason Schmidt <j.schmidt@f5.com>
Date: Mon, 14 Nov 2022 15:53:32 -0700
Subject: [PATCH 2/3] chore: bump python versions

---
 pulumi/python/requirements.txt | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pulumi/python/requirements.txt b/pulumi/python/requirements.txt
index 0ad7699..b4951fa 100644
--- a/pulumi/python/requirements.txt
+++ b/pulumi/python/requirements.txt
@@ -4,10 +4,10 @@ fart~=0.1.5
 lolcat~=1.4
 nodeenv~=1.6.0
 passlib~=1.7.4
-pulumi-aws>=4.39.0
-pulumi-docker==3.1.0
-pulumi-eks>=0.41.2
-pulumi-kubernetes==3.20.1
+pulumi-aws==5.20.0
+pulumi-docker==3.6.0
+pulumi-eks==0.42.7
+pulumi-kubernetes==3.22.1
 pycryptodome~=3.14.0
 PyYAML~=5.4.1
 requests~=2.27.1
@@ -15,7 +15,7 @@ setuptools==62.1.0
 setuptools-git-versioning==1.9.2
 wheel==0.37.1
 yamlreader==3.0.4
-pulumi-digitalocean==4.12.0
-pulumi-linode==3.7.1
-linode-cli~=5.17.2
-pulumi~=3.36.0
\ No newline at end of file
+pulumi-digitalocean==4.16.0
+pulumi-linode==3.10.1
+linode-cli==5.26.0
+pulumi~=3.46.1
\ No newline at end of file

From 961cf78ab2aa133278020690cfea54a80badf93a Mon Sep 17 00:00:00 2001
From: Jason Schmidt <j.schmidt@f5.com>
Date: Mon, 14 Nov 2022 15:53:32 -0700
Subject: [PATCH 3/3] Revert "chore: bump python versions"

This reverts commit 25eee5b0370871c7b4ce0220bd6cc73013ee21af.
---
 pulumi/python/requirements.txt | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pulumi/python/requirements.txt b/pulumi/python/requirements.txt
index b4951fa..0ad7699 100644
--- a/pulumi/python/requirements.txt
+++ b/pulumi/python/requirements.txt
@@ -4,10 +4,10 @@ fart~=0.1.5
 lolcat~=1.4
 nodeenv~=1.6.0
 passlib~=1.7.4
-pulumi-aws==5.20.0
-pulumi-docker==3.6.0
-pulumi-eks==0.42.7
-pulumi-kubernetes==3.22.1
+pulumi-aws>=4.39.0
+pulumi-docker==3.1.0
+pulumi-eks>=0.41.2
+pulumi-kubernetes==3.20.1
 pycryptodome~=3.14.0
 PyYAML~=5.4.1
 requests~=2.27.1
@@ -15,7 +15,7 @@ setuptools==62.1.0
 setuptools-git-versioning==1.9.2
 wheel==0.37.1
 yamlreader==3.0.4
-pulumi-digitalocean==4.16.0
-pulumi-linode==3.10.1
-linode-cli==5.26.0
-pulumi~=3.46.1
\ No newline at end of file
+pulumi-digitalocean==4.12.0
+pulumi-linode==3.7.1
+linode-cli~=5.17.2
+pulumi~=3.36.0
\ No newline at end of file