Skip to content

Refactor namespace configuration to use global.namespace #68

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

Open
lanmaoxinqing wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Refactor namespace configuration to use global.namespace #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions deploy/Chart.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,8 @@ dependencies:
- name: api-service
repository: file://./api-service
version: 0.0.1
digest: sha256:1f01dff06c6132524b527accdcfd47083224855e2104c7b53773cc4fcac9ebf4
generated: "2025-12-11T15:05:52.740323+08:00"
- name: api-service
repository: file://./api-service
version: 0.0.1
Comment on lines +14 to +16
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Feb 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

critical

The api-service dependency is duplicated. This will likely cause issues with Helm. Please remove this duplicated block.

digest: sha256:d8cde747fdada74e8ef391a9dba4b459469d7854454856888eab3bb97c8e2fa7
generated: "2026-02-27T16:59:03.91986+08:00"
8 changes: 3 additions & 5 deletions deploy/api-service/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,28 +39,26 @@ Selector labels
{{ if .Values.backendAddr }}
{{- .Values.backendAddr -}}
{{ else }}
{{- printf "http://envhub.%s.svc.cluster.local:8083" .Values.metadata.namespace -}}
{{- printf "http://envhub.%s.svc.cluster.local:8083" .Values.global.namespace -}}
{{ end }}
{{ end }}

{{- define "api-service.scheduleAddr" -}}
{{ if .Values.scheduleAddr }}
{{- .Values.scheduleAddr -}}
{{ else }}
{{- printf "http://controller.%s.svc.cluster.local:8080" .Values.metadata.namespace -}}
{{- printf "http://controller.%s.svc.cluster.local:8080" .Values.global.namespace -}}
{{ end }}
{{ end }}

{{- define "api-service.scheduleType" -}}
{{ if .Values.scheduleType }}
{{- .Values.scheduleType -}}
{{ else }}
{{- printf "k8s" .Values.metadata.namespace -}}
{{- printf "k8s" -}}
{{ end }}
{{ end }}

{{- define "api-service.qps" -}}
{{- if .Values.qps }}{{ printf "%v" .Values.qps }}{{ else }}{{ "10" }}{{ end }}
{{- end }}


2 changes: 1 addition & 1 deletion deploy/api-service/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Values.name }}
namespace: {{ .Values.metadata.namespace }}
namespace: {{ .Values.global.namespace }}
labels:
{{ include "api-service.labels" . | nindent 4 }}
spec:
Expand Down
2 changes: 1 addition & 1 deletion deploy/api-service/templates/namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: v1
kind: Namespace
metadata:
name: {{ .Values.metadata.namespace }}
name: {{ .Values.global.namespace }}
{{- with .Values.namespace.labels }}
labels:
{{- toYaml . | nindent 4 }}
Expand Down
2 changes: 1 addition & 1 deletion deploy/api-service/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ .Values.name }}
namespace: {{ .Values.metadata.namespace }}
namespace: {{ .Values.global.namespace }}
labels:
{{ include "api-service.labels" . | nindent 4 }}
spec:
Expand Down
3 changes: 0 additions & 3 deletions deploy/api-service/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ replicaCount: 1

name: api-service

metadata:
namespace: aenv

# Namespace configuration
namespace:
# Set to true to automatically create the namespace
Expand Down
Binary file modified deploy/charts/api-service-0.0.1.tgz
View file
Open in desktop
Binary file not shown.
Binary file modified deploy/charts/controller-0.0.1.tgz
View file
Open in desktop
Binary file not shown.
Binary file modified deploy/charts/envhub-0.0.1.tgz
View file
Open in desktop
Binary file not shown.
Binary file modified deploy/charts/redis-0.1.0.tgz
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion deploy/controller/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ include "controller.fullname" . }}-pod-templates
namespace: {{ .Values.metadata.namespace }}
namespace: {{ .Values.global.namespace }}
labels:
{{- include "controller.labels" . | nindent 4 }}
data:
Expand Down
2 changes: 1 addition & 1 deletion deploy/controller/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Values.name }}
namespace: {{ .Values.metadata.namespace }}
namespace: {{ .Values.global.namespace }}
labels:
{{ include "controller.labels" . | nindent 4 }}
spec:
Expand Down
2 changes: 1 addition & 1 deletion deploy/controller/templates/namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: v1
kind: Namespace
metadata:
name: {{ .Values.metadata.namespace }}
name: {{ .Values.global.namespace }}
{{- with .Values.namespace.labels }}
labels:
{{- toYaml . | nindent 4 }}
Expand Down
10 changes: 5 additions & 5 deletions deploy/controller/templates/rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ roleRef:
subjects:
- kind: ServiceAccount
name: {{ include "controller.serviceAccountName" . }}
namespace: {{ .Values.metadata.namespace }}
namespace: {{ .Values.global.namespace }}

