File tree Expand file tree Collapse file tree 1 file changed +3
-1
lines changed Expand file tree Collapse file tree 1 file changed +3
-1
lines changed Original file line number Diff line number Diff line change 44
44
fi
45
45
# Distinguish between old (cloud.config) and new style (clouds.yaml) secrets
46
46
# This depends on the clusterstackrelease, not on whether or not we have a newsecret
47
- if kubectl get -n $CS_NAMESPACE clusterstackreleases.clusterstack.x-k8s.io openstack-scs-${CS_MAINVER/ ./ -} -${CS_VERSION/ ./ -} -o jsonpath=' {.status.resources}' | grep openstack-scs-${CS_MAINVER/ ./ -} -${CS_VERSION} -clouds-yaml > /dev/null 2>&1 ; then
47
+ # if kubectl get -n $CS_NAMESPACE clusterstackreleases.clusterstack.x-k8s.io openstack-scs-${CS_MAINVER/./-}-${CS_VERSION/./-} -o jsonpath='{.status.resources}' | grep openstack-scs-${CS_MAINVER/./-}-${CS_VERSION}-clouds-yaml >/dev/null 2>&1; then
48
+ CFGSTYLE=$( kubectl get clusterclasses.cluster.x-k8s.io -n $CS_NAMESPACE openstack-scs-${CS_MAINVER/ ./ -} -$CS_VERSION -o jsonpath=' {.metadata.annotations.configStyle}' || true)
49
+ if test " $CFGSTYLE " = " clouds-yaml" ; then
48
50
MGD_SEC=" managed-secret: clouds-yaml$SECRETSUFFIX "
49
51
else
50
52
MGD_SEC=" managed-secret: cloud-config$SECRETSUFFIX "
You can’t perform that action at this time.
0 commit comments