Skip to content

Commit 6436833

Browse files
francoisferrandfrancoisferrand
committed
Dedup zenkoversion.yaml file
Use the same (official!) zenkoversion.yaml file in CI and in solution, to ensure we don't introduce discrepency and run the tests in a Issue: ZENKO-4817
1 parent f68bd9f commit 6436833

File tree

4 files changed

+52
-193
lines changed

4 files changed

+52
-193
lines changed

‎.github/scripts/end2end/configs/zenkoversion.yaml‎

Lines changed: 0 additions & 144 deletions
This file was deleted.

‎.github/scripts/end2end/deploy-zenko.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ DIR=$(dirname "$0")
77
export ZENKO_NAME=${1:-end2end}
88
export NAMESPACE=${2:-default}
99
export ZENKO_CR_PATH=${3:-'./configs/zenko.yaml'}
10-
export ZENKOVERSION_PATH=${4:-'./configs/zenkoversion.yaml'}
10+
export ZENKOVERSION_PATH=${4:-'.../../../solution/zenkoversion.yaml'}
1111
export DEPS_PATH=${5:-'../../../solution/deps.yaml'}
1212
export ZENKO_VERSION_NAME="${ZENKO_NAME}-version"
1313
export ZENKO_ANNOTATIONS=""
@@ -130,7 +130,9 @@ create_encryption_secret()
130130

131131
create_encryption_secret
132132

133-
env $(dependencies_env) envsubst < ${ZENKOVERSION_PATH} | kubectl -n ${NAMESPACE} apply -f -
133+
env $(dependencies_env) envsubst < ${ZENKOVERSION_PATH} | \
134+
yq 'del(.spec.dashboards[] | select(.tag == "${ZENKO_VERSION_NAME}" ) )' | \
135+
kubectl -n ${NAMESPACE} apply -f -
134136
env $(dependencies_env) envsubst < ${ZENKO_CR_PATH} | kubectl -n ${NAMESPACE} apply -f -
135137

136138
# Fix Zookeeper memory issues on newer Ubuntu GHA runners

‎solution/build.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,9 @@ function zenko_operator_tag()
7777

7878
function dependencies_versions_env()
7979
{
80+
yq eval '.[] | .envsubst + "=" + .image' ${DEPS_PATH} | sed 's/_TAG=/_IMAGE=/g'
8081
yq eval '.[] | .envsubst + "=" + .tag' deps.yaml
81-
echo VERSION_FULL=${VERSION_FULL}
82+
echo ZENKO_VERSION_NAME=${VERSION_FULL}
8283
}
8384

8485
function copy_yamls()

