Skip to content

Commit 0d620b9

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1978 from SaschaSchwarze0/sascha-update-k8s
Update Kubernetes dependency and test matrix
2 parents 1c3ddef + 30286c9 commit 0d620b9

File tree

688 files changed

+54027
-12705
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

688 files changed

+54027
-12705
lines changed

‎.github/workflows/ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ jobs:
7878
matrix:
7979
compat:
8080
# oldest supported Kubernetes and Tekton LTS that exists at the time of our planned next release
81-
- kubernetes: v1.30.10
82-
tekton: v0.62.9
81+
- kubernetes: v1.31.9
82+
tekton: v0.65.7
8383
# newest supported Kubernetes and Tekton LTS that exists at the time of our planned next release
84-
- kubernetes: v1.33.0
84+
- kubernetes: v1.33.1
8585
tekton: v1.3.1 # RETAIN-COMMENT: TEKTON_NEWEST_LTS
8686
max-parallel: 4
8787
runs-on: ubuntu-latest
@@ -105,7 +105,7 @@ jobs:
105105
- name: Create kind cluster
106106
uses: helm/kind-action@v1
107107
with:
108-
version: v0.27.0
108+
version: v0.29.0
109109
node_image: kindest/node:${{ matrix.compat.kubernetes }}
110110
cluster_name: kind
111111
wait: 120s
@@ -157,10 +157,10 @@ jobs:
157157
matrix:
158158
compat:
159159
# oldest supported Kubernetes and Tekton LTS that exists at the time of our planned next release
160-
- kubernetes: v1.30.10
161-
tekton: v0.62.9
160+
- kubernetes: v1.31.9
161+
tekton: v0.65.7
162162
# newest supported Kubernetes and Tekton LTS that exists at the time of our planned next release
163-
- kubernetes: v1.33.0
163+
- kubernetes: v1.33.1
164164
tekton: v1.3.1 # RETAIN-COMMENT: TEKTON_NEWEST_LTS
165165
max-parallel: 4
166166
runs-on: oracle-vm-16cpu-64gb-x86-64
@@ -180,7 +180,7 @@ jobs:
180180
- name: Create kind cluster
181181
uses: helm/kind-action@v1
182182
with:
183-
version: v0.27.0
183+
version: v0.29.0
184184
node_image: kindest/node:${{ matrix.compat.kubernetes }}
185185
cluster_name: kind
186186
config: test/kind/config_three_node.yaml

