Skip to content

Commit beee3fe

Browse files
committed
add reload at configmap change, error in configmap
1 parent 52a42a5 commit beee3fe

File tree

4 files changed

+20
-21
lines changed

4 files changed

+20
-21
lines changed

.github/workflows/build-helm-chart.yaml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,20 @@ on:
1010
- "helm/**"
1111

1212
jobs:
13-
generate_tag:
13+
generate_infos:
1414
runs-on: ubuntu-latest
1515
outputs:
16-
output: ${{ steps.tag.outputs.tag }}
17-
release_version: ${{ steps.tag.outputs.release_version }}
16+
version: ${{ steps.tag.outputs.version }}
17+
tag: ${{ steps.tag.outputs.tag }}
18+
pr: ${{ steps.tag.outputs.pr }}
1819
steps:
1920
- name: Check out the repo
2021
uses: actions/checkout@v2
21-
with:
22-
ref: main
23-
fetch-depth: 0
24-
- name: Set up awesome-ci
25-
run: |
26-
wget https://github.com/eksrvb/awesome-ci/releases/latest/download/awesome-ci
27-
chmod +x awesome-ci
22+
- name: Setup awesome-ci
23+
uses: fullstack-devops/awesome-ci-action@main
24+
2825
- name: set build Infos
29-
run: ./awesome-ci getBuildInfos
26+
run: awesome-ci pr info -number ${{ github.event.pull_request.number }}
3027
env:
3128
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3229
- name: export Infos
@@ -35,7 +32,8 @@ jobs:
3532
run: |
3633
echo "Tag: $(git describe --abbrev=0)"
3734
echo "::set-output name=tag::$(git describe --abbrev=0)"
38-
echo "::set-output name=release_version::$ACI_NEXT_VERSION"
35+
echo "::set-output name=version::$ACI_VERSION"
36+
echo "::set-output name=pr::$ACI_PR"
3937
4038
build-helm-chart:
4139
runs-on: ubuntu-latest

helm/templates/configmap.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ data:
1717
{{- if .Values.envValues.dns_forwarder }}
1818
DNS_FORWARDER: {{ .Values.envValues.dns_forwarder | quote }}
1919
{{- end }}
20-
TTL_TIME: {{ .Values.envValues.ttl_time | quote }}
21-
REFRESH_TIME: {{ .Values.envValues.refresh_time | quote }}
22-
RETRY_TIME: {{ .Values.envValues.retry_time | quote }}
23-
EXPIRY_TIME: {{ .Values.envValues.expiry_time | quote }}
24-
MAX_CACHE_TIME: {{ .Values.envValues.max_cache_time | quote }}
20+
TTL_TIME: {{ int .Values.envValues.ttl_time }}
21+
REFRESH_TIME: {{ int .Values.envValues.refresh_time }}
22+
RETRY_TIME: {{ int .Values.envValues.retry_time }}
23+
EXPIRY_TIME: {{ int .Values.envValues.expiry_time }}
24+
MAX_CACHE_TIME: {{ int .Values.envValues.max_cache_time }}
2525
{{- if .Values.envValues.allow_query }}
2626
ALLOW_QUERY: {{ .Values.envValues.allow_query | quote }}
2727
{{- end }}

helm/templates/deployment.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ spec:
1313
{{- include "dns-bind.selectorLabels" . | nindent 6 }}
1414
template:
1515
metadata:
16-
{{- with .Values.podAnnotations }}
1716
annotations:
17+
checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
18+
{{- with .Values.podAnnotations }}
1819
{{- toYaml . | nindent 8 }}
1920
{{- end }}
2021
labels:

helm/values.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ image:
1313
envValues:
1414
debug_entrypoint: 0
1515
docker_logs: 0
16-
wildcard_dns: ""
16+
wildcard_dns: "corp.tld=10.1.5.90"
1717
extra_hosts: ""
1818
dnssec_validate: "no"
1919
dns_forwarder: ""
@@ -27,10 +27,10 @@ envValues:
2727

2828
serviceDns:
2929
mixedService: true
30-
type: NodePort
30+
type: LoadBalancer
3131
nodePort: ""
3232
externalTrafficPolicy: Local
33-
loadBalancerIP: ""
33+
loadBalancerIP: "10.1.5.99"
3434
loadBalancerIPv6: ""
3535
annotations:
3636
# metallb.universe.tf/address-pool: network-services

0 commit comments

Comments
 (0)