Merge branch 'main' into awf-hpa

This commit is contained in:
Aikawa 2023-04-24 09:42:08 +09:00 committed by GitHub
commit 94de8c35bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 19 additions and 10 deletions

View file

@ -1,6 +1,8 @@
<!--
Note on DCO: Note on DCO:
If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the *Details* link next to the DCO action for instructions on how to resolve this. If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the *Details* link next to the DCO action for instructions on how to resolve this.
-->
Checklist: Checklist:
@ -11,4 +13,4 @@ Checklist:
* [ ] I have signed off all my commits as required by [DCO](https://github.com/argoproj/argoproj/blob/master/community/CONTRIBUTING.md). * [ ] I have signed off all my commits as required by [DCO](https://github.com/argoproj/argoproj/blob/master/community/CONTRIBUTING.md).
* [ ] My build is green ([troubleshooting builds](https://argo-cd.readthedocs.io/en/stable/developer-guide/ci/)). * [ ] My build is green ([troubleshooting builds](https://argo-cd.readthedocs.io/en/stable/developer-guide/ci/)).
Changes are automatically published when merged to `main`. They are not published on branches. <!-- Changes are automatically published when merged to `main`. They are not published on branches. -->

View file

@ -2,7 +2,7 @@ apiVersion: v2
name: argocd-image-updater name: argocd-image-updater
description: A Helm chart for Argo CD Image Updater, a tool to automatically update the container images of Kubernetes workloads which are managed by Argo CD description: A Helm chart for Argo CD Image Updater, a tool to automatically update the container images of Kubernetes workloads which are managed by Argo CD
type: application type: application
version: 0.8.5 version: 0.9.0
appVersion: v0.12.2 appVersion: v0.12.2
home: https://github.com/argoproj-labs/argocd-image-updater home: https://github.com/argoproj-labs/argocd-image-updater
icon: https://argocd-image-updater.readthedocs.io/en/stable/assets/logo.png icon: https://argocd-image-updater.readthedocs.io/en/stable/assets/logo.png
@ -15,5 +15,5 @@ maintainers:
url: https://argoproj.github.io/ url: https://argoproj.github.io/
annotations: annotations:
artifacthub.io/changes: | artifacthub.io/changes: |
- kind: changed - kind: fixed
description: Added support for pod labels description: add namespace field for namespace scoped resources

View file

@ -5,6 +5,7 @@ metadata:
labels: labels:
{{- include "argocd-image-updater.labels" . | nindent 4 }} {{- include "argocd-image-updater.labels" . | nindent 4 }}
name: argocd-image-updater-authscripts name: argocd-image-updater-authscripts
namespace: {{ .Release.Namespace | quote }}
data: data:
{{- toYaml .Values.authScripts.scripts | nindent 2}} {{- toYaml .Values.authScripts.scripts | nindent 2}}
{{- end }} {{- end }}

View file

@ -4,6 +4,7 @@ metadata:
labels: labels:
{{- include "argocd-image-updater.labels" . | nindent 4 }} {{- include "argocd-image-updater.labels" . | nindent 4 }}
name: argocd-image-updater-ssh-config name: argocd-image-updater-ssh-config
namespace: {{ .Release.Namespace | quote }}
data: data:
{{- with .Values.config.sshConfig }} {{- with .Values.config.sshConfig }}
{{- toYaml . | nindent 2 }} {{- toYaml . | nindent 2 }}

View file

@ -5,6 +5,7 @@ metadata:
labels: labels:
{{- include "argocd-image-updater.labels" . | nindent 4 }} {{- include "argocd-image-updater.labels" . | nindent 4 }}
name: argocd-image-updater-config name: argocd-image-updater-config
namespace: {{ .Release.Namespace | quote }}
data: data:
{{- with .Values.config.applicationsAPIKind }} {{- with .Values.config.applicationsAPIKind }}
applications_api: {{ . }} applications_api: {{ . }}

View file

@ -2,6 +2,7 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: {{ include "argocd-image-updater.fullname" . }} name: {{ include "argocd-image-updater.fullname" . }}
namespace: {{ .Release.Namespace | quote }}
labels: labels:
{{- include "argocd-image-updater.labels" . | nindent 4 }} {{- include "argocd-image-updater.labels" . | nindent 4 }}
spec: spec:
@ -21,7 +22,7 @@ spec:
labels: labels:
{{- with .Values.podLabels }} {{- with .Values.podLabels }}
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
{{- include "argocd-image-updater.selectorLabels" . | nindent 8 }} {{- include "argocd-image-updater.selectorLabels" . | nindent 8 }}
spec: spec:
{{- with .Values.imagePullSecrets }} {{- with .Values.imagePullSecrets }}

View file

@ -14,6 +14,7 @@ metadata:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
name: {{ include "argocd-image-updater.fullname" . }}-metrics name: {{ include "argocd-image-updater.fullname" . }}-metrics
namespace: {{ .Release.Namespace | quote }}
spec: spec:
ports: ports:
- name: metrics - name: metrics

View file

@ -5,7 +5,8 @@ kind: Role
metadata: metadata:
labels: labels:
{{ include "argocd-image-updater.labels" . | nindent 4 }} {{ include "argocd-image-updater.labels" . | nindent 4 }}
name: {{ include "argocd-image-updater.fullname" . }} name: {{ include "argocd-image-updater.fullname" . }}
namespace: {{ .Release.Namespace | quote }}
rules: rules:
- apiGroups: - apiGroups:
- '' - ''
@ -45,4 +46,5 @@ roleRef:
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: {{ include "argocd-image-updater.serviceAccountName" . }} name: {{ include "argocd-image-updater.serviceAccountName" . }}
namespace: {{ .Release.Namespace | quote }}
{{- end }} {{- end }}

View file

@ -3,9 +3,10 @@ apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:
name: argocd-image-updater-secret name: argocd-image-updater-secret
namespace: {{ .Release.Namespace | quote }}
labels: labels:
{{- include "argocd-image-updater.labels" . | nindent 4 }} {{- include "argocd-image-updater.labels" . | nindent 4 }}
type: Opaque type: Opaque
data: data:
argocd.token: {{ .Values.config.argocd.token | b64enc }} argocd.token: {{ .Values.config.argocd.token | b64enc }}
{{- end }} {{- end }}

View file

@ -3,6 +3,7 @@ apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
name: {{ include "argocd-image-updater.serviceAccountName" . }} name: {{ include "argocd-image-updater.serviceAccountName" . }}
namespace: {{ .Release.Namespace | quote }}
labels: labels:
{{- include "argocd-image-updater.labels" . | nindent 4 }} {{- include "argocd-image-updater.labels" . | nindent 4 }}
{{- with .Values.serviceAccount.annotations }} {{- with .Values.serviceAccount.annotations }}

View file

@ -3,9 +3,7 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor kind: ServiceMonitor
metadata: metadata:
name: {{ include "argocd-image-updater.fullname" . }}-metrics name: {{ include "argocd-image-updater.fullname" . }}-metrics
{{- with .Values.metrics.serviceMonitor.namespace }} namespace: {{ default .Release.Namespace .Values.metrics.serviceMonitor.namespace | quote }}
namespace: {{ . }}
{{- end }}
labels: labels:
{{- include "argocd-image-updater.labels" . | nindent 4 }} {{- include "argocd-image-updater.labels" . | nindent 4 }}
{{- with .Values.metrics.serviceMonitor.selector }} {{- with .Values.metrics.serviceMonitor.selector }}