Configurable default PVC size for common and per-workspace storage classes#827

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.

Sign up for GitHub

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

Merged
AObuchow merged 3 commits into from
May 27, 2022
Merged

Configurable default PVC size for common and per-workspace storage classes #827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c714b3a
feat: Configurable PVC size (fix #740)
AObuchow Apr 26, 2022
8c81e42
Generate config. option for configurable PVC size
AObuchow Apr 26, 2022
ac607df
feat: configmap option for perWorkspace PVC size
AObuchow May 13, 2022
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
16 changes: 15 additions & 1 deletion apis/controller/v1alpha1/devworkspaceoperatorconfig_types.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ package v1alpha1

import (
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand DownExpand Up@@ -67,6 +68,16 @@ type Proxy struct {
NoProxy string `json:"noProxy,omitempty"`
}

type StorageSizes struct {
Comment thread
AObuchow marked this conversation as resolved.
// The default Persistent Volume Claim size for the "common" storage class.
// Note that the "async" storage class also uses the PVC size set for the "common" storage class.
// If not specified, the "common" and "async" Persistent Volume Claim sizes are set to 10Gi
Common *resource.Quantity `json:"common,omitempty"`
// The default Persistent Volume Claim size for the "per-workspace" storage class.
// If not specified, the "per-workspace" Persistent Volume Claim size is set to 5Gi
PerWorkspace *resource.Quantity `json:"perWorkspace,omitempty"`
Comment thread
AObuchow marked this conversation as resolved.
}

type WorkspaceConfig struct {
// ImagePullPolicy defines the imagePullPolicy used for containers in a DevWorkspace
// For additional information, see Kubernetes documentation for imagePullPolicy. If
Expand All@@ -83,9 +94,12 @@ type WorkspaceConfig struct {
// +kubebuilder:validation:Pattern=^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
// +kubebuilder:validation:MaxLength=63
PVCName string `json:"pvcName,omitempty"`
// StorageClassName defines and optional storageClass to use for persistent
// StorageClassName defines an optional storageClass to use for persistent
// volume claims created to support DevWorkspaces
StorageClassName *string `json:"storageClassName,omitempty"`
// DefaultStorageSize defines an optional struct with fields to specify the sizes of Persistent Volume Claims for storage
// classes used by DevWorkspaces.
DefaultStorageSize *StorageSizes `json:"defaultStorageSize,omitempty"`
Comment thread
amisevsk marked this conversation as resolved.
// IdleTimeout determines how long a workspace should sit idle before being
// automatically scaled down. Proper functionality of this configuration property
// requires support in the workspace being started. If not specified, the default
Expand Down
30 changes: 30 additions & 0 deletions apis/controller/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 19 additions & 1 deletion deploy/bundle/manifests/controller.devfile.io_devworkspaceoperatorconfigs.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 27 additions & 1 deletion deploy/deployment/kubernetes/combined.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 27 additions & 1 deletion ...s/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 27 additions & 1 deletion deploy/deployment/openshift/combined.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 27 additions & 1 deletion ...t/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 27 additions & 1 deletion deploy/templates/crd/bases/controller.devfile.io_devworkspaceoperatorconfigs.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 11 additions & 4 deletions pkg/config/defaults.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ package config
import (
"github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
)

// defaultConfig represents the default configuration for the DevWorkspace Operator.
Expand All@@ -29,6 +30,10 @@ var defaultConfig = &v1alpha1.OperatorConfiguration{
Workspace: &v1alpha1.WorkspaceConfig{
ImagePullPolicy: "Always",
PVCName: "claim-devworkspace",
DefaultStorageSize: &v1alpha1.StorageSizes{
Common: &commonStorageSize,
PerWorkspace: &perWorkspaceStorageSize,
},
IdleTimeout: "15m",
ProgressTimeout: "5m",
CleanupOnStop: &boolFalse,
Expand All@@ -43,8 +48,10 @@ var defaultConfig = &v1alpha1.OperatorConfiguration{

// Necessary variables for setting pointer values
var (
boolTrue = true
boolFalse = false
int64UID = int64(1234)
int64GID = int64(0)
boolTrue = true
boolFalse = false
int64UID = int64(1234)
int64GID = int64(0)
commonStorageSize = resource.MustParse("10Gi")
perWorkspaceStorageSize = resource.MustParse("5Gi")
)
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Configurable default PVC size for common and per-workspace storage classes#827

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.

 Sign up for GitHub

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

 Merged

AObuchow
merged 3 commits into

from

May 27, 2022
 Merged


Configurable default PVC size for common and per-workspace storage classes
#827
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c714b3a

feat: Configurable PVC size (fix #740)


AObuchow Apr 26, 2022
8c81e42

Generate config. option for configurable PVC size


AObuchow Apr 26, 2022
ac607df

feat: configmap option for perWorkspace PVC size


AObuchow May 13, 2022

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


16 changes: 15 additions & 1 deletion
apis/controller/v1alpha1/devworkspaceoperatorconfig_types.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ package v1alpha1

import (
	corev1 "k8s.io/api/core/v1"
	"k8s.io/apimachinery/pkg/api/resource"
	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand DownExpand Up@@ -67,6 +68,16 @@ type Proxy struct {
	NoProxy string `json:"noProxy,omitempty"`
}

type StorageSizes struct {
Comment thread
AObuchow marked this conversation as resolved.

	// The default Persistent Volume Claim size for the "common" storage class.
	// Note that the "async" storage class also uses the PVC size set for the "common" storage class.
	// If not specified, the "common" and "async" Persistent Volume Claim sizes are set to 10Gi
	Common *resource.Quantity `json:"common,omitempty"`
	// The default Persistent Volume Claim size for the "per-workspace" storage class.
	// If not specified, the "per-workspace" Persistent Volume Claim size is set to 5Gi
	PerWorkspace *resource.Quantity `json:"perWorkspace,omitempty"`
Comment thread
AObuchow marked this conversation as resolved.

}

type WorkspaceConfig struct {
	// ImagePullPolicy defines the imagePullPolicy used for containers in a DevWorkspace
	// For additional information, see Kubernetes documentation for imagePullPolicy. If
Expand All@@ -83,9 +94,12 @@ type WorkspaceConfig struct {
	// +kubebuilder:validation:Pattern=^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
	// +kubebuilder:validation:MaxLength=63
	PVCName string `json:"pvcName,omitempty"`
	// StorageClassName defines and optional storageClass to use for persistent
	// StorageClassName defines an optional storageClass to use for persistent
	// volume claims created to support DevWorkspaces
	StorageClassName *string `json:"storageClassName,omitempty"`
	// DefaultStorageSize defines an optional struct with fields to specify the sizes of Persistent Volume Claims for storage
	// classes used by DevWorkspaces.
	DefaultStorageSize *StorageSizes `json:"defaultStorageSize,omitempty"`
Comment thread
amisevsk marked this conversation as resolved.

	// IdleTimeout determines how long a workspace should sit idle before being
	// automatically scaled down. Proper functionality of this configuration property
	// requires support in the workspace being started. If not specified, the default
Expand Down

30 changes: 30 additions & 0 deletions
apis/controller/v1alpha1/zz_generated.deepcopy.go

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


20 changes: 19 additions & 1 deletion
deploy/bundle/manifests/controller.devfile.io_devworkspaceoperatorconfigs.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
deploy/deployment/kubernetes/combined.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
...s/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
deploy/deployment/openshift/combined.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
...t/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
deploy/templates/crd/bases/controller.devfile.io_devworkspaceoperatorconfigs.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


15 changes: 11 additions & 4 deletions
pkg/config/defaults.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ package config
import (
	"github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
	corev1 "k8s.io/api/core/v1"
	"k8s.io/apimachinery/pkg/api/resource"
)

// defaultConfig represents the default configuration for the DevWorkspace Operator.
Expand All@@ -29,6 +30,10 @@ var defaultConfig = &v1alpha1.OperatorConfiguration{
	Workspace: &v1alpha1.WorkspaceConfig{
 ImagePullPolicy: "Always",
 PVCName: "claim-devworkspace",
 DefaultStorageSize: &v1alpha1.StorageSizes{
 Common: &commonStorageSize,
 PerWorkspace: &perWorkspaceStorageSize,
 },
 IdleTimeout: "15m",
 ProgressTimeout: "5m",
 CleanupOnStop: &boolFalse,
Expand All@@ -43,8 +48,10 @@ var defaultConfig = &v1alpha1.OperatorConfiguration{

// Necessary variables for setting pointer values
var (
	boolTrue = true
	boolFalse = false
	int64UID = int64(1234)
	int64GID = int64(0)
	boolTrue = true
	boolFalse = false
	int64UID = int64(1234)
	int64GID = int64(0)
	commonStorageSize = resource.MustParse("10Gi")
	perWorkspaceStorageSize = resource.MustParse("5Gi")
)
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Configurable default PVC size for common and per-workspace storage classes#827

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.

 Sign up for GitHub

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

 Merged

AObuchow
merged 3 commits into

from

May 27, 2022
 Merged


Configurable default PVC size for common and per-workspace storage classes
#827
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c714b3a

feat: Configurable PVC size (fix #740)


AObuchow Apr 26, 2022
8c81e42

Generate config. option for configurable PVC size


AObuchow Apr 26, 2022
ac607df

feat: configmap option for perWorkspace PVC size


AObuchow May 13, 2022

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


16 changes: 15 additions & 1 deletion
apis/controller/v1alpha1/devworkspaceoperatorconfig_types.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ package v1alpha1

import (
	corev1 "k8s.io/api/core/v1"
	"k8s.io/apimachinery/pkg/api/resource"
	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand DownExpand Up@@ -67,6 +68,16 @@ type Proxy struct {
	NoProxy string `json:"noProxy,omitempty"`
}

type StorageSizes struct {
Comment thread
AObuchow marked this conversation as resolved.

	// The default Persistent Volume Claim size for the "common" storage class.
	// Note that the "async" storage class also uses the PVC size set for the "common" storage class.
	// If not specified, the "common" and "async" Persistent Volume Claim sizes are set to 10Gi
	Common *resource.Quantity `json:"common,omitempty"`
	// The default Persistent Volume Claim size for the "per-workspace" storage class.
	// If not specified, the "per-workspace" Persistent Volume Claim size is set to 5Gi
	PerWorkspace *resource.Quantity `json:"perWorkspace,omitempty"`
Comment thread
AObuchow marked this conversation as resolved.

}

type WorkspaceConfig struct {
	// ImagePullPolicy defines the imagePullPolicy used for containers in a DevWorkspace
	// For additional information, see Kubernetes documentation for imagePullPolicy. If
Expand All@@ -83,9 +94,12 @@ type WorkspaceConfig struct {
	// +kubebuilder:validation:Pattern=^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
	// +kubebuilder:validation:MaxLength=63
	PVCName string `json:"pvcName,omitempty"`
	// StorageClassName defines and optional storageClass to use for persistent
	// StorageClassName defines an optional storageClass to use for persistent
	// volume claims created to support DevWorkspaces
	StorageClassName *string `json:"storageClassName,omitempty"`
	// DefaultStorageSize defines an optional struct with fields to specify the sizes of Persistent Volume Claims for storage
	// classes used by DevWorkspaces.
	DefaultStorageSize *StorageSizes `json:"defaultStorageSize,omitempty"`
Comment thread
amisevsk marked this conversation as resolved.

	// IdleTimeout determines how long a workspace should sit idle before being
	// automatically scaled down. Proper functionality of this configuration property
	// requires support in the workspace being started. If not specified, the default
Expand Down

30 changes: 30 additions & 0 deletions
apis/controller/v1alpha1/zz_generated.deepcopy.go

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


20 changes: 19 additions & 1 deletion
deploy/bundle/manifests/controller.devfile.io_devworkspaceoperatorconfigs.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
deploy/deployment/kubernetes/combined.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
...s/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
deploy/deployment/openshift/combined.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
...t/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
deploy/templates/crd/bases/controller.devfile.io_devworkspaceoperatorconfigs.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


15 changes: 11 additions & 4 deletions
pkg/config/defaults.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ package config
import (
	"github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
	corev1 "k8s.io/api/core/v1"
	"k8s.io/apimachinery/pkg/api/resource"
)

// defaultConfig represents the default configuration for the DevWorkspace Operator.
Expand All@@ -29,6 +30,10 @@ var defaultConfig = &v1alpha1.OperatorConfiguration{
	Workspace: &v1alpha1.WorkspaceConfig{
 ImagePullPolicy: "Always",
 PVCName: "claim-devworkspace",
 DefaultStorageSize: &v1alpha1.StorageSizes{
 Common: &commonStorageSize,
 PerWorkspace: &perWorkspaceStorageSize,
 },
 IdleTimeout: "15m",
 ProgressTimeout: "5m",
 CleanupOnStop: &boolFalse,
Expand All@@ -43,8 +48,10 @@ var defaultConfig = &v1alpha1.OperatorConfiguration{

// Necessary variables for setting pointer values
var (
	boolTrue = true
	boolFalse = false
	int64UID = int64(1234)
	int64GID = int64(0)
	boolTrue = true
	boolFalse = false
	int64UID = int64(1234)
	int64GID = int64(0)
	commonStorageSize = resource.MustParse("10Gi")
	perWorkspaceStorageSize = resource.MustParse("5Gi")
)
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Configurable default PVC size for common and per-workspace storage classes#827

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.

 Sign up for GitHub

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

 Merged

AObuchow
merged 3 commits into

from

May 27, 2022
 Merged


Configurable default PVC size for common and per-workspace storage classes
#827
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c714b3a

feat: Configurable PVC size (fix #740)


AObuchow Apr 26, 2022
8c81e42

Generate config. option for configurable PVC size


AObuchow Apr 26, 2022
ac607df

feat: configmap option for perWorkspace PVC size


AObuchow May 13, 2022

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


16 changes: 15 additions & 1 deletion
apis/controller/v1alpha1/devworkspaceoperatorconfig_types.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ package v1alpha1

import (
	corev1 "k8s.io/api/core/v1"
	"k8s.io/apimachinery/pkg/api/resource"
	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand DownExpand Up@@ -67,6 +68,16 @@ type Proxy struct {
	NoProxy string `json:"noProxy,omitempty"`
}

type StorageSizes struct {
Comment thread
AObuchow marked this conversation as resolved.

	// The default Persistent Volume Claim size for the "common" storage class.
	// Note that the "async" storage class also uses the PVC size set for the "common" storage class.
	// If not specified, the "common" and "async" Persistent Volume Claim sizes are set to 10Gi
	Common *resource.Quantity `json:"common,omitempty"`
	// The default Persistent Volume Claim size for the "per-workspace" storage class.
	// If not specified, the "per-workspace" Persistent Volume Claim size is set to 5Gi
	PerWorkspace *resource.Quantity `json:"perWorkspace,omitempty"`
Comment thread
AObuchow marked this conversation as resolved.

}

type WorkspaceConfig struct {
	// ImagePullPolicy defines the imagePullPolicy used for containers in a DevWorkspace
	// For additional information, see Kubernetes documentation for imagePullPolicy. If
Expand All@@ -83,9 +94,12 @@ type WorkspaceConfig struct {
	// +kubebuilder:validation:Pattern=^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
	// +kubebuilder:validation:MaxLength=63
	PVCName string `json:"pvcName,omitempty"`
	// StorageClassName defines and optional storageClass to use for persistent
	// StorageClassName defines an optional storageClass to use for persistent
	// volume claims created to support DevWorkspaces
	StorageClassName *string `json:"storageClassName,omitempty"`
	// DefaultStorageSize defines an optional struct with fields to specify the sizes of Persistent Volume Claims for storage
	// classes used by DevWorkspaces.
	DefaultStorageSize *StorageSizes `json:"defaultStorageSize,omitempty"`
Comment thread
amisevsk marked this conversation as resolved.

	// IdleTimeout determines how long a workspace should sit idle before being
	// automatically scaled down. Proper functionality of this configuration property
	// requires support in the workspace being started. If not specified, the default
Expand Down

30 changes: 30 additions & 0 deletions
apis/controller/v1alpha1/zz_generated.deepcopy.go

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


20 changes: 19 additions & 1 deletion
deploy/bundle/manifests/controller.devfile.io_devworkspaceoperatorconfigs.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
deploy/deployment/kubernetes/combined.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
...s/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
deploy/deployment/openshift/combined.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
...t/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
deploy/templates/crd/bases/controller.devfile.io_devworkspaceoperatorconfigs.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


15 changes: 11 additions & 4 deletions
pkg/config/defaults.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ package config
import (
	"github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
	corev1 "k8s.io/api/core/v1"
	"k8s.io/apimachinery/pkg/api/resource"
)

// defaultConfig represents the default configuration for the DevWorkspace Operator.
Expand All@@ -29,6 +30,10 @@ var defaultConfig = &v1alpha1.OperatorConfiguration{
	Workspace: &v1alpha1.WorkspaceConfig{
 ImagePullPolicy: "Always",
 PVCName: "claim-devworkspace",
 DefaultStorageSize: &v1alpha1.StorageSizes{
 Common: &commonStorageSize,
 PerWorkspace: &perWorkspaceStorageSize,
 },
 IdleTimeout: "15m",
 ProgressTimeout: "5m",
 CleanupOnStop: &boolFalse,
Expand All@@ -43,8 +48,10 @@ var defaultConfig = &v1alpha1.OperatorConfiguration{

// Necessary variables for setting pointer values
var (
	boolTrue = true
	boolFalse = false
	int64UID = int64(1234)
	int64GID = int64(0)
	boolTrue = true
	boolFalse = false
	int64UID = int64(1234)
	int64GID = int64(0)
	commonStorageSize = resource.MustParse("10Gi")
	perWorkspaceStorageSize = resource.MustParse("5Gi")
)
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Configurable default PVC size for common and per-workspace storage classes#827

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.

 Sign up for GitHub

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

 Merged

AObuchow
merged 3 commits into

from

May 27, 2022
 Merged


Configurable default PVC size for common and per-workspace storage classes
#827
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c714b3a

feat: Configurable PVC size (fix #740)


AObuchow Apr 26, 2022
8c81e42

Generate config. option for configurable PVC size


AObuchow Apr 26, 2022
ac607df

feat: configmap option for perWorkspace PVC size


AObuchow May 13, 2022

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


16 changes: 15 additions & 1 deletion
apis/controller/v1alpha1/devworkspaceoperatorconfig_types.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ package v1alpha1

import (
	corev1 "k8s.io/api/core/v1"
	"k8s.io/apimachinery/pkg/api/resource"
	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand DownExpand Up@@ -67,6 +68,16 @@ type Proxy struct {
	NoProxy string `json:"noProxy,omitempty"`
}

type StorageSizes struct {
Comment thread
AObuchow marked this conversation as resolved.

	// The default Persistent Volume Claim size for the "common" storage class.
	// Note that the "async" storage class also uses the PVC size set for the "common" storage class.
	// If not specified, the "common" and "async" Persistent Volume Claim sizes are set to 10Gi
	Common *resource.Quantity `json:"common,omitempty"`
	// The default Persistent Volume Claim size for the "per-workspace" storage class.
	// If not specified, the "per-workspace" Persistent Volume Claim size is set to 5Gi
	PerWorkspace *resource.Quantity `json:"perWorkspace,omitempty"`
Comment thread
AObuchow marked this conversation as resolved.

}

type WorkspaceConfig struct {
	// ImagePullPolicy defines the imagePullPolicy used for containers in a DevWorkspace
	// For additional information, see Kubernetes documentation for imagePullPolicy. If
Expand All@@ -83,9 +94,12 @@ type WorkspaceConfig struct {
	// +kubebuilder:validation:Pattern=^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
	// +kubebuilder:validation:MaxLength=63
	PVCName string `json:"pvcName,omitempty"`
	// StorageClassName defines and optional storageClass to use for persistent
	// StorageClassName defines an optional storageClass to use for persistent
	// volume claims created to support DevWorkspaces
	StorageClassName *string `json:"storageClassName,omitempty"`
	// DefaultStorageSize defines an optional struct with fields to specify the sizes of Persistent Volume Claims for storage
	// classes used by DevWorkspaces.
	DefaultStorageSize *StorageSizes `json:"defaultStorageSize,omitempty"`
Comment thread
amisevsk marked this conversation as resolved.

	// IdleTimeout determines how long a workspace should sit idle before being
	// automatically scaled down. Proper functionality of this configuration property
	// requires support in the workspace being started. If not specified, the default
Expand Down

30 changes: 30 additions & 0 deletions
apis/controller/v1alpha1/zz_generated.deepcopy.go

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


20 changes: 19 additions & 1 deletion
deploy/bundle/manifests/controller.devfile.io_devworkspaceoperatorconfigs.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
deploy/deployment/kubernetes/combined.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
...s/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
deploy/deployment/openshift/combined.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
...t/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
deploy/templates/crd/bases/controller.devfile.io_devworkspaceoperatorconfigs.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


15 changes: 11 additions & 4 deletions
pkg/config/defaults.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ package config
import (
	"github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
	corev1 "k8s.io/api/core/v1"
	"k8s.io/apimachinery/pkg/api/resource"
)

// defaultConfig represents the default configuration for the DevWorkspace Operator.
Expand All@@ -29,6 +30,10 @@ var defaultConfig = &v1alpha1.OperatorConfiguration{
	Workspace: &v1alpha1.WorkspaceConfig{
 ImagePullPolicy: "Always",
 PVCName: "claim-devworkspace",
 DefaultStorageSize: &v1alpha1.StorageSizes{
 Common: &commonStorageSize,
 PerWorkspace: &perWorkspaceStorageSize,
 },
 IdleTimeout: "15m",
 ProgressTimeout: "5m",
 CleanupOnStop: &boolFalse,
Expand All@@ -43,8 +48,10 @@ var defaultConfig = &v1alpha1.OperatorConfiguration{

// Necessary variables for setting pointer values
var (
	boolTrue = true
	boolFalse = false
	int64UID = int64(1234)
	int64GID = int64(0)
	boolTrue = true
	boolFalse = false
	int64UID = int64(1234)
	int64GID = int64(0)
	commonStorageSize = resource.MustParse("10Gi")
	perWorkspaceStorageSize = resource.MustParse("5Gi")
)
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Configurable default PVC size for common and per-workspace storage classes#827

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.

 Sign up for GitHub

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

 Merged

AObuchow
merged 3 commits into

from

May 27, 2022
 Merged


Configurable default PVC size for common and per-workspace storage classes
#827
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c714b3a

feat: Configurable PVC size (fix #740)


AObuchow Apr 26, 2022
8c81e42

Generate config. option for configurable PVC size


AObuchow Apr 26, 2022
ac607df

feat: configmap option for perWorkspace PVC size


AObuchow May 13, 2022

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


16 changes: 15 additions & 1 deletion
apis/controller/v1alpha1/devworkspaceoperatorconfig_types.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ package v1alpha1

import (
	corev1 "k8s.io/api/core/v1"
	"k8s.io/apimachinery/pkg/api/resource"
	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand DownExpand Up@@ -67,6 +68,16 @@ type Proxy struct {
	NoProxy string `json:"noProxy,omitempty"`
}

type StorageSizes struct {
Comment thread
AObuchow marked this conversation as resolved.

	// The default Persistent Volume Claim size for the "common" storage class.
	// Note that the "async" storage class also uses the PVC size set for the "common" storage class.
	// If not specified, the "common" and "async" Persistent Volume Claim sizes are set to 10Gi
	Common *resource.Quantity `json:"common,omitempty"`
	// The default Persistent Volume Claim size for the "per-workspace" storage class.
	// If not specified, the "per-workspace" Persistent Volume Claim size is set to 5Gi
	PerWorkspace *resource.Quantity `json:"perWorkspace,omitempty"`
Comment thread
AObuchow marked this conversation as resolved.

}

type WorkspaceConfig struct {
	// ImagePullPolicy defines the imagePullPolicy used for containers in a DevWorkspace
	// For additional information, see Kubernetes documentation for imagePullPolicy. If
Expand All@@ -83,9 +94,12 @@ type WorkspaceConfig struct {
	// +kubebuilder:validation:Pattern=^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
	// +kubebuilder:validation:MaxLength=63
	PVCName string `json:"pvcName,omitempty"`
	// StorageClassName defines and optional storageClass to use for persistent
	// StorageClassName defines an optional storageClass to use for persistent
	// volume claims created to support DevWorkspaces
	StorageClassName *string `json:"storageClassName,omitempty"`
	// DefaultStorageSize defines an optional struct with fields to specify the sizes of Persistent Volume Claims for storage
	// classes used by DevWorkspaces.
	DefaultStorageSize *StorageSizes `json:"defaultStorageSize,omitempty"`
Comment thread
amisevsk marked this conversation as resolved.

	// IdleTimeout determines how long a workspace should sit idle before being
	// automatically scaled down. Proper functionality of this configuration property
	// requires support in the workspace being started. If not specified, the default
Expand Down

30 changes: 30 additions & 0 deletions
apis/controller/v1alpha1/zz_generated.deepcopy.go

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


20 changes: 19 additions & 1 deletion
deploy/bundle/manifests/controller.devfile.io_devworkspaceoperatorconfigs.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
deploy/deployment/kubernetes/combined.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
...s/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
deploy/deployment/openshift/combined.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
...t/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
deploy/templates/crd/bases/controller.devfile.io_devworkspaceoperatorconfigs.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


15 changes: 11 additions & 4 deletions
pkg/config/defaults.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ package config
import (
	"github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
	corev1 "k8s.io/api/core/v1"
	"k8s.io/apimachinery/pkg/api/resource"
)

// defaultConfig represents the default configuration for the DevWorkspace Operator.
Expand All@@ -29,6 +30,10 @@ var defaultConfig = &v1alpha1.OperatorConfiguration{
	Workspace: &v1alpha1.WorkspaceConfig{
 ImagePullPolicy: "Always",
 PVCName: "claim-devworkspace",
 DefaultStorageSize: &v1alpha1.StorageSizes{
 Common: &commonStorageSize,
 PerWorkspace: &perWorkspaceStorageSize,
 },
 IdleTimeout: "15m",
 ProgressTimeout: "5m",
 CleanupOnStop: &boolFalse,
Expand All@@ -43,8 +48,10 @@ var defaultConfig = &v1alpha1.OperatorConfiguration{

// Necessary variables for setting pointer values
var (
	boolTrue = true
	boolFalse = false
	int64UID = int64(1234)
	int64GID = int64(0)
	boolTrue = true
	boolFalse = false
	int64UID = int64(1234)
	int64GID = int64(0)
	commonStorageSize = resource.MustParse("10Gi")
	perWorkspaceStorageSize = resource.MustParse("5Gi")
)
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Configurable default PVC size for common and per-workspace storage classes#827

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.

 Sign up for GitHub

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

 Merged

AObuchow
merged 3 commits into

from

May 27, 2022
 Merged


Configurable default PVC size for common and per-workspace storage classes
#827
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c714b3a

feat: Configurable PVC size (fix #740)


AObuchow Apr 26, 2022
8c81e42

Generate config. option for configurable PVC size


AObuchow Apr 26, 2022
ac607df

feat: configmap option for perWorkspace PVC size


AObuchow May 13, 2022

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


16 changes: 15 additions & 1 deletion
apis/controller/v1alpha1/devworkspaceoperatorconfig_types.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ package v1alpha1

import (
	corev1 "k8s.io/api/core/v1"
	"k8s.io/apimachinery/pkg/api/resource"
	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand DownExpand Up@@ -67,6 +68,16 @@ type Proxy struct {
	NoProxy string `json:"noProxy,omitempty"`
}

type StorageSizes struct {
Comment thread
AObuchow marked this conversation as resolved.

	// The default Persistent Volume Claim size for the "common" storage class.
	// Note that the "async" storage class also uses the PVC size set for the "common" storage class.
	// If not specified, the "common" and "async" Persistent Volume Claim sizes are set to 10Gi
	Common *resource.Quantity `json:"common,omitempty"`
	// The default Persistent Volume Claim size for the "per-workspace" storage class.
	// If not specified, the "per-workspace" Persistent Volume Claim size is set to 5Gi
	PerWorkspace *resource.Quantity `json:"perWorkspace,omitempty"`
Comment thread
AObuchow marked this conversation as resolved.

}

type WorkspaceConfig struct {
	// ImagePullPolicy defines the imagePullPolicy used for containers in a DevWorkspace
	// For additional information, see Kubernetes documentation for imagePullPolicy. If
Expand All@@ -83,9 +94,12 @@ type WorkspaceConfig struct {
	// +kubebuilder:validation:Pattern=^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
	// +kubebuilder:validation:MaxLength=63
	PVCName string `json:"pvcName,omitempty"`
	// StorageClassName defines and optional storageClass to use for persistent
	// StorageClassName defines an optional storageClass to use for persistent
	// volume claims created to support DevWorkspaces
	StorageClassName *string `json:"storageClassName,omitempty"`
	// DefaultStorageSize defines an optional struct with fields to specify the sizes of Persistent Volume Claims for storage
	// classes used by DevWorkspaces.
	DefaultStorageSize *StorageSizes `json:"defaultStorageSize,omitempty"`
Comment thread
amisevsk marked this conversation as resolved.

	// IdleTimeout determines how long a workspace should sit idle before being
	// automatically scaled down. Proper functionality of this configuration property
	// requires support in the workspace being started. If not specified, the default
Expand Down

30 changes: 30 additions & 0 deletions
apis/controller/v1alpha1/zz_generated.deepcopy.go

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


20 changes: 19 additions & 1 deletion
deploy/bundle/manifests/controller.devfile.io_devworkspaceoperatorconfigs.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
deploy/deployment/kubernetes/combined.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
...s/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
deploy/deployment/openshift/combined.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
...t/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
deploy/templates/crd/bases/controller.devfile.io_devworkspaceoperatorconfigs.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


15 changes: 11 additions & 4 deletions
pkg/config/defaults.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ package config
import (
	"github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
	corev1 "k8s.io/api/core/v1"
	"k8s.io/apimachinery/pkg/api/resource"
)

// defaultConfig represents the default configuration for the DevWorkspace Operator.
Expand All@@ -29,6 +30,10 @@ var defaultConfig = &v1alpha1.OperatorConfiguration{
	Workspace: &v1alpha1.WorkspaceConfig{
 ImagePullPolicy: "Always",
 PVCName: "claim-devworkspace",
 DefaultStorageSize: &v1alpha1.StorageSizes{
 Common: &commonStorageSize,
 PerWorkspace: &perWorkspaceStorageSize,
 },
 IdleTimeout: "15m",
 ProgressTimeout: "5m",
 CleanupOnStop: &boolFalse,
Expand All@@ -43,8 +48,10 @@ var defaultConfig = &v1alpha1.OperatorConfiguration{

// Necessary variables for setting pointer values
var (
	boolTrue = true
	boolFalse = false
	int64UID = int64(1234)
	int64GID = int64(0)
	boolTrue = true
	boolFalse = false
	int64UID = int64(1234)
	int64GID = int64(0)
	commonStorageSize = resource.MustParse("10Gi")
	perWorkspaceStorageSize = resource.MustParse("5Gi")
)
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Configurable default PVC size for common and per-workspace storage classes#827

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.

 Sign up for GitHub

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

 Merged

AObuchow
merged 3 commits into

from

May 27, 2022
 Merged


Configurable default PVC size for common and per-workspace storage classes
#827
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c714b3a

feat: Configurable PVC size (fix #740)


AObuchow Apr 26, 2022
8c81e42

Generate config. option for configurable PVC size


AObuchow Apr 26, 2022
ac607df

feat: configmap option for perWorkspace PVC size


AObuchow May 13, 2022

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


16 changes: 15 additions & 1 deletion
apis/controller/v1alpha1/devworkspaceoperatorconfig_types.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ package v1alpha1

import (
	corev1 "k8s.io/api/core/v1"
	"k8s.io/apimachinery/pkg/api/resource"
	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand DownExpand Up@@ -67,6 +68,16 @@ type Proxy struct {
	NoProxy string `json:"noProxy,omitempty"`
}

type StorageSizes struct {
Comment thread
AObuchow marked this conversation as resolved.

	// The default Persistent Volume Claim size for the "common" storage class.
	// Note that the "async" storage class also uses the PVC size set for the "common" storage class.
	// If not specified, the "common" and "async" Persistent Volume Claim sizes are set to 10Gi
	Common *resource.Quantity `json:"common,omitempty"`
	// The default Persistent Volume Claim size for the "per-workspace" storage class.
	// If not specified, the "per-workspace" Persistent Volume Claim size is set to 5Gi
	PerWorkspace *resource.Quantity `json:"perWorkspace,omitempty"`
Comment thread
AObuchow marked this conversation as resolved.

}

type WorkspaceConfig struct {
	// ImagePullPolicy defines the imagePullPolicy used for containers in a DevWorkspace
	// For additional information, see Kubernetes documentation for imagePullPolicy. If
Expand All@@ -83,9 +94,12 @@ type WorkspaceConfig struct {
	// +kubebuilder:validation:Pattern=^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
	// +kubebuilder:validation:MaxLength=63
	PVCName string `json:"pvcName,omitempty"`
	// StorageClassName defines and optional storageClass to use for persistent
	// StorageClassName defines an optional storageClass to use for persistent
	// volume claims created to support DevWorkspaces
	StorageClassName *string `json:"storageClassName,omitempty"`
	// DefaultStorageSize defines an optional struct with fields to specify the sizes of Persistent Volume Claims for storage
	// classes used by DevWorkspaces.
	DefaultStorageSize *StorageSizes `json:"defaultStorageSize,omitempty"`
Comment thread
amisevsk marked this conversation as resolved.

	// IdleTimeout determines how long a workspace should sit idle before being
	// automatically scaled down. Proper functionality of this configuration property
	// requires support in the workspace being started. If not specified, the default
Expand Down

30 changes: 30 additions & 0 deletions
apis/controller/v1alpha1/zz_generated.deepcopy.go

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


20 changes: 19 additions & 1 deletion
deploy/bundle/manifests/controller.devfile.io_devworkspaceoperatorconfigs.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
deploy/deployment/kubernetes/combined.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
...s/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
deploy/deployment/openshift/combined.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
...t/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 27 additions & 1 deletion
deploy/templates/crd/bases/controller.devfile.io_devworkspaceoperatorconfigs.yaml

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


15 changes: 11 additions & 4 deletions
pkg/config/defaults.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ package config
import (
	"github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
	corev1 "k8s.io/api/core/v1"
	"k8s.io/apimachinery/pkg/api/resource"
)

// defaultConfig represents the default configuration for the DevWorkspace Operator.
Expand All@@ -29,6 +30,10 @@ var defaultConfig = &v1alpha1.OperatorConfiguration{
	Workspace: &v1alpha1.WorkspaceConfig{
 ImagePullPolicy: "Always",
 PVCName: "claim-devworkspace",
 DefaultStorageSize: &v1alpha1.StorageSizes{
 Common: &commonStorageSize,
 PerWorkspace: &perWorkspaceStorageSize,
 },
 IdleTimeout: "15m",
 ProgressTimeout: "5m",
 CleanupOnStop: &boolFalse,
Expand All@@ -43,8 +48,10 @@ var defaultConfig = &v1alpha1.OperatorConfiguration{

// Necessary variables for setting pointer values
var (
	boolTrue = true
	boolFalse = false
	int64UID = int64(1234)
	int64GID = int64(0)
	boolTrue = true
	boolFalse = false
	int64UID = int64(1234)
	int64GID = int64(0)
	commonStorageSize = resource.MustParse("10Gi")
	perWorkspaceStorageSize = resource.MustParse("5Gi")
)
Loading