Skip to content
This repository was archived by the owner on May 14, 2025. It is now read-only.

Commit 5fb2f98

Browse files
Corneil du PlessisCorneil du Plessis
Corneil du Plessis
authored and
Corneil du Plessis
committed
Improvements in Carvel and Kubernetes deployments. (#5687)
* Removed Carvel environmentVariables as default in values. * Improve probe paths to Actuator endpoints. * Improve CPU and memory requests.
1 parent cbe27e2 commit 5fb2f98

File tree

3 files changed

+14
-16
lines changed

3 files changed

+14
-16
lines changed

src/deploy/carvel/deploy-scdf.sh

+7
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,13 @@ fi
104104
"$SCDIR/carvel-import-secret.sh" "scdfmetadata" "$NS"
105105
"$SCDIR/carvel-import-secret.sh" "reg-creds-dockerhub" "$NS"
106106

107+
if [ "$SCDF_TYPE" = "pro" ]; then
108+
"$SCDIR/carvel-import-secret.sh" "reg-creds-dev-registry" "$NS"
109+
fi
110+
111+
"$SCDIR/carvel-import-secret.sh" "scdfmetadata" "$NS"
112+
"$SCDIR/carvel-import-secret.sh" "reg-creds-dockerhub" "$NS"
113+
107114
if [ "$SCDF_TYPE" = "pro" ]; then
108115
"$SCDIR/carvel-import-secret.sh" "reg-creds-dev-registry" "$NS"
109116
fi

src/deploy/carvel/scdf-oss-values.yml

-8
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ scdf:
22
binder:
33
type: rabbit
44
server:
5-
# image: # uncomment to use a different tag
6-
# tag: 2.11.2
75
service:
86
type: LoadBalancer
97
env:
@@ -13,12 +11,6 @@ scdf:
1311
value: "true"
1412
- name: SPRING_CLOUD_DATAFLOW_FEATURES_SCHEDULES_ENABLED
1513
value: "true"
16-
# skipper:
17-
# image: # uncomment to use a different tag
18-
# tag: 2.11.2
19-
# ctr:
20-
# image: # uncomment to use a different tag
21-
# tag: 2.11.2
2214
registry:
2315
secret:
2416
ref: "reg-creds-dockerhub"

src/deploy/carvel/scdf-pro-values.yml

+7-8
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ scdf:
22
binder:
33
type: rabbit
44
server:
5-
# image: # uncomment to use a different tag
6-
# tag: 1.6.1
5+
image:
6+
repository: dev.registry.tanzu.vmware.com/p-scdf-for-kubernetes/scdf-pro-server
7+
tag: 1.6.0
78
service:
89
type: LoadBalancer
910
env:
@@ -13,12 +14,10 @@ scdf:
1314
value: "true"
1415
- name: SPRING_CLOUD_DATAFLOW_FEATURES_SCHEDULES_ENABLED
1516
value: "true"
16-
# skipper:
17-
# image: # pro uses a skipper image from registry.tanzu.vmware.com that is tagged with package version
18-
# tag: 1.6.1
19-
# ctr:
20-
# image: # uncomment to use a different tag
21-
# tag: 2.11.2
17+
skipper:
18+
image:
19+
repository: springcloud/spring-cloud-skipper-server
20+
tag: 2.11.2
2221
registry:
2322
secret:
2423
ref: "reg-creds-dev-registry"

0 commit comments

Comments
 (0)