Skip to content

Commit 8ccb27d

Browse files
authored
chore(appset/templates): remove annotations from GitHub and GitLab templates (#252)
* chore(appset/templates): remove annotations from GitHub and GitLab templates * chore(projects/values): add default empty list for destinationServiceAccounts spec * chore(docs): update prerequisites for Kubernetes, ArgoCD, and HELM versions * chore(chart): update version and kubeVersion, refine annotations in Chart.yaml * chore(workflows): update kubectl and node image versions for compatibility * chore(docs): update Kubernetes cluster version requirement to >= 1.31
1 parent 8aea8be commit 8ccb27d

File tree

7 files changed

+16
-16
lines changed

7 files changed

+16
-16
lines changed

.github/workflows/charts.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ jobs:
111111
- name: Create k8s Kind Cluster
112112
uses: helm/kind-action@v1.13.0
113113
with:
114-
kubectl_version: v1.30.4 # Ensure compatibility with the latest APIs
115-
node_image: kindest/node:v1.30.4 # Match node version with kubectl for consistency
114+
kubectl_version: v1.33.7 # Ensure compatibility with the latest APIs
115+
node_image: kindest/node:v1.33.7 # Match node version with kubectl for consistency
116116
- name: Checkout
117117
uses: actions/checkout@v6
118118
- name: Run K8s test

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ This helm chart implements Pull Request generator of ApplicationSet, it uses API
1212

1313
Services that should already be installed and/or running.
1414

15-
- Kubernetes Cluster >= 1.28
16-
- [ArgoCD ApplicationSet Controller](https://argo-cd.readthedocs.io/en/stable/user-guide/application-set/) >= v2.5.8
17-
- [HELM](https://helm.sh/docs/intro/install/) >= v3.9
15+
- Kubernetes Cluster >= 1.31
16+
- [ArgoCD ApplicationSet Controller](https://argo-cd.readthedocs.io/en/stable/user-guide/application-set/) >= v2.13
17+
- [HELM](https://helm.sh/docs/intro/install/) >= v3.10
1818

1919
## Deployment
2020

charts/applicationset/Chart.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ apiVersion: v2
22
name: argocd-applicationsets-services
33
description: A Helm chart for ArgoCD ApplicationSets, a declarative, GitOps continuous delivery tool for Kubernetes
44
type: application
5-
version: &version "0.16.1"
5+
version: &version "0.17.1"
66
appVersion: *version
7-
kubeVersion: ">= 1.28"
7+
kubeVersion: ">= 1.31"
88
home: https://github.com/saidsef/argocd-applicationsets-services
99
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
1010
keywords:
@@ -24,7 +24,11 @@ annotations:
2424
artifacthub.io/license: "Apache-2.0"
2525
artifacthub.io/changes: |
2626
- kind: added
27-
description: Added github appSecretName field to support GitHub App authentication.
27+
description: A§dd destinationServiceAccounts to project values.
28+
- kind: changed
29+
description: Moved annotations related references to chart values global annotations.
30+
- kind: changed
31+
description: Updated readme to note minimum requirements for Kubernetes and ArgoCD versions.
2832
artifacthub.io/links: |
2933
- name: README
3034
url: https://raw.githubusercontent.com/saidsef/argocd-applicationsets-services/main/README.md

charts/applicationset/templates/github-pr.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,6 @@ spec:
5858
app.kubernetes.io/branch: {{ trunc 63 $branchSlug | trimSuffix "-" }}
5959
app.kubernetes.io/created-by: 'applicationset'
6060
annotations:
61-
argocd-image-updater.argoproj.io/force-update: 'true'
62-
argocd-image-updater.argoproj.io/update-strategy: 'latest'
63-
argocd-image-updater.argoproj.io/write-back-method: 'argocd'
64-
argocd.argoproj.io/application-set-refresh: 'true'
6561
argocd.argoproj.io/head: {{ $headShortSha }}
6662
link.argocd.argoproj.io/external-link: '{{ $pr }}/{{ $github.owner }}/{{or $repo.name $repo.path}}/pull/{{ $dqf }}number{{ $dqb }}'
6763
{{- with $globals.annotations }}

charts/applicationset/templates/gitlab-mr.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,6 @@ spec:
5454
app.kubernetes.io/branch: {{ trunc 63 $branchSlug | trimSuffix "-" }}
5555
app.kubernetes.io/created-by: 'applicationset'
5656
annotations:
57-
argocd-image-updater.argoproj.io/force-update: 'true'
58-
argocd-image-updater.argoproj.io/update-strategy: 'latest'
59-
argocd-image-updater.argoproj.io/write-back-method: 'argocd'
60-
argocd.argoproj.io/application-set-refresh: 'true'
6157
argocd.argoproj.io/head: {{ $headShortSha }}
6258
link.argocd.argoproj.io/external-link: '{{ $gitlab.api }}/{{ $gitlab.group }}/{{or $repo.name $repo.path}}/-/merge_requests/{{ $dqf }}number{{ $dqb }}'
6359
{{- with $globals.annotations }}

charts/applicationset/templates/projects.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ spec:
1616
{{- toYaml .Values.project.clusterResourceBlacklist | nindent 4 }}
1717
clusterResourceWhitelist:
1818
{{- toYaml .Values.project.clusterResourceWhitelist | nindent 4 }}
19+
destinationServiceAccounts:
20+
{{- toYaml .Values.project.destinationServiceAccounts | nindent 4 }}
1921
destinations:
2022
{{- toYaml .Values.project.destinations | nindent 4 }}
2123
namespaceResourceBlacklist:

charts/applicationset/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ project:
5757
- namespace: 'previews'
5858
server: '*'
5959
name: '*'
60+
# -- No destination service accounts by default
61+
destinationServiceAccounts: []
6062
# -- Allow all namespaced-scoped resources to be created, except for AppProject
6163
namespaceResourceBlacklist:
6264
- group: 'argoproj.io'

0 commit comments

Comments
 (0)