Skip to content

Commit 2a66d13

Browse files
oliverbaehleroliverbaehler
authored
feat: bump kubernetes 1.34 (#237)
* feat: bump kubernetes 1.34 Signed-off-by: Oliver Bähler <[email protected]> * feat: bump kubernetes 1.34 Signed-off-by: Oliver Bähler <[email protected]> * feat: bump kubernetes 1.34 Signed-off-by: Oliver Bähler <[email protected]> * feat: bump kubernetes 1.34 Signed-off-by: Oliver Bähler <[email protected]> --------- Signed-off-by: Oliver Bähler <[email protected]>
1 parent 7128571 commit 2a66d13

35 files changed

+604
-1995
lines changed

‎.goreleaser.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ release:
4343
>
4444
> | Kubernetes version | Minimum required |
4545
> |--------------------|------------------|
46-
> | `v1.33` | `>= 1.33.0` |
46+
> | `v1.34` | `>= 1.34.0` |
4747
checksum:
4848
name_template: 'checksums.txt'
4949
changelog:

‎Makefile‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ IMG ?= $(IMG_BASE):$(VERSION)
1818
FULL_IMG ?= $(REGISTRY)/$(IMG_BASE)
1919

2020
## Kubernetes Version Support
21-
KUBERNETES_SUPPORTED_VERSION ?= v1.33.0
21+
KUBERNETES_SUPPORTED_VERSION ?= v1.34.0
2222

2323
## Tool Binaries
2424
KUBECTL ?= kubectl
@@ -154,19 +154,19 @@ docker:
154154
####################
155155
# -- Install E2E Tools
156156
####################
157-
K3S_CLUSTER ?= "capsule-argo-addon"
157+
CLUSTER_NAME ?= "capsule-argo-addon"
158158

159159
e2e: e2e-build e2e-exec e2e-destroy
160160

161161
e2e-build: kind
162-
$(KIND) create cluster --wait=60s --name $(K3S_CLUSTER) --config ./e2e/kind.yaml --image=kindest/node:$(KUBERNETES_SUPPORTED_VERSION)
162+
$(KIND) create cluster --wait=60s --name $(CLUSTER_NAME) --config ./e2e/kind.yaml --image=kindest/node:$(KUBERNETES_SUPPORTED_VERSION)
163163
$(MAKE) e2e-install
164164

165165
e2e-exec: ginkgo
166166
$(GINKGO) -r -vv ./e2e
167167

168168
e2e-destroy: kind
169-
$(KIND) delete cluster --name $(K3S_CLUSTER)
169+
$(KIND) delete cluster --name $(CLUSTER_NAME)
170170

171171
e2e-install: e2e-install-distro e2e-install-addon
172172

@@ -194,9 +194,8 @@ e2e-install-distro:
194194
@$(MAKE) wait-for-helmreleases
195195

196196
.PHONY: e2e-load-image
197-
e2e-load-image:
198-
kind load docker-image --name $(K3S_CLUSTER) $(FULL_IMG):$(VERSION)
199-
197+
e2e-load-image: kind
198+
$(KIND) load docker-image --name $(CLUSTER_NAME) $(FULL_IMG):$(VERSION)
200199

201200
wait-for-helmreleases:
202201
@ echo "Waiting for all HelmReleases to have observedGeneration >= 0..."
@@ -283,7 +282,7 @@ helm-doc:
283282
# -- Tools
284283
####################
285284
CONTROLLER_GEN := $(LOCALBIN)/controller-gen
286-
CONTROLLER_GEN_VERSION ?= v0.18.0
285+
CONTROLLER_GEN_VERSION ?= v0.19.0
287286
CONTROLLER_GEN_LOOKUP := kubernetes-sigs/controller-tools
288287
controller-gen:
289288
@test -s $(CONTROLLER_GEN) && $(CONTROLLER_GEN) --version | grep -q $(CONTROLLER_GEN_VERSION) || \

‎api/v1alpha1/argotranslator_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
package v1alpha1
55

66
import (
7-
argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
7+
argocdv1alpha1 "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
88
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
99
)
1010

‎charts/capsule-argo-addon/README.md‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,15 @@ The following Values are available for this chart.
3131
| Key | Type | Default | Description |
3232
|-----|------|---------|-------------|
3333
| global.jobs.kubectl.affinity | object | `{}` | Set affinity rules |
34-
| global.jobs.kubectl.annotations | object | `{}` | Annotations to add to the certgen job. |
34+
| global.jobs.kubectl.annotations | object | `{}` | Annotations to add to the job. |
3535
| global.jobs.kubectl.image.pullPolicy | string | `"IfNotPresent"` | Set the image pull policy of the helm chart job |
3636
| global.jobs.kubectl.image.registry | string | `"docker.io"` | Set the image repository of the helm chart job |
3737
| global.jobs.kubectl.image.repository | string | `"clastix/kubectl"` | Set the image repository of the helm chart job |
3838
| global.jobs.kubectl.image.tag | string | `""` | Set the image tag of the helm chart job |
39+
| global.jobs.kubectl.labels | object | `{}` | Labels to add to the job. |
3940
| global.jobs.kubectl.nodeSelector | object | `{}` | Set the node selector |
41+
| global.jobs.kubectl.podAnnotations | object | `{}` | Annotations to add to the job pod |
42+
| global.jobs.kubectl.podLabels | object | `{}` | Labels to add to the job pod |
4043
| global.jobs.kubectl.podSecurityContext | object | `{"seccompProfile":{"type":"RuntimeDefault"}}` | Security context for the job pods. |
4144
| global.jobs.kubectl.priorityClassName | string | `""` | Set a pod priorityClassName |
4245
| global.jobs.kubectl.resources | object | `{}` | Job resources |
@@ -115,12 +118,13 @@ Deploy a dedicated [capsule-proxy](https://artifacthub.io/packages/helm/projectc
115118
| nameOverride | string | `""` | |
116119
| nodeSelector | object | `{}` | Set the node selector |
117120
| podAnnotations | object | `{}` | Annotations to add |
121+
| podLabels | object | `{}` | Annotations to add |
118122
| podSecurityContext | object | `{"seccompProfile":{"type":"RuntimeDefault"}}` | Set the securityContext |
119123
| priorityClassName | string | `""` | Set the priority class name of the Capsule pod |
120124
| rbac.enabled | bool | `true` | Enable bootstraping of RBAC resources |
121125
| readinessProbe | object | `{"httpGet":{"path":"/readyz","port":10080}}` | Configure the readiness probe using Deployment probe spec |
122126
| replicaCount | int | `1` | Amount of replicas |
123-
| resources | object | `{"limits":{"cpu":"200m","memory":"128Mi"},"requests":{"cpu":"100m","memory":"128Mi"}}` | Set the resource requests/limits |
127+
| resources | object | `{}` | Set the resource requests/limits |
124128
| securityContext | object | `{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]},"readOnlyRootFilesystem":true,"runAsNonRoot":true,"runAsUser":1000}` | Set the securityContext for the container |
125129
| serviceAccount.annotations | object | `{}` | Annotations to add to the service account. |
126130
| serviceAccount.create | bool | `true` | Specifies whether a service account should be created. |

‎charts/capsule-argo-addon/ci/test-values.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ proxy:
33
crds:
44
install: true
55
image:
6+
tag: 0.0.0
67
pullPolicy: Never

‎charts/capsule-argo-addon/ci/webhook-values.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
webhooks:
22
enabled: true
3+
image:
4+
tag: 0.0.0
5+
pullPolicy: Never

‎charts/capsule-argo-addon/crds/addons.projectcapsule.dev_argoaddons.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.18.0
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: argoaddons.addons.projectcapsule.dev
88
spec:
99
group: addons.projectcapsule.dev

‎charts/capsule-argo-addon/crds/addons.projectcapsule.dev_argotranslators.yaml‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.18.0
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: argotranslators.addons.projectcapsule.dev
88
spec:
99
group: addons.projectcapsule.dev
@@ -217,6 +217,7 @@ spec:
217217
type: array
218218
description:
219219
description: Description contains optional project description
220+
maxLength: 255
220221
type: string
221222
destinationServiceAccounts:
222223
description: DestinationServiceAccounts holds information
@@ -416,6 +417,11 @@ spec:
416417
and attributes that are used to assign the syncWindows
417418
to apps
418419
properties:
420+
andOperator:
421+
description: UseAndOperator use AND operator for
422+
matching applications, namespaces and clusters
423+
instead of the default OR operator
424+
type: boolean
419425
applications:
420426
description: Applications contains a list of applications
421427
that the window will apply to
@@ -428,6 +434,11 @@ spec:
428434
items:
429435
type: string
430436
type: array
437+
description:
438+
description: Description of the sync that will be
439+
applied to the schedule, can be used to add any
440+
information such as a ticket number for example
441+
type: string
431442
duration:
432443
description: Duration is the amount of time the
433444
sync window will be open
@@ -599,6 +610,7 @@ spec:
599610
description:
600611
description: Description contains optional project
601612
description
613+
maxLength: 255
602614
type: string
603615
destinationServiceAccounts:
604616
description: DestinationServiceAccounts holds information
@@ -806,6 +818,11 @@ spec:
806818
duration and attributes that are used to assign
807819
the syncWindows to apps
808820
properties:
821+
andOperator:
822+
description: UseAndOperator use AND operator
823+
for matching applications, namespaces and
824+
clusters instead of the default OR operator
825+
type: boolean
809826
applications:
810827
description: Applications contains a list
811828
of applications that the window will apply
@@ -819,6 +836,12 @@ spec:
819836
items:
820837
type: string
821838
type: array
839+
description:
840+
description: Description of the sync that
841+
will be applied to the schedule, can be
842+
used to add any information such as a ticket
843+
number for example
844+
type: string
822845
duration:
823846
description: Duration is the amount of time
824847
the sync window will be open

‎charts/capsule-argo-addon/templates/crd-lifecycle/job.yaml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,36 @@ metadata:
88
# create hook dependencies in the right order
99
"helm.sh/hook-weight": "-1"
1010
{{- include "crds.annotations" . | nindent 4 }}
11+
{{- with .Values.global.jobs.kubectl.annotations }}
12+
{{- toYaml . | nindent 4 }}
13+
{{- end }}
1114
labels:
1215
app.kubernetes.io/component: {{ include "crds.component" . | quote }}
1316
{{- include "helm.labels" . | nindent 4 }}
17+
{{- with .Values.global.jobs.kubectl.labels }}
18+
{{- toYaml . | nindent 4 }}
19+
{{- end }}
1420
spec:
1521
ttlSecondsAfterFinished: {{ .Values.global.jobs.kubectl.ttlSecondsAfterFinished }}
1622
template:
1723
metadata:
1824
name: "{{ include "crds.name" . }}"
25+
annotations:
26+
{{- with .Values.global.jobs.kubectl.podAnnotations }}
27+
{{- toYaml . | nindent 8 }}
28+
{{- end }}
29+
{{- with .Values.podAnnotations }}
30+
{{- toYaml . | nindent 8 }}
31+
{{- end }}
1932
labels:
2033
app.kubernetes.io/component: {{ include "crds.component" . | quote }}
2134
{{- include "helm.selectorLabels" . | nindent 8 }}
35+
{{- with .Values.global.jobs.kubectl.podLabels }}
36+
{{- toYaml . | nindent 8 }}
37+
{{- end }}
38+
{{- with .Values.podLabels }}
39+
{{- toYaml . | nindent 8 }}
40+
{{- end }}
2241
spec:
2342
restartPolicy: {{ $.Values.global.jobs.kubectl.restartPolicy }}
2443
{{- with $.Values.global.jobs.kubectl.podSecurityContext }}

‎charts/capsule-argo-addon/templates/deployment.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ spec:
1717
{{- end }}
1818
labels:
1919
{{- include "helm.selectorLabels" . | nindent 8 }}
20+
{{- with .Values.podLabels }}
21+
{{- toYaml . | nindent 8 }}
22+
{{- end }}
2023
spec:
2124
{{- if .Values.webhooks.enabled }}
2225
volumes:

0 commit comments

Comments
 (0)