Skip to content

Commit

Permalink
addressing comments
Browse files Browse the repository at this point in the history
  • Loading branch information
salonig23 committed Aug 6, 2024
1 parent fa3262d commit ea3136d
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 7 deletions.
3 changes: 1 addition & 2 deletions docs/setup-cluster/k8s/resource-caps.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ bindings and resource quotas using either the WebUI or the CLI.
specify a namespace in the namespace field, the workspace is bound to that namespace. If the
field is left blank, the workspace is bound to the namespace specified in the
``resource_manager.default_namespace`` section of your master configuration (when set), and is
otherwise bound to the release namespace. We fall back to the default Kubernetes namespace,
"default", during non-helm determined deployments.
otherwise bound to the release namespace. For non-helm Determined deployments, it falls back to the default Kubernetes namespace, ``default``.

#. Toggle the "Auto Create Namespace" option on or off. When enabled, the system automatically
creates a namespace in the cluster, allowing you to edit the resource quota directly in
Expand Down
2 changes: 1 addition & 1 deletion helm/charts/determined/templates/master-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ stringData:
resource_manager:
type: "kubernetes"
{{- if $defaultNamespace := coalesce .Values.resourceManager.defaultNamespace .Release.namespace }}
{{- if $defaultNamespace := coalesce .Values.resourceManager.defaultNamespace .Release.Namespace }}
default_namespace: {{ quote $defaultNamespace }}
{{- end }}
{{- if .Values.resourceManager.clusterName }}
Expand Down
2 changes: 0 additions & 2 deletions master/internal/rm/kubernetesrm/jobs.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"context"
"encoding/json"
"fmt"
"log"
"math"
"os"
"path/filepath"
Expand Down Expand Up @@ -2404,7 +2403,6 @@ func (j *jobsService) getNamespaceResourceQuota(namespaceName string) (*float64,
func (j *jobsService) getInitialNamespace() string {
releaseNamespace := os.Getenv(ReleaseNamespaceEnvVar)
if len(releaseNamespace) > 0 {
log.Print("releaseNamespace: ", releaseNamespace)
return releaseNamespace
}
return j.namespace
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"context"
"crypto/tls"
"fmt"
"log"
"maps"
"slices"
"time"
Expand Down Expand Up @@ -107,7 +106,7 @@ func New(
if err != nil {
return nil, err
}
log.Print(k.config.DefaultNamespace)

if len(k.config.DefaultNamespace) > 0 {
err = k.jobsService.VerifyNamespaceExists(k.config.DefaultNamespace)
if err != nil {
Expand Down

0 comments on commit ea3136d

Please sign in to comment.