Skip to content
This repository has been archived by the owner on Jul 10, 2024. It is now read-only.

SUBMARINE-1290. Add k8s labels to k8s resources in submarine-cloud-v3 #976

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

SUBMARINE-1290. Add k8s labels to k8s resources in submarine-cloud-v3 #976

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0d5c54d
SUBMARINE-1290. Add k8s labels to k8s resources in submarine-cloud-v3
ianshen1104 Jul 7, 2022
1970c71
SUBMARINE-1290. Add k8s labels to k8s resources in submarine-cloud-v3
ianshen1104 Jul 7, 2022
b269024
Added appVersion const in submarine_controller
ianshen1104 Jul 20, 2022
78ee285
Merge branch 'SUBMARINE-1290' of github.com:ianshen1104/submarine int…
ianshen1104 Jul 21, 2022
a005a9c
Took out changes to yaml from old commit
ianshen1104 Jul 21, 2022
e0c7588
Set pod labels through spec.template.labels of deployments and statef…
ianshen1104 Aug 2, 2022
fcfd6a6
Changed label setting to mutative in remaining controllers
ianshen1104 Aug 2, 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
12 changes: 12 additions & 0 deletions submarine-cloud-v3/artifacts/submarine-database.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: submarine-database-pvc
labels:
app.kubernetes.io/name: submarine-database
app.kubernetes.io/version: "0.8.0-SNAPSHOT"
app.kubernetes.io/component: database
spec:
Copy link
Member

Choose a reason for hiding this comment

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

I think we can write the version information in golang file instead of yaml file. For example, for this PersistentVolumeClaim, see the golang function below. We can set pvc.Labels before we create the resource. This version information can be written as golang constant.

submarine/submarine-cloud-v3/controllers/submarine_database.go

Lines 35 to 46 in e7ed4a5

func (r *SubmarineReconciler) newSubmarineDatabasePersistentVolumeClaim(ctx context.Context, submarine *submarineapacheorgv1alpha1.Submarine) *corev1.PersistentVolumeClaim {
pvc, err := ParsePersistentVolumeClaimYaml(databaseYamlPath)
if err != nil {
r.Log.Error(err, "ParsePersistentVolumeClaimYaml")
}
pvc.Namespace = submarine.Namespace
err = controllerutil.SetControllerReference(submarine, pvc, r.Scheme)
if err != nil {
r.Log.Error(err, "Set PVC ControllerReference")
}
return pvc
}

For your reference:

Copy link
Author

Choose a reason for hiding this comment

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

Thank you for your suggestion @MortalHappiness,
I have changed the code to perform label setting in golang functions instead of yaml files.

