Skip to content

Commit a5e13e4

Browse files
TomerNewmank8s-ci-robot
TomerNewman
authored and
k8s-ci-robot
committed
Reverting Module CRD change from using OCIArtifacts to DockerfileConfigMap
Because we will not use OCIArtifacts with Shipwright for build and sign, We can revert KMM to use configmap to store the dockerfile.
1 parent b817750 commit a5e13e4

8 files changed

+0
-55
lines changed

‎api/v1beta1/module_types.go‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,6 @@ type Build struct {
5252
// ConfigMap that holds Dockerfile contents
5353
DockerfileConfigMap *v1.LocalObjectReference `json:"dockerfileConfigMap"`
5454

55-
// +optional
56-
// DockerfileOCIArtifact specifies an OCI artifact that contains the dockerfile
57-
// used to build the kernel module container image.
58-
DockerfileOCIArtifact string `json:"dockerfileOCIArtifact"`
59-
6055
// +optional
6156
// BaseImageRegistryTLS contains settings determining how to access registries of the base images in the build-process' Dockerfile.
6257
BaseImageRegistryTLS TLSOptions `json:"baseImageRegistryTLS,omitempty"`

‎config/crd-hub/bases/hub.kmm.sigs.x-k8s.io_managedclustermodules.yaml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2521,11 +2521,6 @@ spec:
25212521
type: string
25222522
type: object
25232523
x-kubernetes-map-type: atomic
2524-
dockerfileOCIArtifact:
2525-
description: |-
2526-
DockerfileOCIArtifact specifies an OCI artifact that contains the dockerfile
2527-
used to build the kernel module container image.
2528-
type: string
25292524
kanikoParams:
25302525
description: KanikoParams is used to customize the
25312526
building process of the image.
@@ -2653,11 +2648,6 @@ spec:
26532648
type: string
26542649
type: object
26552650
x-kubernetes-map-type: atomic
2656-
dockerfileOCIArtifact:
2657-
description: |-
2658-
DockerfileOCIArtifact specifies an OCI artifact that contains the dockerfile
2659-
used to build the kernel module container image.
2660-
type: string
26612651
kanikoParams:
26622652
description: KanikoParams is used to customize
26632653
the building process of the image.

‎config/crd-hub/bases/kmm.sigs.x-k8s.io_modulebuildsignconfigs.yaml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,6 @@ spec:
118118
type: string
119119
type: object
120120
x-kubernetes-map-type: atomic
121-
dockerfileOCIArtifact:
122-
description: |-
123-
DockerfileOCIArtifact specifies an OCI artifact that contains the dockerfile
124-
used to build the kernel module container image.
125-
type: string
126121
kanikoParams:
127122
description: KanikoParams is used to customize the building
128123
process of the image.

‎config/crd-hub/bases/kmm.sigs.x-k8s.io_moduleimagesconfigs.yaml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,6 @@ spec:
118118
type: string
119119
type: object
120120
x-kubernetes-map-type: atomic
121-
dockerfileOCIArtifact:
122-
description: |-
123-
DockerfileOCIArtifact specifies an OCI artifact that contains the dockerfile
124-
used to build the kernel module container image.
125-
type: string
126121
kanikoParams:
127122
description: KanikoParams is used to customize the building
128123
process of the image.

‎config/crd-hub/bases/kmm.sigs.x-k8s.io_modules.yaml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2502,11 +2502,6 @@ spec:
25022502
type: string
25032503
type: object
25042504
x-kubernetes-map-type: atomic
2505-
dockerfileOCIArtifact:
2506-
description: |-
2507-
DockerfileOCIArtifact specifies an OCI artifact that contains the dockerfile
2508-
used to build the kernel module container image.
2509-
type: string
25102505
kanikoParams:
25112506
description: KanikoParams is used to customize the building
25122507
process of the image.
@@ -2631,11 +2626,6 @@ spec:
26312626
type: string
26322627
type: object
26332628
x-kubernetes-map-type: atomic
2634-
dockerfileOCIArtifact:
2635-
description: |-
2636-
DockerfileOCIArtifact specifies an OCI artifact that contains the dockerfile
2637-
used to build the kernel module container image.
2638-
type: string
26392629
kanikoParams:
26402630
description: KanikoParams is used to customize the
26412631
building process of the image.

‎config/crd/bases/kmm.sigs.x-k8s.io_modulebuildsignconfigs.yaml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,6 @@ spec:
118118
type: string
119119
type: object
120120
x-kubernetes-map-type: atomic
121-
dockerfileOCIArtifact:
122-
description: |-
123-
DockerfileOCIArtifact specifies an OCI artifact that contains the dockerfile
124-
used to build the kernel module container image.
125-
type: string
126121
kanikoParams:
127122
description: KanikoParams is used to customize the building
128123
process of the image.

‎config/crd/bases/kmm.sigs.x-k8s.io_moduleimagesconfigs.yaml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,6 @@ spec:
118118
type: string
119119
type: object
120120
x-kubernetes-map-type: atomic
121-
dockerfileOCIArtifact:
122-
description: |-
123-
DockerfileOCIArtifact specifies an OCI artifact that contains the dockerfile
124-
used to build the kernel module container image.
125-
type: string
126121
kanikoParams:
127122
description: KanikoParams is used to customize the building
128123
process of the image.

‎config/crd/bases/kmm.sigs.x-k8s.io_modules.yaml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2502,11 +2502,6 @@ spec:
25022502
type: string
25032503
type: object
25042504
x-kubernetes-map-type: atomic
2505-
dockerfileOCIArtifact:
2506-
description: |-
2507-
DockerfileOCIArtifact specifies an OCI artifact that contains the dockerfile
2508-
used to build the kernel module container image.
2509-
type: string
25102505
kanikoParams:
25112506
description: KanikoParams is used to customize the building
25122507
process of the image.
@@ -2631,11 +2626,6 @@ spec:
26312626
type: string
26322627
type: object
26332628
x-kubernetes-map-type: atomic
2634-
dockerfileOCIArtifact:
2635-
description: |-
2636-
DockerfileOCIArtifact specifies an OCI artifact that contains the dockerfile
2637-
used to build the kernel module container image.
2638-
type: string
26392629
kanikoParams:
26402630
description: KanikoParams is used to customize the
26412631
building process of the image.

0 commit comments

Comments
 (0)