diff --git a/apis/controller/v1alpha1/zz_generated.deepcopy.go b/apis/controller/v1alpha1/zz_generated.deepcopy.go index 21a926fd4..27098c33d 100644 --- a/apis/controller/v1alpha1/zz_generated.deepcopy.go +++ b/apis/controller/v1alpha1/zz_generated.deepcopy.go @@ -22,7 +22,7 @@ package v1alpha1 import ( "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2" - v1 "k8s.io/api/core/v1" + "k8s.io/api/core/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) @@ -47,6 +47,21 @@ func (in Attributes) DeepCopy() Attributes { return *out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ConfigmapReference) DeepCopyInto(out *ConfigmapReference) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConfigmapReference. +func (in *ConfigmapReference) DeepCopy() *ConfigmapReference { + if in == nil { + return nil + } + out := new(ConfigmapReference) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *DevWorkspaceOperatorConfig) DeepCopyInto(out *DevWorkspaceOperatorConfig) { *out = *in @@ -529,6 +544,11 @@ func (in *RoutingConfig) DeepCopyInto(out *RoutingConfig) { *out = new(Proxy) (*in).DeepCopyInto(*out) } + if in.TLSCertificateConfigmapRef != nil { + in, out := &in.TLSCertificateConfigmapRef, &out.TLSCertificateConfigmapRef + *out = new(ConfigmapReference) + **out = **in + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RoutingConfig. diff --git a/deploy/bundle/manifests/controller.devfile.io_devworkspaceoperatorconfigs.yaml b/deploy/bundle/manifests/controller.devfile.io_devworkspaceoperatorconfigs.yaml index 091f804cb..d883710a7 100644 --- a/deploy/bundle/manifests/controller.devfile.io_devworkspaceoperatorconfigs.yaml +++ b/deploy/bundle/manifests/controller.devfile.io_devworkspaceoperatorconfigs.yaml @@ -55,6 +55,17 @@ spec: description: NoProxy is a comma-separated list of hostnames and/or CIDRs for which the proxy should not be used. Ignored when HttpProxy and HttpsProxy are unset. To ignore automatically detected proxy settings for the cluster, set this field to an empty string ("") type: string type: object + tlsCertificateConfigmapRef: + description: TLSCertificateConfigmapRef defines the name and namespace of the configmap with a certificate to inject to http client. + properties: + name: + type: string + namespace: + type: string + required: + - name + - namespace + type: object type: object workspace: description: Workspace defines configuration options related to how DevWorkspaces are managed diff --git a/deploy/deployment/kubernetes/combined.yaml b/deploy/deployment/kubernetes/combined.yaml index 3ce2527cb..dfcbb64a7 100644 --- a/deploy/deployment/kubernetes/combined.yaml +++ b/deploy/deployment/kubernetes/combined.yaml @@ -91,6 +91,18 @@ spec: to an empty string ("") type: string type: object + tlsCertificateConfigmapRef: + description: TLSCertificateConfigmapRef defines the name and namespace + of the configmap with a certificate to inject to http client. + properties: + name: + type: string + namespace: + type: string + required: + - name + - namespace + type: object type: object workspace: description: Workspace defines configuration options related to how diff --git a/deploy/deployment/kubernetes/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml b/deploy/deployment/kubernetes/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml index 96aabf07f..bc52891bb 100644 --- a/deploy/deployment/kubernetes/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml +++ b/deploy/deployment/kubernetes/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml @@ -91,6 +91,18 @@ spec: to an empty string ("") type: string type: object + tlsCertificateConfigmapRef: + description: TLSCertificateConfigmapRef defines the name and namespace + of the configmap with a certificate to inject to http client. + properties: + name: + type: string + namespace: + type: string + required: + - name + - namespace + type: object type: object workspace: description: Workspace defines configuration options related to how diff --git a/deploy/deployment/openshift/combined.yaml b/deploy/deployment/openshift/combined.yaml index 8bbf51097..8a7ddce39 100644 --- a/deploy/deployment/openshift/combined.yaml +++ b/deploy/deployment/openshift/combined.yaml @@ -91,6 +91,18 @@ spec: to an empty string ("") type: string type: object + tlsCertificateConfigmapRef: + description: TLSCertificateConfigmapRef defines the name and namespace + of the configmap with a certificate to inject to http client. + properties: + name: + type: string + namespace: + type: string + required: + - name + - namespace + type: object type: object workspace: description: Workspace defines configuration options related to how diff --git a/deploy/deployment/openshift/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml b/deploy/deployment/openshift/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml index 96aabf07f..bc52891bb 100644 --- a/deploy/deployment/openshift/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml +++ b/deploy/deployment/openshift/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml @@ -91,6 +91,18 @@ spec: to an empty string ("") type: string type: object + tlsCertificateConfigmapRef: + description: TLSCertificateConfigmapRef defines the name and namespace + of the configmap with a certificate to inject to http client. + properties: + name: + type: string + namespace: + type: string + required: + - name + - namespace + type: object type: object workspace: description: Workspace defines configuration options related to how diff --git a/deploy/templates/crd/bases/controller.devfile.io_devworkspaceoperatorconfigs.yaml b/deploy/templates/crd/bases/controller.devfile.io_devworkspaceoperatorconfigs.yaml index a29fff8d8..3adbd4312 100644 --- a/deploy/templates/crd/bases/controller.devfile.io_devworkspaceoperatorconfigs.yaml +++ b/deploy/templates/crd/bases/controller.devfile.io_devworkspaceoperatorconfigs.yaml @@ -90,6 +90,18 @@ spec: to an empty string ("") type: string type: object + tlsCertificateConfigmapRef: + description: TLSCertificateConfigmapRef defines the name and namespace + of the configmap with a certificate to inject to http client. + properties: + name: + type: string + namespace: + type: string + required: + - name + - namespace + type: object type: object workspace: description: Workspace defines configuration options related to how