‎HACK.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ In the near future, the above would be setup by the controller.
4141
make clean && make build
4242
```
4343

44-
* This project uses Golang 1.24 and controller-gen v0.17.3.
44+
* This project uses Golang 1.24 and controller-gen v0.18.0.
4545
* The controllers create/watch Tekton objects.
4646

4747
# Testing

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,12 +219,12 @@ To find out more on what's the best strategy or what else can Shipwright do for
219219
220220
| Dependency | Supported versions |
221221
|--------------------------------------|------------------------------|
222-
| [Kubernetes](https://kubernetes.io/) | v1.30.\*, v1.31.\*, v1.32.\*, v1.33.\* |
223-
| [Tekton](https://tekton.dev) | v0.62.\*, v0.65.\*, v0.68.\*, v1.0.\* |
222+
| [Kubernetes](https://kubernetes.io/) | v1.31.\*, v1.32.\*, v1.33.\* |
223+
| [Tekton](https://tekton.dev) | v0.65.\*, v0.68.\*, v1.0.\*, v1.3.\* |
224224
225225
### Platform support
226226
227-
We are building container images of the Shipwright Build controller for all platforms supported by the base image that we are using which is [registry.access.redhat.com/ubi9/ubi-minimal](https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/615bd9b4075b022acc111bf5). Those are:
227+
We are building container images of the Shipwright Build controller for all platforms supported by the base image that we are using which is [registry.access.redhat.com/ubi10/ubi-minimal](https://catalog.redhat.com/software/containers/ubi10/ubi-minimal/66f1504a379b9c2cf23e145c). Those are:
228228
229229
- linux/amd64
230230
- linux/arm64

‎deploy/crds/shipwright.io_buildruns.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.17.3
5+
controller-gen.kubebuilder.io/version: v0.18.0
66
name: buildruns.shipwright.io
77
spec:
88
conversion:
@@ -1574,7 +1574,7 @@ spec:
15741574
The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
15751575
The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
15761576
The volume will be mounted read-only (ro) and non-executable files (noexec).
1577-
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath).
1577+
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
15781578
The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
15791579
properties:
15801580
pullPolicy:
@@ -3709,7 +3709,7 @@ spec:
37093709
The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
37103710
The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
37113711
The volume will be mounted read-only (ro) and non-executable files (noexec).
3712-
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath).
3712+
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
37133713
The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
37143714
properties:
37153715
pullPolicy:
@@ -6066,7 +6066,7 @@ spec:
60666066
The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
60676067
The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
60686068
The volume will be mounted read-only (ro) and non-executable files (noexec).
6069-
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath).
6069+
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
60706070
The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
60716071
properties:
60726072
pullPolicy:
@@ -8632,7 +8632,7 @@ spec:
86328632
The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
86338633
The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
86348634
The volume will be mounted read-only (ro) and non-executable files (noexec).
8635-
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath).
8635+
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
86368636
The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
86378637
properties:
86388638
pullPolicy:
@@ -10834,7 +10834,7 @@ spec:
1083410834
The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
1083510835
The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
1083610836
The volume will be mounted read-only (ro) and non-executable files (noexec).
10837-
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath).
10837+
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
1083810838
The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
1083910839
properties:
1084010840
pullPolicy:
@@ -13199,7 +13199,7 @@ spec:
1319913199
The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
1320013200
The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
1320113201
The volume will be mounted read-only (ro) and non-executable files (noexec).
13202-
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath).
13202+
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
1320313203
The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
1320413204
properties:
1320513205
pullPolicy:

‎deploy/crds/shipwright.io_builds.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.17.3
5+
controller-gen.kubebuilder.io/version: v0.18.0
66
name: builds.shipwright.io
77
spec:
88
conversion:
@@ -1550,7 +1550,7 @@ spec:
15501550
The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
15511551
The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
15521552
The volume will be mounted read-only (ro) and non-executable files (noexec).
1553-
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath).
1553+
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
15541554
The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
15551555
properties:
15561556
pullPolicy:
@@ -3974,7 +3974,7 @@ spec:
39743974
The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
39753975
The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
39763976
The volume will be mounted read-only (ro) and non-executable files (noexec).
3977-
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath).
3977+
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
39783978
The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
39793979
properties:
39803980
pullPolicy:

‎deploy/crds/shipwright.io_buildstrategies.yaml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.17.3
5+
controller-gen.kubebuilder.io/version: v0.18.0
66
name: buildstrategies.shipwright.io
77
spec:
88
conversion:
@@ -225,7 +225,7 @@ spec:
225225
Cannot be updated.
226226
items:
227227
description: EnvFromSource represents the source of a set
228-
of ConfigMaps
228+
of ConfigMaps or Secrets
229229
properties:
230230
configMapRef:
231231
description: The ConfigMap to select from
@@ -246,8 +246,8 @@ spec:
246246
type: object
247247
x-kubernetes-map-type: atomic
248248
prefix:
249-
description: An optional identifier to prepend to each
250-
key in the ConfigMap. Must be a C_IDENTIFIER.
249+
description: Optional text to prepend to the name of each
250+
environment variable. Must be a C_IDENTIFIER.
251251
type: string
252252
secretRef:
253253
description: The Secret to select from
@@ -510,6 +510,12 @@ spec:
510510
- port
511511
type: object
512512
type: object
513+
stopSignal:
514+
description: |-
515+
StopSignal defines which signal will be sent to a container when it is being stopped.
516+
If not specified, the default is defined by the container runtime in use.
517+
StopSignal can only be set for Pods with a non-empty .spec.os.name
518+
type: string
513519
type: object
514520
livenessProbe:
515521
description: |-
@@ -2460,7 +2466,7 @@ spec:
24602466
The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
24612467
The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
24622468
The volume will be mounted read-only (ro) and non-executable files (noexec).
2463-
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath).
2469+
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
24642470
The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
24652471
properties:
24662472
pullPolicy:
@@ -4855,7 +4861,7 @@ spec:
48554861
The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
48564862
The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
48574863
The volume will be mounted read-only (ro) and non-executable files (noexec).
4858-
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath).
4864+
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
48594865
The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
48604866
properties:
48614867
pullPolicy:

‎deploy/crds/shipwright.io_clusterbuildstrategies.yaml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.17.3
5+
controller-gen.kubebuilder.io/version: v0.18.0
66
name: clusterbuildstrategies.shipwright.io
77
spec:
88
conversion:
@@ -225,7 +225,7 @@ spec:
225225
Cannot be updated.
226226
items:
227227
description: EnvFromSource represents the source of a set
228-
of ConfigMaps
228+
of ConfigMaps or Secrets
229229
properties:
230230
configMapRef:
231231
description: The ConfigMap to select from
@@ -246,8 +246,8 @@ spec:
246246
type: object
247247
x-kubernetes-map-type: atomic
248248
prefix:
249-
description: An optional identifier to prepend to each
250-
key in the ConfigMap. Must be a C_IDENTIFIER.
249+
description: Optional text to prepend to the name of each
250+
environment variable. Must be a C_IDENTIFIER.
251251
type: string
252252
secretRef:
253253
description: The Secret to select from
@@ -510,6 +510,12 @@ spec:
510510
- port
511511
type: object
512512
type: object
513+
stopSignal:
514+
description: |-
515+
StopSignal defines which signal will be sent to a container when it is being stopped.
516+
If not specified, the default is defined by the container runtime in use.
517+
StopSignal can only be set for Pods with a non-empty .spec.os.name
518+
type: string
513519
type: object
514520
livenessProbe:
515521
description: |-
@@ -2460,7 +2466,7 @@ spec:
24602466
The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
24612467
The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
24622468
The volume will be mounted read-only (ro) and non-executable files (noexec).
2463-
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath).
2469+
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
24642470
The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
24652471
properties:
24662472
pullPolicy:
@@ -4855,7 +4861,7 @@ spec:
48554861
The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
48564862
The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
48574863
The volume will be mounted read-only (ro) and non-executable files (noexec).
4858-
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath).
4864+
Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
48594865
The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
48604866
properties:
48614867
pullPolicy:

0 commit comments

Comments
 (0)