Fixups after rebasing onto current master

cyberark · May 27, 2021 · 75690a5 · 75690a5
1 parent 4a127f4
commit 75690a5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,7 @@ test
 
 temp
 
-helm/kubernetes-cluster-prep/files/conjur-cert.pem
+helm/conjur-config-cluster-prep/files/conjur-cert.pem
 
 bin/test-workflow/policy/generated/*
 tmp.*

diff --git a/bin/test-workflow/4_admin_cluster_prep.sh b/bin/test-workflow/4_admin_cluster_prep.sh
@@ -15,8 +15,8 @@ set_namespace default
 
 # Prepare our cluster with conjur and authnK8s credentials in a golden configmap
 announce "Installing cluster prep chart"
-pushd $(dirname "$0")/../../helm/kubernetes-cluster-prep > /dev/null
-    ./bin/get-conjur-cert.sh -v -i -u "$CONJUR_APPLIANCE_URL"
+pushd $(dirname "$0")/../../helm/conjur-config-cluster-prep > /dev/null
+    ./bin/get-conjur-cert.sh -v -i -s -u "$CONJUR_APPLIANCE_URL"
 
     helm upgrade --install cluster-prep . -n "$CONJUR_NAMESPACE"  --debug --wait \
         --set conjur.account="$CONJUR_ACCOUNT" \

diff --git a/bin/test-workflow/5_app_namespace_prep.sh b/bin/test-workflow/5_app_namespace_prep.sh
@@ -12,8 +12,8 @@ check_env_var CONJUR_NAMESPACE
 set_namespace default
 
 # Prepare a given namespace with a subset of credentials from the golden configmap
-announce "Installing application namespace prep chart"
-pushd $(dirname "$0")/../../helm/application-namespace-prep > /dev/null
+announce "Installing namespace prep chart"
+pushd $(dirname "$0")/../../helm/conjur-config-namespace-prep > /dev/null
     # Namespace $TEST_APP_NAMESPACE_NAME will be created if it does not exist
     helm upgrade --install namespace-prep . -n "$TEST_APP_NAMESPACE_NAME"  --debug --wait \
         --create-namespace \

diff --git a/bin/test-workflow/8_app_deploy_summon_sidecar.sh b/bin/test-workflow/8_app_deploy_summon_sidecar.sh
@@ -17,7 +17,7 @@ if [ "$(helm list -q -n $TEST_APP_NAMESPACE_NAME | grep "^app-summon-sidecar$")"
     helm uninstall app-summon-sidecar -n "$TEST_APP_NAMESPACE_NAME"
 fi
 
-pushd $(dirname "$0")/../../helm/app-deploy > /dev/null
+pushd $(dirname "$0")/../../helm/conjur-app-deploy > /dev/null
   helm install app-summon-sidecar . -n "$TEST_APP_NAMESPACE_NAME" --debug --wait \
       --set app-summon-sidecar.enabled=true \
       --set global.conjur.conjurConnConfigMap="conjur-connect-configmap" \
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ test @@
     temp
-    helm/kubernetes-cluster-prep/files/conjur-cert.pem
+    helm/conjur-config-cluster-prep/files/conjur-cert.pem
     bin/test-workflow/policy/generated/*
     tmp.*
@@ Expand Down @@