chore: goreleaser process

ZEISS · Jul 2, 2024 · 805ca82 · 805ca82
1 parent 0fda860
commit 805ca82
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 17 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -62,7 +62,7 @@ dockers:
       - --platform=linux/amd64
       - --label=org.opencontainers.image.title={{ .ProjectName }}-accounts
       - --label=org.opencontainers.image.description={{ .ProjectName }}
-      - --label=org.opencontainers.image.url=https://github.com/zeiss/{{ .ProjectName }}
+      - --label=org.opencontainers.image.url=https://github.com/zeiss/{{ .ProjectName }}/typhoon/accounts
       - --label=org.opencontainers.image.source=https://github.com/zeiss/{{ .ProjectName }}
       - --label=org.opencontainers.image.version={{ .Version }}
       - --label=org.opencontainers.image.created={{ time "2006-01-02T15:04:05Z07:00" }}
@@ -76,16 +76,15 @@ dockers:
     goos: linux
     goarch: arm64
     build_flag_templates:
-      - --platform=linux/amd64
+      - --platform=linux/arm64
       - --label=org.opencontainers.image.title={{ .ProjectName }}-accounts
       - --label=org.opencontainers.image.description={{ .ProjectName }}
-      - --label=org.opencontainers.image.url=https://github.com/zeiss/{{ .ProjectName }}
+      - --label=org.opencontainers.image.url=https://github.com/zeiss/{{ .ProjectName }}/typhoon/accounts
       - --label=org.opencontainers.image.source=https://github.com/zeiss/{{ .ProjectName }}
       - --label=org.opencontainers.image.version={{ .Version }}
       - --label=org.opencontainers.image.created={{ time "2006-01-02T15:04:05Z07:00" }}
       - --label=org.opencontainers.image.revision={{ .FullCommit }}
       - --label=org.opencontainers.image.licenses=Apache-2.0
-
   - image_templates: [
       "ghcr.io/zeiss/{{ .ProjectName }}/web:{{ .Version }}-amd64"
     ]
@@ -94,10 +93,10 @@ dockers:
     goos: linux
     goarch: amd64
     build_flag_templates:
-      - --platform=linux/amd64
+      - --platform=linux/arm64
       - --label=org.opencontainers.image.title={{ .ProjectName }}-web
       - --label=org.opencontainers.image.description={{ .ProjectName }}
-      - --label=org.opencontainers.image.url=https://github.com/zeiss/{{ .ProjectName }}
+      - --label=org.opencontainers.image.url=https://github.com/zeiss/{{ .ProjectName }}/typhoon/web
       - --label=org.opencontainers.image.source=https://github.com/zeiss/{{ .ProjectName }}
       - --label=org.opencontainers.image.version={{ .Version }}
       - --label=org.opencontainers.image.created={{ time "2006-01-02T15:04:05Z07:00" }}
@@ -111,16 +110,27 @@ dockers:
     goos: linux
     goarch: arm64
     build_flag_templates:
-      - --platform=linux/amd64
+      - --platform=linux/arm64
       - --label=org.opencontainers.image.title={{ .ProjectName }}-web
       - --label=org.opencontainers.image.description={{ .ProjectName }}
-      - --label=org.opencontainers.image.url=https://github.com/zeiss/{{ .ProjectName }}
+      - --label=org.opencontainers.image.url=https://github.com/zeiss/{{ .ProjectName }}/typhoon/web
       - --label=org.opencontainers.image.source=https://github.com/zeiss/{{ .ProjectName }}
       - --label=org.opencontainers.image.version={{ .Version }}
       - --label=org.opencontainers.image.created={{ time "2006-01-02T15:04:05Z07:00" }}
       - --label=org.opencontainers.image.revision={{ .FullCommit }}
       - --label=org.opencontainers.image.licenses=Apache-2.0
 
+docker_manifests:
+  - name_template: "ghcr.io/zeiss/{{ .ProjectName }}/web:{{ .Version }}"
+    image_templates:
+      - 'ghcr.io/zeiss/{{ .ProjectName }}/web:{{ .Version }}-amd64'
+      - 'ghcr.io/zeiss/{{ .ProjectName }}/web:{{ .Version }}-arm64'
+  - name_template: "ghcr.io/zeiss/{{ .ProjectName }}/accounts:{{ .Version }}"
+    image_templates:
+      - 'ghcr.io/zeiss/{{ .ProjectName }}/accounts:{{ .Version }}-amd64'
+      - 'ghcr.io/zeiss/{{ .ProjectName }}/accounts:{{ .Version }}-arm64'
+
+
 gomod:
   proxy: true
 
@@ -148,4 +158,4 @@ changelog:
     exclude:
       - "^docs:"
       - typo
-      - (?i)foo
+      - (?i)foo
diff --git a/helm/charts/typhoon-accounting/Chart.yaml b/helm/charts/typhoon-accounting/Chart.yaml
@@ -1,12 +1,12 @@
 apiVersion: v2
-appVersion: 0.0.0
+appVersion: 0.1.27
 description: A Helm chart for the Typhoon accounting
 name: typhoon-accounting
 keywords:
 - messaging
 - jwt
 - auth
-version: 0.0.0
+version: 0.1.27
 sources:
 - https://github.com/zeiss/typhoon
 home: http://github.com/zeiss/typhoon
diff --git a/helm/charts/typhoon-accounting/templates/deployment.yaml b/helm/charts/typhoon-accounting/templates/deployment.yaml
@@ -21,9 +21,6 @@ spec:
       {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
-        prometheus.io/scrape: "true"
-        prometheus.io/path: /metrics
-        prometheus.io/port: "{{ (split ":" .Values.telemetry.metrics.addr)._1 }}"
       labels:
         {{- include "typhoon.selectorLabels" . | nindent 8 }}
     spec:
@@ -116,4 +113,4 @@ spec:
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
-      {{- end }}
+      {{- end }}
diff --git a/helm/charts/typhoon-accounting/values.yaml b/helm/charts/typhoon-accounting/values.yaml
@@ -55,7 +55,7 @@ service:
 
 database:
   prefix: typhoon_
-  uri: postgres://craig:Q7gc8rEdS@zanzibar-cockroachdb-public:26257/defaultdb?sslmode=allow
+  uri:
   uriSecret:
   maxCacheSize:
   maxOpenConns:
@@ -114,4 +114,4 @@ migrate:
     helm.sh/hook-weight: "-5"
     helm.sh/hook-delete-policy: "before-hook-creation"
   labels: {}
-  timeout:
+  timeout: