Skip to content

Reverting Module CRD from using OCIArtifacts to DockerfileConfigMap #1162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions api/v1beta1/module_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,6 @@ type Build struct {
// ConfigMap that holds Dockerfile contents
DockerfileConfigMap *v1.LocalObjectReference `json:"dockerfileConfigMap"`

// +optional
// DockerfileOCIArtifact specifies an OCI artifact that contains the dockerfile
// used to build the kernel module container image.
DockerfileOCIArtifact string `json:"dockerfileOCIArtifact"`

// +optional
// BaseImageRegistryTLS contains settings determining how to access registries of the base images in the build-process' Dockerfile.
BaseImageRegistryTLS TLSOptions `json:"baseImageRegistryTLS,omitempty"`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2521,11 +2521,6 @@ spec:
type: string
type: object
x-kubernetes-map-type: atomic
dockerfileOCIArtifact:
description: |-
DockerfileOCIArtifact specifies an OCI artifact that contains the dockerfile
used to build the kernel module container image.
type: string
kanikoParams:
description: KanikoParams is used to customize the
building process of the image.
Expand Down Expand Up @@ -2653,11 +2648,6 @@ spec:
type: string
type: object
x-kubernetes-map-type: atomic
dockerfileOCIArtifact:
description: |-
DockerfileOCIArtifact specifies an OCI artifact that contains the dockerfile
used to build the kernel module container image.
type: string
kanikoParams:
description: KanikoParams is used to customize
the building process of the image.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,6 @@ spec:
type: string
type: object
x-kubernetes-map-type: atomic
dockerfileOCIArtifact:
description: |-
DockerfileOCIArtifact specifies an OCI artifact that contains the dockerfile
used to build the kernel module container image.
type: string
kanikoParams:
description: KanikoParams is used to customize the building
process of the image.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,6 @@ spec:
type: string
type: object
x-kubernetes-map-type: atomic
dockerfileOCIArtifact:
description: |-
DockerfileOCIArtifact specifies an OCI artifact that contains the dockerfile
used to build the kernel module container image.
type: string
kanikoParams:
description: KanikoParams is used to customize the building
process of the image.
Expand Down
10 changes: 0 additions & 10 deletions config/crd-hub/bases/kmm.sigs.x-k8s.io_modules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2502,11 +2502,6 @@ spec:
type: string
type: object
x-kubernetes-map-type: atomic
dockerfileOCIArtifact:
description: |-
DockerfileOCIArtifact specifies an OCI artifact that contains the dockerfile
used to build the kernel module container image.
type: string
kanikoParams:
description: KanikoParams is used to customize the building
process of the image.
Expand Down Expand Up @@ -2631,11 +2626,6 @@ spec:
type: string
type: object
x-kubernetes-map-type: atomic
dockerfileOCIArtifact:
description: |-
DockerfileOCIArtifact specifies an OCI artifact that contains the dockerfile
used to build the kernel module container image.
type: string
kanikoParams:
description: KanikoParams is used to customize the
building process of the image.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,6 @@ spec:
type: string
type: object
x-kubernetes-map-type: atomic
dockerfileOCIArtifact:
description: |-
DockerfileOCIArtifact specifies an OCI artifact that contains the dockerfile
used to build the kernel module container image.
type: string
kanikoParams:
description: KanikoParams is used to customize the building
process of the image.
Expand Down
5 changes: 0 additions & 5 deletions config/crd/bases/kmm.sigs.x-k8s.io_moduleimagesconfigs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,6 @@ spec:
type: string
type: object
x-kubernetes-map-type: atomic
dockerfileOCIArtifact:
description: |-
DockerfileOCIArtifact specifies an OCI artifact that contains the dockerfile
used to build the kernel module container image.
type: string
kanikoParams:
description: KanikoParams is used to customize the building
process of the image.
Expand Down
10 changes: 0 additions & 10 deletions config/crd/bases/kmm.sigs.x-k8s.io_modules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2502,11 +2502,6 @@ spec:
type: string
type: object
x-kubernetes-map-type: atomic
dockerfileOCIArtifact:
description: |-
DockerfileOCIArtifact specifies an OCI artifact that contains the dockerfile
used to build the kernel module container image.
type: string
kanikoParams:
description: KanikoParams is used to customize the building
process of the image.
Expand Down Expand Up @@ -2631,11 +2626,6 @@ spec:
type: string
type: object
x-kubernetes-map-type: atomic
dockerfileOCIArtifact:
description: |-
DockerfileOCIArtifact specifies an OCI artifact that contains the dockerfile
used to build the kernel module container image.
type: string
kanikoParams:
description: KanikoParams is used to customize the
building process of the image.
Expand Down