accessModes:
- ReadWriteOnce
Expand All @@ -32,6 +36,10 @@ apiVersion: v1
kind: Service
metadata:
name: "submarine-database"
labels:
app.kubernetes.io/name: submarine-database
app.kubernetes.io/version: "0.8.0-SNAPSHOT"
app.kubernetes.io/component: database
spec:
ports:
- name: "submarine-database"
Expand All @@ -46,6 +54,10 @@ apiVersion: apps/v1
kind: StatefulSet
metadata:
name: "submarine-database"
labels:
app.kubernetes.io/name: submarine-database
app.kubernetes.io/version: "0.8.0-SNAPSHOT"
app.kubernetes.io/component: database
spec:
serviceName: submarine-database
replicas: 1
Expand Down
12 changes: 12 additions & 0 deletions submarine-cloud-v3/artifacts/submarine-minio.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: submarine-minio-pvc
labels:
app.kubernetes.io/name: submarine-minio
app.kubernetes.io/version: "0.8.0-SNAPSHOT"
app.kubernetes.io/component: minio
spec:
accessModes:
- ReadWriteOnce
Expand All @@ -32,6 +36,10 @@ apiVersion: v1
kind: Service
metadata:
name: submarine-minio-service
labels:
app.kubernetes.io/name: submarine-minio
app.kubernetes.io/version: "0.8.0-SNAPSHOT"
app.kubernetes.io/component: minio
spec:
type: ClusterIP
selector:
Expand All @@ -46,6 +54,10 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: submarine-minio
labels:
app.kubernetes.io/name: submarine-minio
app.kubernetes.io/version: "0.8.0-SNAPSHOT"
app.kubernetes.io/component: minio
spec:
selector:
matchLabels:
Expand Down
12 changes: 12 additions & 0 deletions submarine-cloud-v3/artifacts/submarine-mlflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: submarine-mlflow-pvc
labels:
app.kubernetes.io/name: submarine-mlflow
app.kubernetes.io/version: "0.8.0-SNAPSHOT"
app.kubernetes.io/component: mlflow
spec:
accessModes:
- ReadWriteOnce
Expand All @@ -32,6 +36,10 @@ apiVersion: v1
kind: Service
metadata:
name: submarine-mlflow-service
labels:
app.kubernetes.io/name: submarine-mlflow
app.kubernetes.io/version: "0.8.0-SNAPSHOT"
app.kubernetes.io/component: mlflow
spec:
type: ClusterIP
selector:
Expand All @@ -46,6 +54,10 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: submarine-mlflow
labels:
app.kubernetes.io/name: submarine-mlflow
app.kubernetes.io/version: "0.8.0-SNAPSHOT"
app.kubernetes.io/component: mlflow
spec:
selector:
matchLabels:
Expand Down
8 changes: 8 additions & 0 deletions submarine-cloud-v3/artifacts/submarine-observer-rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: "submarine-observer"
labels:
app.kubernetes.io/name: submarine-observer
app.kubernetes.io/version: "0.8.0-SNAPSHOT"
app.kubernetes.io/component: observer
rules:
- apiGroups:
- kubeflow.org
Expand Down Expand Up @@ -54,6 +58,10 @@ kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: "submarine-observer"
labels:
app.kubernetes.io/name: submarine-observer
app.kubernetes.io/version: "0.8.0-SNAPSHOT"
app.kubernetes.io/component: observer
subjects:
- kind: ServiceAccount
name: "default"
Expand Down
16 changes: 16 additions & 0 deletions submarine-cloud-v3/artifacts/submarine-server-rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: "submarine-server"
labels:
app.kubernetes.io/name: submarine-server
app.kubernetes.io/version: "0.8.0-SNAPSHOT"
app.kubernetes.io/component: server
rules:
- apiGroups:
- kubeflow.org
Expand Down Expand Up @@ -104,6 +108,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: "observer"
labels:
app.kubernetes.io/name: submarine-server
app.kubernetes.io/version: "0.8.0-SNAPSHOT"
app.kubernetes.io/component: server
rules:
- apiGroups:
- kubeflow.org
Expand All @@ -125,6 +133,10 @@ kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: "submarine-server"
labels:
app.kubernetes.io/name: submarine-server
app.kubernetes.io/version: "0.8.0-SNAPSHOT"
app.kubernetes.io/component: server
subjects:
- kind: ServiceAccount
name: "submarine-server"
Expand All @@ -137,6 +149,10 @@ kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: "observer"
labels:
app.kubernetes.io/name: submarine-server
app.kubernetes.io/version: "0.8.0-SNAPSHOT"
app.kubernetes.io/component: server
subjects:
- kind: ServiceAccount
name: "default"
Expand Down
15 changes: 15 additions & 0 deletions submarine-cloud-v3/artifacts/submarine-server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,29 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: "submarine-server"
labels:
app.kubernetes.io/name: submarine-server
app.kubernetes.io/version: "0.8.0-SNAPSHOT"
app.kubernetes.io/component: server
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: "default"
labels:
app.kubernetes.io/name: submarine-server
app.kubernetes.io/version: "0.8.0-SNAPSHOT"
app.kubernetes.io/component: server
---
apiVersion: v1
kind: Service
metadata:
name: "submarine-server"
labels:
app: "submarine-server"
app.kubernetes.io/name: submarine-server
app.kubernetes.io/version: "0.8.0-SNAPSHOT"
app.kubernetes.io/component: server
spec:
ports:
- port: 8080
Expand All @@ -45,6 +56,10 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: "submarine-server"
labels:
app.kubernetes.io/name: submarine-server
app.kubernetes.io/version: "0.8.0-SNAPSHOT"
app.kubernetes.io/component: server
spec:
selector:
matchLabels:
Expand Down
12 changes: 12 additions & 0 deletions submarine-cloud-v3/artifacts/submarine-storage-rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,29 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: "submarine-storage"
labels:
app.kubernetes.io/name: submarine-storage
app.kubernetes.io/version: "0.8.0-SNAPSHOT"
app.kubernetes.io/component: storage
rules: []
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: submarine-storage
labels:
app.kubernetes.io/name: submarine-storage
app.kubernetes.io/version: "0.8.0-SNAPSHOT"
app.kubernetes.io/component: storage
---
kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: "submarine-storage"
labels:
app.kubernetes.io/name: submarine-storage
app.kubernetes.io/version: "0.8.0-SNAPSHOT"
app.kubernetes.io/component: storage
subjects:
- kind: ServiceAccount
name: "submarine-storage"
Expand Down
12 changes: 12 additions & 0 deletions submarine-cloud-v3/artifacts/submarine-tensorboard.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: submarine-tensorboard-pvc
labels:
app.kubernetes.io/name: submarine-tensorboard
app.kubernetes.io/version: "0.8.0-SNAPSHOT"
app.kubernetes.io/component: tensorboard
spec:
accessModes:
- ReadWriteOnce
Expand All @@ -32,6 +36,10 @@ apiVersion: v1
kind: Service
metadata:
name: submarine-tensorboard-service
labels:
app.kubernetes.io/name: submarine-tensorboard
app.kubernetes.io/version: "0.8.0-SNAPSHOT"
app.kubernetes.io/component: tensorboard
spec:
selector:
app: submarine-tensorboard
Expand All @@ -45,6 +53,10 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: submarine-tensorboard
labels:
app.kubernetes.io/name: submarine-tensorboard
app.kubernetes.io/version: "0.8.0-SNAPSHOT"
app.kubernetes.io/component: tensorboard
spec:
selector:
matchLabels:
Expand Down
4 changes: 4 additions & 0 deletions submarine-cloud-v3/artifacts/submarine-virtualservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ apiVersion: networking.istio.io/v1alpha3
kind: VirtualService
metadata:
name: submarine-virtual-service
labels:
app.kubernetes.io/name: submarine-virtual-service
app.kubernetes.io/version: "0.8.0-SNAPSHOT"
app.kubernetes.io/component: virtual-service
spec:
hosts:
- "*"
Expand Down