Skip to content

Commit 422b342

Browse files
authored
Feature/docker image detection (#7)
* feature/docker-image-detection * helm chart for new detection version * fix workflow
1 parent 017bdd1 commit 422b342

19 files changed

Lines changed: 666 additions & 368 deletions

File tree

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
DOCKER_BUILDKIT: 1
4040
with:
4141
context: .
42-
file: Dockerfile
42+
file: docker/Dockerfile
4343
push: true
4444
tags: ${{ steps.meta.outputs.tags }}
45-
labels: ${{ steps.meta.outputs.labels }}
45+
labels: ${{ steps.meta.outputs.labels }}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Release Charts
33
on:
44
push:
55
branches:
6-
- main
6+
- 'main'
77

88
jobs:
99
release:

Dockerfile

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

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,8 @@ Deploy
1818
```bash
1919
helm install keepup-helm-scraper/keepup-helm-scraper
2020
```
21+
22+
## Build Docker image
23+
```bash
24+
docker build -t ghcr.io/code-tool/keepup-helm-scraper:$(cat VERSION.txt) -f docker/Dockerfile .
25+
```

VERSION.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0.2.0

charts/keepup-helm-scraper/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ apiVersion: v2
22
name: keepup-helm-scraper
33
description: A Helm chart for scrape charts release information.
44
type: application
5-
version: 0.2.1
6-
appVersion: 0.1.1
5+
version: 0.3.0
6+
appVersion: 0.2.0

charts/keepup-helm-scraper/templates/clusterrole.yaml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,21 @@ apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRole
44
metadata:
55
name: {{ .Release.Name }}
6+
rules:
67
rules:
78
- apiGroups: [""]
8-
resources: ["namespaces", "secrets"]
9-
verbs: ["get", "list"]
9+
resources:
10+
- namespaces
11+
verbs:
12+
- get
13+
- list
14+
15+
- apiGroups: ["apps"]
16+
resources:
17+
- deployments
18+
- statefulsets
19+
- daemonsets
20+
verbs:
21+
- get
22+
- list
1023
{{- end }}
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
apiVersion: v1
2+
kind: ConfigMap
3+
metadata:
4+
name: {{ .Release.Name }}
5+
data:
6+
rules.yaml: |
7+
docker:
8+
- applicationName: 'memcached'
9+
detectionRegex: '\/memcached:'
10+
versionRegex: '(:(v)?(\d+)\.(\d+)(\.(\d+))?)((@sha)?.*)?$'
11+
12+
- applicationName: 'victoriametrics'
13+
detectionRegex: 'victoriametrics\/victoria-metrics:'
14+
versionRegex: '(:(v)?(\d+)\.(\d+)(\.(\d+))?)((@sha)?.*)?$'
15+
16+
- applicationName: 'ingress-nginx'
17+
detectionRegex: '\/ingress-nginx\/controller:'
18+
versionRegex: '(:(v)?(\d+)\.(\d+)(\.(\d+))?)((@sha)?.*)?$'
19+
20+
- applicationName: 'nginx-opentracing'
21+
detectionRegex: '\/nginx-opentracing:'
22+
versionRegex: '(:(v)?(\d+)\.(\d+)(\.(\d+))?)((@sha)?.*)?$'
23+
24+
- applicationName: 'nginx'
25+
detectionRegex: '(\/)?nginx:'
26+
versionRegex: ':(\d+)\.(\d+)(\.\d+)?$'
27+
28+
- applicationName: 'headscale'
29+
detectionRegex: 'ghcr\.io\/gurucomputing\/headscale-ui:'
30+
versionRegex: '(:(v)?(\d+)\.(\d+)(\.(\d+))?)((@sha)?.*)?$'
31+
32+
- applicationName: 'elasticsearch'
33+
detectionRegex: 'docker\.elastic\.co\/elasticsearch\/elasticsearch:'
34+
versionRegex: '(:(v)?(\d+)\.(\d+)(\.(\d+))?)((@sha)?.*)?$'
35+

charts/keepup-helm-scraper/templates/cronjob.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,16 @@ spec:
1818
- name: helm-scraper
1919
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
2020
imagePullPolicy: "{{ .Values.image.pullPolicy }}"
21-
{{- if .Values.env }}
2221
env:
2322
{{- range $name, $value := .Values.env }}
2423
- name: {{ $name }}
2524
value: {{ $value }}
2625
{{- end }}
27-
{{- end }}
26+
volumeMounts:
27+
- name: config
28+
mountPath: "{{ .Values.env.RULES_FILE }}"
29+
subPath: rules.yaml
30+
volumes:
31+
- name: config
32+
configMap:
33+
name: {{ .Release.Name }}

charts/keepup-helm-scraper/values.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@ image:
44
pullPolicy: IfNotPresent
55

66
cronjob:
7-
schedule: "0 */12 * * *"
7+
schedule: "0 */3 * * *"
88
restartPolicy: Never
99

1010
rbac:
1111
create: true
1212

1313
env:
1414
CLUSTER_NAME: ''
15-
API_URL: ''
1615
API_TOKEN: ''
16+
API_URL: ''
17+
APP_ENV: prod
18+
RULES_FILE: /config/rules.yaml

0 commit comments

Comments
 (0)