Skip to content

Commit

Permalink
isolate users in namespaces (#625)
Browse files Browse the repository at this point in the history
  • Loading branch information
@happy2048
happy2048 authored Aug 4, 2021
1 parent 4ba23b1 commit e51b97e
Show file tree
Hide file tree
Showing 98 changed files with 1,410 additions and 4,920 deletions.
4 changes: 4 additions & 0 deletions charts/custom-serving/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,7 @@
### 0.3.0

* add serving type to pod label

### 0.3.1

* support job labels
6 changes: 6 additions & 0 deletions charts/custom-serving/templates/deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ metadata:
servingType: "custom-serving"
serviceName: "{{ .Values.servingName }}"
servingVersion: "{{ .Values.servingVersion }}"
{{- range $key, $value := .Values.labels }}
{{ $key }}: {{ $value | quote }}
{{- end }}
annotations:
"helm.sh/created": {{ .Release.Time.Seconds | quote }}
spec:
Expand Down Expand Up @@ -41,6 +44,9 @@ spec:
servingName: "{{ .Values.servingName }}"
servingVersion: "{{ .Values.servingVersion }}"
servingType: "custom-serving"
{{- range $key, $value := .Values.labels }}
{{ $key }}: {{ $value | quote }}
{{- end }}
spec:
{{- if ne (len .Values.nodeSelectors) 0 }}
nodeSelector:
Expand Down
3 changes: 3 additions & 0 deletions charts/custom-serving/templates/service.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ metadata:
servingName: {{ .Values.servingName }}
servingVersion: "{{ .Values.servingVersion }}"
servingType: "custom-serving"
{{- range $key, $value := .Values.labels }}
{{ $key }}: {{ $value | quote }}
{{- end }}
spec:
type: {{ .Values.serviceType }}
ports:
Expand Down
4 changes: 4 additions & 0 deletions charts/etjob/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@

* support et operator

### 0.2.0

* support job labels


10 changes: 10 additions & 0 deletions charts/etjob/templates/etjob.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,19 @@ apiVersion: kai.alibabacloud.com/v1alpha1
kind: TrainingJob
metadata:
name: {{ .Release.Name }}
annotations:
{{- range $key, $value := .Values.annotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
labels:
app: {{ template "etjob.name" . }}
chart: {{ template "etjob.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
createdBy: "ETJob"
{{- range $key, $value := .Values.labels }}
{{ $key }}: {{ $value | quote }}
{{- end }}
spec:
{{- if .Values.cleanPodPolicy }}
cleanPodPolicy: {{ .Values.cleanPodPolicy }}
Expand All @@ -33,6 +40,9 @@ spec:
pod-group.scheduling.sigs.k8s.io/name: {{ .Values.podGroupName }}
pod-group.scheduling.sigs.k8s.io/min-available: "{{ .Values.podGroupMinAvailable }}"
{{- end }}
{{- range $key, $value := .Values.labels }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- if .Values.annotations }}
annotations:
{{- range $key, $value := .Values.annotations }}
Expand Down
7 changes: 7 additions & 0 deletions charts/kfserving/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
### 0.1.0

* init chart

### 0.2.0

* support job labels and annotations
7 changes: 7 additions & 0 deletions charts/kfserving/templates/inferenceservice.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,19 @@
apiVersion: serving.kubeflow.org/v1alpha2
kind: InferenceService
metadata:
annotations:
{{- range $key, $value := .Values.annotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
labels:
controller-tools.k8s.io: "1.0"
serviceName: "{{ .Values.servingName }}"
servingType: "kf-serving"
servingName: "{{ .Values.servingName }}"
servingVersion: "{{ .Values.servingVersion }}"
{{- range $key, $value := .Values.labels }}
{{ $key }}: {{ $value | quote }}
{{- end }}
name: {{ .Release.Name }}
spec:
default:
Expand Down
4 changes: 4 additions & 0 deletions charts/mpijob/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,3 +101,7 @@
### 0.24.0

* support gpu topology scheduling

### 0.25.0

* support job labels and annotations
10 changes: 10 additions & 0 deletions charts/mpijob/templates/mpijob.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ metadata:
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
createdBy: "MPIJob"
{{- range $key, $value := .Values.labels }}
{{ $key }}: {{ $value | quote }}
{{- end }}
annotations:
{{- range $key, $value := .Values.annotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
spec:
{{- if .Values.launcherOnMaster }}
launcherOnMaster: {{ .Values.launcherOnMaster }}
Expand All @@ -38,6 +45,9 @@ spec:
gpu-topology: {{ .Release.Name }}
gpu-topology-replica: "{{ .Values.gputopologyreplica }}"
{{- end}}
{{- range $key, $value := .Values.labels }}
{{ $key }}: {{ $value | quote }}
{{- end }}
annotations:
{{- range $key, $value := .Values.annotations }}
{{ $key }}: {{ $value | quote }}
Expand Down
4 changes: 4 additions & 0 deletions charts/pytorchjob/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,7 @@
### 0.1.2

* fix bug for supporting gang

### 0.2.0

* support job labels and annotations
13 changes: 13 additions & 0 deletions charts/pytorchjob/templates/pytorchjob.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ metadata:
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
createdBy: "PyTorchJob"
{{- range $key, $value := .Values.labels }}
{{ $key }}: {{ $value | quote }}
{{- end }}
annotations:
{{- range $key, $value := .Values.annotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
spec:
{{- if .Values.cleanPodPolicy }}
cleanPodPolicy: {{ .Values.cleanPodPolicy }}
Expand All @@ -34,6 +41,9 @@ spec:
pod-group.scheduling.sigs.k8s.io/min-available: "{{ .Values.podGroupMinAvailable }}"
{{- end }}
master-pod-name: {{ .Release.Name }}-master-0
{{- range $key, $value := .Values.labels }}
{{ $key }}: {{ $value | quote }}
{{- end }}
annotations:
{{- range $key, $value := .Values.annotations }}
{{ $key }}: {{ $value | quote }}
Expand Down Expand Up @@ -314,6 +324,9 @@ spec:
pod-group.scheduling.sigs.k8s.io/name: {{ .Values.podGroupName }}
pod-group.scheduling.sigs.k8s.io/min-available: "{{ .Values.podGroupMinAvailable }}"
{{- end }}
{{- range $key, $value := .Values.labels }}
{{ $key }}: {{ $value | quote }}
{{- end }}
annotations:
{{- range $key, $value := .Values.annotations }}
{{ $key }}: {{ $value | quote }}
Expand Down
3 changes: 3 additions & 0 deletions charts/seldon-core/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@
* support seldon core pre-packaged model server


### 0.2.0

* support job labels and annotations
17 changes: 16 additions & 1 deletion charts/seldon-core/templates/seldondeployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
apiVersion: machinelearning.seldon.io/v1
kind: SeldonDeployment
metadata:
labels:
{{- range $key, $value := .Values.labels }}
{{ $key }}: {{ $value | quote }}
{{- end }}
annotations:
{{- range $key, $value := .Values.annotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
name: {{ .Values.servingName }}
namespace: {{ .Values.namespace }}
spec:
Expand Down Expand Up @@ -41,4 +49,11 @@ spec:
servingName: "{{ .Values.servingName }}"
serviceName: "{{ .Values.servingName }}"
servingType: seldon-serving
servingVersion: "{{ .Values.servingVersion }}"
servingVersion: "{{ .Values.servingVersion }}"
{{- range $key, $value := .Values.labels }}
{{ $key }}: {{ $value | quote }}
{{- end }}
annotations:
{{- range $key, $value := .Values.annotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
4 changes: 4 additions & 0 deletions charts/sparkjob/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@

* update version to 2.4.5

### 0.3.0

* support job labels and annotations

21 changes: 21 additions & 0 deletions charts/sparkjob/templates/sparkjob.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@ metadata:
release: {{ .Release.Name }}
app: {{ template "sparkjob.name" . }}
createdBy: "SparkJob"
{{- range $key, $value := .Values.labels }}
{{ $key }}: {{ $value | quote }}
{{- end }}
annotations:
{{- range $key, $value := .Values.annotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
spec:
type: {{ .Values.Lang }}
mode: cluster
Expand All @@ -40,6 +47,13 @@ spec:
release: {{ .Release.Name }}
app: {{ template "sparkjob.name" . }}
createdBy: "SparkJob"
{{- range $key, $value := .Values.labels }}
{{ $key }}: {{ $value | quote }}
{{- end }}
annotations:
{{- range $key, $value := .Values.annotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
serviceAccount: spark
executor:
cores: {{ .Values.Executor.CPURequest }}
Expand All @@ -50,3 +64,10 @@ spec:
release: {{ .Release.Name }}
app: {{ template "sparkjob.name" . }}
createdBy: "SparkJob"
{{- range $key, $value := .Values.labels }}
{{ $key }}: {{ $value | quote }}
{{- end }}
annotations:
{{- range $key, $value := .Values.annotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
6 changes: 5 additions & 1 deletion charts/tfjob/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,4 +131,8 @@

### 0.31.0

* Support job level annotation
* Support job level annotation

### 0.32.0

* Support job level labels
15 changes: 15 additions & 0 deletions charts/tfjob/templates/tfjob.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ metadata:
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
createdBy: "TFJob"
{{- range $key, $value := .Values.labels }}
{{ $key }}: {{ $value | quote }}
{{- end }}
annotations:
{{- range $key, $value := .Values.annotations }}
{{ $key }}: {{ $value | quote }}
Expand All @@ -40,6 +43,9 @@ spec:
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
createdBy: "TFJob"
{{- range $key, $value := .Values.labels }}
{{ $key }}: {{ $value | quote }}
{{- end }}
annotations:
{{- range $key, $value := .Values.annotations }}
{{ $key }}: {{ $value | quote }}
Expand Down Expand Up @@ -330,6 +336,9 @@ spec:
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
createdBy: "TFJob"
{{- range $key, $value := .Values.labels }}
{{ $key }}: {{ $value | quote }}
{{- end }}
annotations:
{{- range $key, $value := .Values.annotations }}
{{ $key }}: {{ $value | quote }}
Expand Down Expand Up @@ -650,6 +659,9 @@ spec:
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
createdBy: "TFJob"
{{- range $key, $value := .Values.labels }}
{{ $key }}: {{ $value | quote }}
{{- end }}
annotations:
{{- range $key, $value := .Values.annotations }}
{{ $key }}: {{ $value | quote }}
Expand Down Expand Up @@ -967,6 +979,9 @@ spec:
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
createdBy: "TFJob"
{{- range $key, $value := .Values.labels }}
{{ $key }}: {{ $value | quote }}
{{- end }}
annotations:
{{- range $key, $value := .Values.annotations }}
{{ $key }}: {{ $value | quote }}
Expand Down
4 changes: 4 additions & 0 deletions charts/tfserving/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@
* support nodeSelector
* support tolerance
* support annotations

### 0.3.0

* support job labels and annotations
12 changes: 12 additions & 0 deletions charts/tfserving/templates/deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@ metadata:
servingType: "tf-serving"
serviceName: "{{ .Values.servingName }}"
servingVersion: "{{ .Values.servingVersion }}"
{{- range $key, $value := .Values.labels }}
{{ $key }}: {{ $value | quote }}
{{- end }}
annotations:
"helm.sh/created": {{ .Release.Time.Seconds | quote }}
{{- range $key, $value := .Values.annotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
spec:
replicas: {{ .Values.replicas }}
strategy:
Expand All @@ -32,6 +38,9 @@ spec:
{{- range $key, $value := .Values.annotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- range $key, $value := .Values.annotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
labels:
heritage: {{ .Release.Service | quote }}
release: {{ .Release.Name | quote }}
Expand All @@ -41,6 +50,9 @@ spec:
servingName: "{{ .Values.servingName }}"
servingType: "tf-serving"
servingVersion: "{{ .Values.servingVersion }}"
{{- range $key, $value := .Values.labels }}
{{ $key }}: {{ $value | quote }}
{{- end }}
spec:
{{- if ne (len .Values.nodeSelectors) 0 }}
nodeSelector:
Expand Down
4 changes: 4 additions & 0 deletions charts/triton/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@
* support nodeSelector
* support tolerance
* support annotations

### 0.3.0

* support job labels and annotations
Loading

0 comments on commit e51b97e

Please sign in to comment.