{{- if .Values.rbac.additionalNamespaces }}
{{- range .Values.rbac.additionalNamespaces }}
Expand All @@ -53,7 +53,7 @@ roleRef:
subjects:
- kind: ServiceAccount
name: {{ include "controller.serviceAccountName" $ }}
namespace: {{ $.Values.metadata.namespace }}
namespace: {{ $.Values.global.namespace }}
{{- end }}
{{- end }}

Expand All @@ -63,7 +63,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: {{ include "controller.fullname" . }}-role
namespace: {{ .Values.metadata.namespace }}
namespace: {{ .Values.global.namespace }}
labels:
{{- include "controller.labels" . | nindent 4 }}
rules:
Expand Down Expand Up @@ -91,7 +91,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: {{ include "controller.fullname" . }}-rolebinding
namespace: {{ .Values.metadata.namespace }}
namespace: {{ .Values.global.namespace }}
labels:
{{- include "controller.labels" . | nindent 4 }}
roleRef:
Expand All @@ -101,6 +101,6 @@ roleRef:
subjects:
- kind: ServiceAccount
name: {{ include "controller.serviceAccountName" . }}
namespace: {{ .Values.metadata.namespace }}
namespace: {{ .Values.global.namespace }}

{{- end }}
8 changes: 4 additions & 4 deletions deploy/controller/templates/rolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ roleRef:
subjects:
- kind: ServiceAccount
name: aenv-serviceaccount
namespace: {{ .Values.metadata.namespace }}
namespace: {{ .Values.global.namespace }}

---

apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: aenv-serviceaccount-role
namespace: {{ .Values.metadata.namespace }}
namespace: {{ .Values.global.namespace }}
rules:
- apiGroups:
- '*'
Expand All @@ -49,12 +49,12 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: aenv-serviceaccount-rolebinding
namespace: {{ .Values.metadata.namespace }}
namespace: {{ .Values.global.namespace }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: aenv-serviceaccount-role
subjects:
- kind: ServiceAccount
name: aenv-serviceaccount
namespace: {{ .Values.metadata.namespace }}
namespace: {{ .Values.global.namespace }}
2 changes: 1 addition & 1 deletion deploy/controller/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ .Values.name }}
namespace: {{ .Values.metadata.namespace }}
namespace: {{ .Values.global.namespace }}
labels:
{{ include "controller.labels" . | nindent 4 }}
spec:
Expand Down
2 changes: 1 addition & 1 deletion deploy/controller/templates/serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ include "controller.serviceAccountName" . }}
namespace: {{ .Values.metadata.namespace }}
namespace: {{ .Values.global.namespace }}
labels:
{{- include "controller.labels" . | nindent 4 }}
{{- with .Values.serviceAccount.annotations }}
Expand Down
2 changes: 0 additions & 2 deletions deploy/controller/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ replicaCount: 1

name: controller

metadata:
namespace: aenv
sandboxNamespace: aenv-sandbox

