Compare commits
10 Commits
Author | SHA1 | Date | |
---|---|---|---|
b432068e82 | |||
16f1ff14ff | |||
15daa960c2 | |||
105bc71e9c | |||
a6d6e91ffa | |||
e8822fc8da | |||
fa2c72cb68 | |||
2725f36017 | |||
0af8f2ac5e | |||
6270499efe |
25
CHANGELOG.md
25
CHANGELOG.md
@ -1,3 +1,28 @@
|
|||||||
|
## [0.8.3](https://code.spamasaurus.com/djpbessems/ContainerImage.JSONServer/compare/v0.8.2...v0.8.3) (2023-07-16)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* Filter redundant release fields ([16f1ff1](https://code.spamasaurus.com/djpbessems/ContainerImage.JSONServer/commit/16f1ff14ff4616b28462715ce2d6fd6490254b10))
|
||||||
|
|
||||||
|
## [0.8.2](https://code.spamasaurus.com/djpbessems/ContainerImage.JSONServer/compare/v0.8.1...v0.8.2) (2023-07-16)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* Remove race condition when testing target url ([105bc71](https://code.spamasaurus.com/djpbessems/ContainerImage.JSONServer/commit/105bc71e9c16ebf9afa5a4027d1131f311a76c5e))
|
||||||
|
* Set filemode per key ([a6d6e91](https://code.spamasaurus.com/djpbessems/ContainerImage.JSONServer/commit/a6d6e91ffadd13650c0ce44d0c43e96dea3c6711))
|
||||||
|
|
||||||
|
## [0.8.1](https://code.spamasaurus.com/djpbessems/ContainerImage.JSONServer/compare/v0.8.0...v0.8.1) (2023-07-14)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* Add missing dependency ([6270499](https://code.spamasaurus.com/djpbessems/ContainerImage.JSONServer/commit/6270499efecb8ae1474f1ce29c8f4003da3916df))
|
||||||
|
* Fix linebreak ([fa2c72c](https://code.spamasaurus.com/djpbessems/ContainerImage.JSONServer/commit/fa2c72cb68254dd0e27f12220f8056b9223223ed))
|
||||||
|
* Refactor update script for bash interpreter ([2725f36](https://code.spamasaurus.com/djpbessems/ContainerImage.JSONServer/commit/2725f360179b3dab1d77d5f429b2f60d4aabcd4a))
|
||||||
|
* Workaround for set locale warning ([0af8f2a](https://code.spamasaurus.com/djpbessems/ContainerImage.JSONServer/commit/0af8f2ac5ea0f8453fdb7120aeb7eff15aa88e42))
|
||||||
|
|
||||||
# [0.8.0](https://code.spamasaurus.com/djpbessems/ContainerImage.JSONServer/compare/v0.7.3...v0.8.0) (2023-07-14)
|
# [0.8.0](https://code.spamasaurus.com/djpbessems/ContainerImage.JSONServer/compare/v0.7.3...v0.8.0) (2023-07-14)
|
||||||
|
|
||||||
|
|
||||||
|
@ -17,7 +17,11 @@ ENV LANGUAGE en_US:en
|
|||||||
ENV LC_ALL en_US.UTF-8
|
ENV LC_ALL en_US.UTF-8
|
||||||
|
|
||||||
RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends \
|
||||||
jq && \
|
curl \
|
||||||
|
jq \
|
||||||
|
locales && \
|
||||||
|
sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
|
||||||
|
locale-gen && \
|
||||||
npm install -g --omit=optional --omit=dev \
|
npm install -g --omit=optional --omit=dev \
|
||||||
json-server && \
|
json-server && \
|
||||||
npm cache clean --force && \
|
npm cache clean --force && \
|
||||||
|
@ -55,7 +55,7 @@ data:
|
|||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
update.sh: |
|
update.sh: |
|
||||||
#!/bin/sh
|
#!/bin/bash
|
||||||
|
|
||||||
while getopts u: flag
|
while getopts u: flag
|
||||||
do
|
do
|
||||||
@ -64,8 +64,8 @@ data:
|
|||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
[ $(curl -kLs -w "%{http_code}" -o /dev/null https://$URL) != 200 ] && {
|
[[ $(getent hosts $URL) ]] || {
|
||||||
echo 'Could not connect to' $URL
|
echo 'Could not resolve' $URL
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -75,18 +75,18 @@ data:
|
|||||||
do
|
do
|
||||||
echo '['$(date "+%Y-%m-%d %H:%M:%S")']' $(curl -ks https://$URL/components | jq length) 'known releases in database'
|
echo '['$(date "+%Y-%m-%d %H:%M:%S")']' $(curl -ks https://$URL/components | jq length) 'known releases in database'
|
||||||
|
|
||||||
echo -n $(helm list --all-namespaces --output json | jq -c '.[]') | while IFS= read -r release;
|
for entry in $(helm list --all-namespaces --output json | jq -r '.[] | @base64'); do
|
||||||
do
|
RELEASE=$(echo $entry | base64 -d | jq -cS '.type="helm" | del(.namespace, .revision, .status)')
|
||||||
APP_NAME=$(echo $release | jq -r '.name')
|
APP_NAME=$(echo $RELEASE | jq -r '.name')
|
||||||
APP_ID=$(curl -ks https://$URL/components?name=$APP_NAME | jq -r '.[0].id')
|
APP_ID=$(curl -ks https://$URL/components?name=$APP_NAME | jq -r '.[0].id')
|
||||||
|
|
||||||
# Release is not yet in database
|
# Release is not yet in database
|
||||||
[ "$APP_ID" == null ] && {
|
[ "$APP_ID" == null ] && {
|
||||||
curl -ks -X POST https://$URL/components -H 'Content-Type: application/json' --data "$release"
|
curl -ks -X POST https://$URL/components -H 'Content-Type: application/json' --data "$RELEASE" -o /dev/null
|
||||||
}
|
}
|
||||||
# Release is already in database
|
# Release is already in database
|
||||||
[ "$APP_ID" != null ] && {
|
[ "$APP_ID" != null ] && {
|
||||||
curl -ks -X PATCH https://$URL/components/$APP_ID -H 'Content-Type: application/json' --data "$release"
|
curl -ks -X PATCH https://$URL/components/$APP_ID -H 'Content-Type: application/json' --data "$RELEASE" -o /dev/null
|
||||||
}
|
}
|
||||||
done
|
done
|
||||||
|
|
||||||
|
@ -60,18 +60,25 @@ spec:
|
|||||||
resources:
|
resources:
|
||||||
{{- toYaml .Values.resources | nindent 12 }}
|
{{- toYaml .Values.resources | nindent 12 }}
|
||||||
command:
|
command:
|
||||||
- /bin/sh
|
- /bin/bash
|
||||||
- -c
|
- -c
|
||||||
- "/opt/update.sh -u {{ .Values.sidecar.targetUrl }}"
|
- "/opt/update.sh -u {{ .Values.sidecar.targetUrl }}"
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: {{ .Release.Name }}-configmap
|
- name: {{ .Release.Name }}-configmap
|
||||||
mountPath: /opt/update.sh
|
mountPath: /opt/update.sh
|
||||||
subPath: update.sh
|
subPath: update.sh
|
||||||
defaultMode: 0744
|
|
||||||
volumes:
|
volumes:
|
||||||
- name: {{ .Release.Name }}-configmap
|
- name: {{ .Release.Name }}-configmap
|
||||||
configMap:
|
configMap:
|
||||||
name: {{ .Release.Name }}-configmap
|
name: {{ .Release.Name }}-configmap
|
||||||
|
items:
|
||||||
|
- key: db.json
|
||||||
|
path: db.json
|
||||||
|
- key: index.html
|
||||||
|
path: index.html
|
||||||
|
- key: update.sh
|
||||||
|
path: update.sh
|
||||||
|
mode: 0744
|
||||||
{{- with .Values.nodeSelector }}
|
{{- with .Values.nodeSelector }}
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
{{- toYaml . | nindent 8 }}
|
{{- toYaml . | nindent 8 }}
|
||||||
|
Reference in New Issue
Block a user