‎solution/zenkoversion.yaml‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -3,128 +3,128 @@
33
apiVersion: zenko.io/v1alpha1
44
kind: ZenkoVersion
55
metadata:
6-
name: '${VERSION_FULL}'
6+
name: '${ZENKO_VERSION_NAME}'
77
spec:
88
dashboards:
99
backbeat:
10-
image: backbeat-dashboards
10+
image: '${BACKBEAT_DASHBOARD}'
1111
tag: '${BACKBEAT_TAG}'
1212
cloudserver:
13-
image: cloudserver-dashboards
13+
image: '${CLOUDSERVER_DASHBOARD}'
1414
tag: '${CLOUDSERVER_TAG}'
1515
kafka:
16-
image: kafka-dashboard
17-
tag: '${VERSION_FULL}'
16+
image: '${KAFKA_DASHBOARD}'
17+
tag: '${ZENKO_VERSION_NAME}'
1818
kafkaCleaner:
19-
image: kafka-cleaner-dashboards
19+
image: '${KAFKA_CLEANER_DASHBOARD}'
2020
tag: '${KAFKA_CLEANER_TAG}'
2121
kafkaConnect:
22-
image: kafka-connect-dashboard
23-
tag: '${VERSION_FULL}'
22+
image: '${KAFKA_CONNECT_DASHBOARD}'
23+
tag: '${ZENKO_VERSION_NAME}'
2424
mongodb:
25-
image: mongodb-dashboard
26-
tag: '${VERSION_FULL}'
25+
image: '${MONGODB_DASHBOARD}'
26+
tag: '${ZENKO_VERSION_NAME}'
2727
redis:
28-
image: redis-dashboard
29-
tag: '${VERSION_FULL}'
28+
image: '${REDIS_DASHBOARD}'
29+
tag: '${ZENKO_VERSION_NAME}'
3030
vault:
31-
image: vault-dashboards
31+
image: '${VAULT_DASHBOARD}'
3232
tag: '${VAULT_TAG}'
3333
zookeeper:
34-
image: zookeeper-dashboard
35-
tag: '${VERSION_FULL}'
34+
image: '${ZOOKEEPER_DASHBOARD}'
35+
tag: '${ZENKO_VERSION_NAME}'
3636
s3utils:
37-
image: s3utils-dashboards
37+
image: '${S3UTILS_DASHBOARD}'
3838
tag: '${S3UTILS_TAG}'
3939
scuba:
40-
image: scuba-dashboards
40+
image: '${SCUBA_DASHBOARD}'
4141
tag: '${SCUBA_TAG}'
4242
dr:
43-
image: dr-dashboard
44-
tag: '${VERSION_FULL}'
43+
image: ${DR_DASHBOARD}
44+
tag: '${ZENKO_VERSION_NAME}'
4545
policies:
4646
backbeat:
47-
image: backbeat-policies
47+
image: '${BACKBEAT_POLICY}'
4848
tag: '${BACKBEAT_TAG}'
4949
sorbet:
50-
image: sorbet-policies
50+
image: '${SORBET_POLICY}'
5151
tag: '${SORBET_TAG}'
5252
vault:
53-
image: vault-policies
53+
image: '${VAULT_POLICY}'
5454
tag: '${VAULT_TAG}'
5555
versions:
5656
management:
5757
api:
58-
image: pensieve-api
58+
image: '${PENSIEVE_API_IMAGE}'
5959
tag: '${PENSIEVE_API_TAG}'
6060
pushAPI:
61-
image: pensieve-api
61+
image: '${PENSIEVE_API_IMAGE}'
6262
tag: '${PENSIEVE_API_TAG}'
6363
cloudserver:
64-
image: cloudserver
64+
image: '${CLOUDSERVER_IMAGE}'
6565
tag: '${CLOUDSERVER_TAG}'
6666
backbeat:
67-
image: backbeat
67+
image: '${BACKBEAT_IMAGE}'
6868
tag: '${BACKBEAT_TAG}'
6969
drctl:
70-
image: zenko-drctl
71-
tag: ${DRCTL_TAG}
70+
image: '${DRCTL_IMAGE}'
71+
tag: '${DRCTL_TAG}'
7272
utapi:
73-
image: utapi
73+
image: '${UTAPI_IMAGE}'
7474
tag: '${UTAPI_TAG}'
7575
secureChannelProxy:
76-
image: cloudserver
76+
image: '${CLOUDSERVER_IMAGE}'
7777
tag: '${CLOUDSERVER_TAG}'
7878
localData:
79-
image: cloudserver
79+
image: '${CLOUDSERVER_IMAGE}'
8080
tag: '${CLOUDSERVER_TAG}'
8181
metrics:
82-
image: cloudserver
82+
image: '${CLOUDSERVER_IMAGE}'
8383
tag: '${CLOUDSERVER_TAG}'
8484
s3utils:
85-
image: s3utils
85+
image: '${S3UTILS_IMAGE}'
8686
tag: '${S3UTILS_TAG}'
8787
scuba:
88-
image: scuba
88+
image: '${SCUBA_IMAGE}'
8989
tag: '${SCUBA_TAG}'
9090
sorbet:
91-
image: sorbet
91+
image: '${SORBET_IMAGE}'
9292
tag: '${SORBET_TAG}'
9393
zookeeper:
94-
image: zookeeper
94+
image: '${ZOOKEEPER_IMAGE}'
9595
tag: '${ZOOKEEPER_TAG}'
9696
kafka:
9797
cleaner:
98-
image: kafka-cleaner
98+
image: '${KAFKA_CLEANER_IMAGE}'
9999
tag: '${KAFKA_CLEANER_TAG}'
100100
cluster:
101-
image: kafka
101+
image: '${KAFKA_IMAGE}'
102102
tag: '${KAFKA_TAG}'
103103
connect:
104-
image: kafka-connect
104+
image: '${KAFKA_CONNECT_IMAGE}'
105105
tag: '${KAFKA_CONNECT_TAG}'
106106
cruiseControl:
107-
image: cruise-control
107+
image: '${KAFKA_CRUISECONTROL_IMAGE}'
108108
tag: '${KAFKA_CRUISECONTROL_TAG}'
109109
lagExporter:
110-
image: kafka-lag-exporter
110+
image: '${KAFKA_LAGEXPORTER_IMAGE}'
111111
tag: '${KAFKA_LAGEXPORTER_TAG}'
112112
monitoring:
113-
image: jmx-javaagent
113+
image: '${JMX_JAVAAGENT_IMAGE}'
114114
tag: '${JMX_JAVAAGENT_TAG}'
115115
listener:
116-
image: haproxy
116+
image: '${HAPROXY_IMAGE}'
117117
tag: '${HAPROXY_TAG}'
118118
vault:
119-
image: vault2
119+
image: '${VAULT_IMAGE}'
120120
tag: '${VAULT_TAG}'
121121
mongodb: '${MONGODB_TAG}'
122122
redis:
123123
db:
124-
image: redis
124+
image: '${REDIS_IMAGE}'
125125
tag: '${REDIS_TAG}'
126126
exporter:
127-
image: redis_exporter
127+
image: '${REDIS_EXPORTER_IMAGE}'
128128
tag: '${REDIS_EXPORTER_TAG}'
129129
defaults:
130130
backbeatConcurrency:

0 commit comments

Comments
 (0)