# Namespace configuration
Expand Down
2 changes: 1 addition & 1 deletion deploy/envhub/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ Selector labels
{{ if .Values.redisAddr }}
{{- .Values.redisAddr -}}
{{ else }}
{{- printf "redis.%s.svc.cluster.local:6379" .Values.metadata.namespace -}}
{{- printf "redis.%s.svc.cluster.local:6379" .Values.global.namespace -}}
{{ end }}
{{ end }}
2 changes: 1 addition & 1 deletion deploy/envhub/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Values.name }}
namespace: {{ .Values.metadata.namespace }}
namespace: {{ .Values.global.namespace }}
labels:
{{ include "envhub.labels" . | nindent 4 }}
spec:
Expand Down
2 changes: 1 addition & 1 deletion deploy/envhub/templates/namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: v1
kind: Namespace
metadata:
name: {{ .Values.metadata.namespace }}
name: {{ .Values.global.namespace }}
{{- with .Values.namespace.labels }}
labels:
{{- toYaml . | nindent 4 }}
Expand Down
2 changes: 1 addition & 1 deletion deploy/envhub/templates/secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: v1
kind: Secret
metadata:
name: oss-secret
namespace: {{ .Values.metadata.namespace }}
namespace: {{ .Values.global.namespace }}
type: Opaque
data:
# OSS credentials (base64 encoded)
Expand Down
2 changes: 1 addition & 1 deletion deploy/envhub/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ .Values.name }}
namespace: {{ .Values.metadata.namespace }}
namespace: {{ .Values.global.namespace }}
labels:
{{ include "envhub.labels" . | nindent 4 }}
spec:
Expand Down
3 changes: 0 additions & 3 deletions deploy/envhub/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ replicaCount: 1
name: envhub


metadata:
namespace: aenv

# Namespace configuration
namespace:
# Set to true to automatically create the namespace
Expand Down
2 changes: 1 addition & 1 deletion deploy/redis/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "redis.fullname" . }}
namespace: {{ .Values.metadata.namespace }}
namespace: {{ .Values.global.namespace }}
labels:
{{- include "redis.labels" . | nindent 4 }}
spec:
Expand Down
2 changes: 1 addition & 1 deletion deploy/redis/templates/namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: v1
kind: Namespace
metadata:
name: {{ .Values.metadata.namespace }}
name: {{ .Values.global.namespace }}
{{- with .Values.namespace.labels }}
labels:
{{- toYaml . | nindent 4 }}
Expand Down
2 changes: 1 addition & 1 deletion deploy/redis/templates/persistentvolumeclaim.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: {{ include "redis.fullname" . }}
namespace: {{ .Values.metadata.namespace }}
namespace: {{ .Values.global.namespace }}
labels:
{{- include "redis.labels" . | nindent 4 }}
spec:
Expand Down
2 changes: 1 addition & 1 deletion deploy/redis/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ include "redis.fullname" . }}
namespace: {{ .Values.metadata.namespace }}
namespace: {{ .Values.global.namespace }}
labels:
{{- include "redis.labels" . | nindent 4 }}
spec:
Expand Down
3 changes: 0 additions & 3 deletions deploy/redis/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

name: redis

metadata:
namespace: aenv

# Namespace configuration
namespace:
# Set to true to automatically create the namespace
Expand Down
14 changes: 3 additions & 11 deletions deploy/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,10 @@ controller:
enabled: true
replicaCount: 1
name: controller
metadata:
namespace: aenv
sandboxNamespace: aenv-sandbox
namespace:
create: true
image: aenvironment/controller:0.1.0
image: aenvironment/controller:0.1.5
imagePullPolicy: IfNotPresent
service:
type: LoadBalancer
Expand All @@ -39,8 +37,6 @@ redis:
# For persistence with ReadWriteOnce access mode, replicaCount must be 1.
replicaCount: 1
name: redis
metadata:
namespace: aenv
namespace:
create: false
image: redis:7.2.4
Expand Down Expand Up @@ -68,11 +64,9 @@ envhub:
enabled: true
replicaCount: 1
name: envhub
metadata:
namespace: aenv
namespace:
create: false
image: aenvironment/envhub:0.1.0
image: aenvironment/envhub:0.1.5
imagePullPolicy: IfNotPresent
service:
type: LoadBalancer
Expand All @@ -93,11 +87,9 @@ api-service:
enabled: true
replicaCount: 1
name: api-service
metadata:
namespace: aenv
namespace:
create: false
image: aenvironment/api-service:0.1.0
image: aenvironment/api-service:0.1.5
imagePullPolicy: IfNotPresent
service:
type: LoadBalancer
Expand Down
Loading