@@ -127,57 +127,32 @@ spec:
127127 - name : sourceDataArtifact
128128 value : $(params.sourceDataArtifact)
129129 - name : collect-charon-params
130- image : quay.io/konflux-ci /release-service-utils@sha256:5546fa78d3c88d7b6a2e8cff8902f7757f00541d0bbaf113b9f293133894afa3
130+ image : quay.io/lgallovi-test /release-service-utils@sha256:d3c28f245cd0ade0ce825c17c6986f14153cc49043fd168f5ced30bbdaba52e2
131131 computeResources :
132132 limits :
133- memory : 128Mi
133+ memory : 192Mi
134134 requests :
135- memory : 128Mi
136- cpu : 50m
137- script : |
138- #!/usr/bin/env bash
139- set -eux
140-
141- WORK_DIR=$(params.dataDir)
142- cd "$WORK_DIR"
143-
144- DATA_FILE="$WORK_DIR/$(params.dataJsonPath)"
145- CHARON_ENV_FILE_PATH="$(dirname "$(params.dataJsonPath)")/charon.env"
146-
147- environment="$(jq -re '.charon.environment' "$DATA_FILE")"
148- release="$(jq -re '.charon.release' "$DATA_FILE")"
149- packageType="$(jq -re '.charon.packageType // "maven"' "$DATA_FILE")"
150- target="$environment-$packageType-$release"
151- echo "export CHARON_TARGET=$target" >> "$CHARON_ENV_FILE_PATH"
152-
153- productName="$(jq -re '.releaseNotes.product_name' "$DATA_FILE")"
154- productVersion="$(jq -re '.releaseNotes.product_version' "$DATA_FILE")"
155- echo "export CHARON_PRODUCT_NAME=\"$productName\"" >> "$CHARON_ENV_FILE_PATH"
156- echo "export CHARON_PRODUCT_VERSION=\"$productVersion\"" >> "$CHARON_ENV_FILE_PATH"
157-
158- sign_key="$(jq -re '.charon.signing.signKey // ""' "$DATA_FILE")"
159- if [ "$sign_key" != "" ]; then
160- echo "export CHARON_SIGN_KEY=\"$sign_key\"" >> "$CHARON_ENV_FILE_PATH"
161- fi
162-
163- SNAPSHOT_PATH="$WORK_DIR/$(params.snapshotPath)"
164- ociRegistries="$(jq -re '[.components[].containerImage] | join("%")' "$SNAPSHOT_PATH")"
165- echo "export CHARON_OCI_REGISTRY=\"$ociRegistries\"" >> "$CHARON_ENV_FILE_PATH"
166-
167- awsSecret="$(jq -re '.charon.awsSecret' "$DATA_FILE")"
168- echo -n "$awsSecret" > "$(results.charonAWSSecret.path)"
169-
170- sign_ca_secret="$(jq -re '.charon.signing.signCASecret // ""' "$DATA_FILE")"
171- echo -n "$sign_ca_secret" > "$(results.charonSignCASecret.path)"
172-
173- AUTHOR=$(jq -re '.status.attribution.author' "$WORK_DIR/$(params.releasePath)")
174- echo "export CHARON_AUTHOR=\"$AUTHOR\"" >> "$CHARON_ENV_FILE_PATH"
175-
176- echo -n "$CHARON_ENV_FILE_PATH" > "$(results.charonParamFilePath.path)"
177-
178- CHARON_CFG_FILE_PATH="$(dirname "$(params.dataJsonPath)")/charon-config.yaml"
179- jq -re '.charon.config' "$DATA_FILE" > "$CHARON_CFG_FILE_PATH"
180- echo -n "$CHARON_CFG_FILE_PATH" > "$(results.charonConfigFilePath.path)"
135+ memory : 192Mi
136+ cpu : 100m
137+ command : ["/home/scripts/python/tasks/managed/collect_charon_params.py"]
138+ args :
139+ - " --work-dir"
140+ - " $(params.dataDir)"
141+ - " --data-json-path"
142+ - " $(params.dataJsonPath)"
143+ - " --snapshot-path"
144+ - " $(params.snapshotPath)"
145+ - " --release-path"
146+ - " $(params.releasePath)"
147+ env :
148+ - name : RESULT_CHARON_PARAM_FILE_PATH
149+ value : $(results.charonParamFilePath.path)
150+ - name : RESULT_CHARON_CONFIG_FILE_PATH
151+ value : $(results.charonConfigFilePath.path)
152+ - name : RESULT_CHARON_AWS_SECRET
153+ value : $(results.charonAWSSecret.path)
154+ - name : RESULT_CHARON_SIGN_CA_SECRET
155+ value : $(results.charonSignCASecret.path)
181156 - name : create-trusted-artifact
182157 computeResources :
183158 limits :
0 commit comments