diff --git a/api/v2/checluster_types.go b/api/v2/checluster_types.go index b2ee3256f..6497ff7ec 100644 --- a/api/v2/checluster_types.go +++ b/api/v2/checluster_types.go @@ -205,9 +205,9 @@ type CheClusterDevEnvironments struct { // here will not trigger workspace failures. // +optional IgnoredUnrecoverableEvents []string `json:"ignoredUnrecoverableEvents,omitempty"` - // AllowedSource defines the allowed sources on which workspaces can be started. + // AllowedSources defines the allowed sources on which workspaces can be started. // +optional - AllowedSource AllowedSources `json:"allowedSource,omitempty"` + AllowedSources *AllowedSources `json:"allowedSources,omitempty"` } // Che components configuration. @@ -830,7 +830,9 @@ type KubeRbacProxy struct { type AllowedSources struct { // The list of approved URLs for starting Cloud Development Environments (CDEs). CDEs can only be - // initiated from these URLs. + // initiated from these URLs. Wildcards `*` are supported in URLs, allowing flexible matching for + // specific URL patterns. For instance, `https://example.com/*` would allow CDEs to be initiated + // from any path within 'example.com'. // +optional Urls []string `json:"urls,omitempty"` } diff --git a/api/v2/zz_generated.deepcopy.go b/api/v2/zz_generated.deepcopy.go index 25cdecf65..81521752e 100644 --- a/api/v2/zz_generated.deepcopy.go +++ b/api/v2/zz_generated.deepcopy.go @@ -339,7 +339,11 @@ func (in *CheClusterDevEnvironments) DeepCopyInto(out *CheClusterDevEnvironments *out = make([]string, len(*in)) copy(*out, *in) } - in.AllowedSource.DeepCopyInto(&out.AllowedSource) + if in.AllowedSources != nil { + in, out := &in.AllowedSources, &out.AllowedSources + *out = new(AllowedSources) + (*in).DeepCopyInto(*out) + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CheClusterDevEnvironments. diff --git a/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml b/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml index 8a1a96fed..615052283 100644 --- a/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml +++ b/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml @@ -104,7 +104,7 @@ metadata: operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/eclipse-che/che-operator support: Eclipse Foundation - name: eclipse-che.v7.92.0-884.next + name: eclipse-che.v7.92.0-885.next namespace: placeholder spec: apiservicedefinitions: {} @@ -1035,7 +1035,7 @@ spec: minKubeVersion: 1.19.0 provider: name: Eclipse Foundation - version: 7.92.0-884.next + version: 7.92.0-885.next webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/bundle/next/eclipse-che/manifests/org.eclipse.che_checlusters.yaml b/bundle/next/eclipse-che/manifests/org.eclipse.che_checlusters.yaml index 7a0bf4bc7..2c3304909 100644 --- a/bundle/next/eclipse-che/manifests/org.eclipse.che_checlusters.yaml +++ b/bundle/next/eclipse-che/manifests/org.eclipse.che_checlusters.yaml @@ -5190,14 +5190,16 @@ spec: pvcStrategy: per-user description: Development environment default configuration options. properties: - allowedSource: - description: AllowedSource defines the allowed sources on which + allowedSources: + description: AllowedSources defines the allowed sources on which workspaces can be started. properties: urls: description: |- The list of approved URLs for starting Cloud Development Environments (CDEs). CDEs can only be - initiated from these URLs. + initiated from these URLs. Wildcards `*` are supported in URLs, allowing flexible matching for + specific URL patterns. For instance, `https://example.com/*` would allow CDEs to be initiated + from any path within 'example.com'. items: type: string type: array diff --git a/config/crd/bases/org.eclipse.che_checlusters.yaml b/config/crd/bases/org.eclipse.che_checlusters.yaml index e2d2cbdee..f05dac85e 100644 --- a/config/crd/bases/org.eclipse.che_checlusters.yaml +++ b/config/crd/bases/org.eclipse.che_checlusters.yaml @@ -5148,14 +5148,16 @@ spec: pvcStrategy: per-user description: Development environment default configuration options. properties: - allowedSource: - description: AllowedSource defines the allowed sources on which + allowedSources: + description: AllowedSources defines the allowed sources on which workspaces can be started. properties: urls: description: |- The list of approved URLs for starting Cloud Development Environments (CDEs). CDEs can only be - initiated from these URLs. + initiated from these URLs. Wildcards `*` are supported in URLs, allowing flexible matching for + specific URL patterns. For instance, `https://example.com/*` would allow CDEs to be initiated + from any path within 'example.com'. items: type: string type: array diff --git a/deploy/deployment/kubernetes/combined.yaml b/deploy/deployment/kubernetes/combined.yaml index ce115ddc3..fcd1f1c28 100644 --- a/deploy/deployment/kubernetes/combined.yaml +++ b/deploy/deployment/kubernetes/combined.yaml @@ -5169,14 +5169,16 @@ spec: pvcStrategy: per-user description: Development environment default configuration options. properties: - allowedSource: - description: AllowedSource defines the allowed sources on which + allowedSources: + description: AllowedSources defines the allowed sources on which workspaces can be started. properties: urls: description: |- The list of approved URLs for starting Cloud Development Environments (CDEs). CDEs can only be - initiated from these URLs. + initiated from these URLs. Wildcards `*` are supported in URLs, allowing flexible matching for + specific URL patterns. For instance, `https://example.com/*` would allow CDEs to be initiated + from any path within 'example.com'. items: type: string type: array diff --git a/deploy/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml b/deploy/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml index 0fc48da8f..e96f99fdb 100644 --- a/deploy/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml +++ b/deploy/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml @@ -5164,14 +5164,16 @@ spec: pvcStrategy: per-user description: Development environment default configuration options. properties: - allowedSource: - description: AllowedSource defines the allowed sources on which + allowedSources: + description: AllowedSources defines the allowed sources on which workspaces can be started. properties: urls: description: |- The list of approved URLs for starting Cloud Development Environments (CDEs). CDEs can only be - initiated from these URLs. + initiated from these URLs. Wildcards `*` are supported in URLs, allowing flexible matching for + specific URL patterns. For instance, `https://example.com/*` would allow CDEs to be initiated + from any path within 'example.com'. items: type: string type: array diff --git a/deploy/deployment/openshift/combined.yaml b/deploy/deployment/openshift/combined.yaml index d35405533..6c21ff276 100644 --- a/deploy/deployment/openshift/combined.yaml +++ b/deploy/deployment/openshift/combined.yaml @@ -5169,14 +5169,16 @@ spec: pvcStrategy: per-user description: Development environment default configuration options. properties: - allowedSource: - description: AllowedSource defines the allowed sources on which + allowedSources: + description: AllowedSources defines the allowed sources on which workspaces can be started. properties: urls: description: |- The list of approved URLs for starting Cloud Development Environments (CDEs). CDEs can only be - initiated from these URLs. + initiated from these URLs. Wildcards `*` are supported in URLs, allowing flexible matching for + specific URL patterns. For instance, `https://example.com/*` would allow CDEs to be initiated + from any path within 'example.com'. items: type: string type: array diff --git a/deploy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml b/deploy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml index 35310306e..678d54e0f 100644 --- a/deploy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml +++ b/deploy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml @@ -5164,14 +5164,16 @@ spec: pvcStrategy: per-user description: Development environment default configuration options. properties: - allowedSource: - description: AllowedSource defines the allowed sources on which + allowedSources: + description: AllowedSources defines the allowed sources on which workspaces can be started. properties: urls: description: |- The list of approved URLs for starting Cloud Development Environments (CDEs). CDEs can only be - initiated from these URLs. + initiated from these URLs. Wildcards `*` are supported in URLs, allowing flexible matching for + specific URL patterns. For instance, `https://example.com/*` would allow CDEs to be initiated + from any path within 'example.com'. items: type: string type: array diff --git a/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml b/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml index 0fc48da8f..e96f99fdb 100644 --- a/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml +++ b/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml @@ -5164,14 +5164,16 @@ spec: pvcStrategy: per-user description: Development environment default configuration options. properties: - allowedSource: - description: AllowedSource defines the allowed sources on which + allowedSources: + description: AllowedSources defines the allowed sources on which workspaces can be started. properties: urls: description: |- The list of approved URLs for starting Cloud Development Environments (CDEs). CDEs can only be - initiated from these URLs. + initiated from these URLs. Wildcards `*` are supported in URLs, allowing flexible matching for + specific URL patterns. For instance, `https://example.com/*` would allow CDEs to be initiated + from any path within 'example.com'. items: type: string type: array