From 18e95cfc1826718bb6cf0e456d14b3a6fa1c7c36 Mon Sep 17 00:00:00 2001 From: Igor Vinokur Date: Tue, 14 May 2024 09:40:47 +0000 Subject: [PATCH] regenerate CRDs Signed-off-by: Igor Vinokur --- .../devworkspaceoperatorconfig_types.go | 1 + .../v1alpha1/zz_generated.deepcopy.go | 22 ++++++++++++++++++- controllers/workspace/http.go | 3 ++- ...evfile.io_devworkspaceoperatorconfigs.yaml | 13 +++++++++++ deploy/deployment/kubernetes/combined.yaml | 15 +++++++++++++ ...r.devfile.io.CustomResourceDefinition.yaml | 15 +++++++++++++ deploy/deployment/openshift/combined.yaml | 15 +++++++++++++ ...r.devfile.io.CustomResourceDefinition.yaml | 15 +++++++++++++ ...evfile.io_devworkspaceoperatorconfigs.yaml | 15 +++++++++++++ 9 files changed, 112 insertions(+), 2 deletions(-) diff --git a/apis/controller/v1alpha1/devworkspaceoperatorconfig_types.go b/apis/controller/v1alpha1/devworkspaceoperatorconfig_types.go index 608529636..fdc075315 100644 --- a/apis/controller/v1alpha1/devworkspaceoperatorconfig_types.go +++ b/apis/controller/v1alpha1/devworkspaceoperatorconfig_types.go @@ -17,6 +17,7 @@ package v1alpha1 import ( "fmt" + dw "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" 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/controllers/workspace/http.go b/controllers/workspace/http.go index d301103c4..4736905ae 100644 --- a/controllers/workspace/http.go +++ b/controllers/workspace/http.go @@ -17,11 +17,12 @@ import ( "context" "crypto/tls" "crypto/x509" - "k8s.io/apimachinery/pkg/types" "net/http" "net/url" "time" + "k8s.io/apimachinery/pkg/types" + controller "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1" "github.com/go-logr/logr" diff --git a/deploy/bundle/manifests/controller.devfile.io_devworkspaceoperatorconfigs.yaml b/deploy/bundle/manifests/controller.devfile.io_devworkspaceoperatorconfigs.yaml index 091f804cb..2f5d8625e 100644 --- a/deploy/bundle/manifests/controller.devfile.io_devworkspaceoperatorconfigs.yaml +++ b/deploy/bundle/manifests/controller.devfile.io_devworkspaceoperatorconfigs.yaml @@ -55,6 +55,19 @@ 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 into the HTTP client. + properties: + name: + description: Name is the name of the configmap + type: string + namespace: + description: Namespace is the namespace of the configmap + 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..69ef21d06 100644 --- a/deploy/deployment/kubernetes/combined.yaml +++ b/deploy/deployment/kubernetes/combined.yaml @@ -91,6 +91,21 @@ 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 into the HTTP + client. + properties: + name: + description: Name is the name of the configmap + type: string + namespace: + description: Namespace is the namespace of the configmap + 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..1a05fb642 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,21 @@ 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 into the HTTP + client. + properties: + name: + description: Name is the name of the configmap + type: string + namespace: + description: Namespace is the namespace of the configmap + 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..7c2ad6ba2 100644 --- a/deploy/deployment/openshift/combined.yaml +++ b/deploy/deployment/openshift/combined.yaml @@ -91,6 +91,21 @@ 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 into the HTTP + client. + properties: + name: + description: Name is the name of the configmap + type: string + namespace: + description: Namespace is the namespace of the configmap + 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..1a05fb642 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,21 @@ 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 into the HTTP + client. + properties: + name: + description: Name is the name of the configmap + type: string + namespace: + description: Namespace is the namespace of the configmap + 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..9a7271e85 100644 --- a/deploy/templates/crd/bases/controller.devfile.io_devworkspaceoperatorconfigs.yaml +++ b/deploy/templates/crd/bases/controller.devfile.io_devworkspaceoperatorconfigs.yaml @@ -90,6 +90,21 @@ 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 into the HTTP + client. + properties: + name: + description: Name is the name of the configmap + type: string + namespace: + description: Namespace is the namespace of the configmap + type: string + required: + - name + - namespace + type: object type: object workspace: description: Workspace defines configuration options related to how