Skip to content

Commit 0883bc4

Browse files
authored
Merge pull request #977 from snyk/chore/operator-monitor
Chore/operator monitor
2 parents 4151fa1 + d7d658c commit 0883bc4

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

.circleci/config.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -663,9 +663,10 @@ jobs:
663663
name: Download operator-sdk
664664
- run:
665665
command: |
666-
OPERATOR_TAG="${LATEST_TAG}"
667-
MONITOR_TAG="${LATEST_TAG}"
666+
export OPERATOR_TAG="${LATEST_TAG}"
667+
export MONITOR_TAG="${LATEST_TAG}"
668668
python3 scripts/operator/create_operator_and_push.py "${OPERATOR_TAG}" "${MONITOR_TAG}" "${DOCKERHUB_USER}" "${DOCKERHUB_PASSWORD}"
669+
echo "export OPERATOR_TAG=${OPERATOR_TAG}" >> $BASH_ENV
669670
name: Create Operator and push Operator image to DockerHub
670671
- snyk/scan:
671672
docker-image-name: snyk/kubernetes-operator:${OPERATOR_TAG}

.circleci/config/jobs/@jobs.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,9 +456,10 @@ publish:
456456
- run:
457457
name: Create Operator and push Operator image to DockerHub
458458
command: |
459-
OPERATOR_TAG="${LATEST_TAG}"
460-
MONITOR_TAG="${LATEST_TAG}"
459+
export OPERATOR_TAG="${LATEST_TAG}"
460+
export MONITOR_TAG="${LATEST_TAG}"
461461
python3 scripts/operator/create_operator_and_push.py "${OPERATOR_TAG}" "${MONITOR_TAG}" "${DOCKERHUB_USER}" "${DOCKERHUB_PASSWORD}"
462+
echo "export OPERATOR_TAG=${OPERATOR_TAG}" >> $BASH_ENV
462463
- snyk/scan:
463464
docker-image-name: snyk/kubernetes-operator:${OPERATOR_TAG}
464465
severity-threshold: high

src/transmitter/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ function shouldRetryRequest(
280280
const networkErrorMessages: string[] = [
281281
'socket hang up',
282282
'Client network socket disconnected before secure TLS connection was established',
283+
'write ECONNRESET', // May happen due to Keep-Alive race condition - https://code-examples.net/en/q/28a8069
283284
];
284285

285286
if (!stillHaveRetries) {

0 commit comments

Comments
 (0)