Commit b17873b5 authored by psaromanola1's avatar psaromanola1
Browse files

Add resource namespace to the chart

parent 7703119f

chart/ocm-scheduler-chart/templates/cleanup-job.yaml

+11 −11
Changes for chart/ocm-scheduler-chart/templates/cleanup-job.yaml: 11 added lines, 11 removed lines.
Original line number Diff line number Diff line 
apiVersion: v1

kind: ServiceAccount

metadata:

  name: {{ .Release.Name }}-cleanup

  namespace: {{ .Release.Namespace }}

  name: {{ .Values.namespace.name }}-cleanup

  namespace: {{ .Values.namespace.name }}

  annotations:

    "helm.sh/hook": pre-delete

    "helm.sh/hook-weight": "-10"
@@ -11,7 +11,7 @@ metadata: 
apiVersion: rbac.authorization.k8s.io/v1

kind: ClusterRole

metadata:

  name: {{ .Release.Name }}-cleanup

  name: {{ .Values.namespace.name }}-cleanup

  annotations:

    "helm.sh/hook": pre-delete

    "helm.sh/hook-weight": "-10"
@@ -43,7 +43,7 @@ rules: 
apiVersion: rbac.authorization.k8s.io/v1

kind: ClusterRoleBinding

metadata:

  name: {{ .Release.Name }}-cleanup

  name: {{ .Values.namespace.name }}-cleanup

  annotations:

    "helm.sh/hook": pre-delete

    "helm.sh/hook-weight": "-10"
@@ -51,17 +51,17 @@ metadata: 
roleRef:

  apiGroup: rbac.authorization.k8s.io

  kind: ClusterRole

  name: {{ .Release.Name }}-cleanup

  name: {{ .Values.namespace.name }}-cleanup

subjects:

  - kind: ServiceAccount

    name: {{ .Release.Name }}-cleanup

    namespace: {{ .Release.Namespace }}

    name: {{ .Values.namespace.name }}-cleanup

    namespace: {{ .Values.namespace.name }}

---

apiVersion: batch/v1

kind: Job

metadata:

  name: {{ .Release.Name }}-cleanup

  namespace: {{ .Release.Namespace }}

  name: {{ .Values.namespace.name }}-cleanup

  namespace: {{ .Values.namespace.name }}

  annotations:

    "helm.sh/hook": pre-delete

    "helm.sh/hook-weight": "0"
@@ -70,7 +70,7 @@ spec: 
  backoffLimit: 2

  template:

    spec:

      serviceAccountName: {{ .Release.Name }}-cleanup

      serviceAccountName: {{ .Values.namespace.name }}-cleanup

      restartPolicy: Never

      containers:

        - name: kubectl
@@ -79,7 +79,7 @@ spec: 
          args:

            - |

              # Let the running scheduler finalize its own resources first.

              kubectl delete hyposchedulingmanifests --all -n {{ .Release.Namespace | quote }} --ignore-not-found --wait=true --timeout=180s

              kubectl delete hyposchedulingmanifests --all -n {{ .Values.namespace.name | quote }} --ignore-not-found --wait=true --timeout=180s

              # Delete any remaining scheduler-owned ManifestWorks, never unrelated works.

              kubectl delete manifestworks -A -l scheduling.hypo.eu/owner --ignore-not-found --wait=true --timeout=180s

              {{- range $i, $cluster := .Values.managedClusters }}

chart/ocm-scheduler-chart/templates/managed-clusters-job.yaml

+7 −7
Changes for chart/ocm-scheduler-chart/templates/managed-clusters-job.yaml: 7 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -3,12 +3,12 @@ apiVersion: v1 
kind: ServiceAccount

metadata:

  name: hypo-scheduler-setup

  namespace: {{ .Release.Namespace }}

  namespace: {{ .Values.namespace.name }}

---

apiVersion: rbac.authorization.k8s.io/v1

kind: ClusterRole

metadata:

  name: {{ .Release.Name }}-managedcluster-setup

  name: {{ .Values.namespace.name }}-managedcluster-setup

rules:

  - apiGroups: ["cluster.open-cluster-management.io"]

    resources: ["managedclusters"]
@@ -22,21 +22,21 @@ rules: 
apiVersion: rbac.authorization.k8s.io/v1

kind: ClusterRoleBinding

metadata:

  name: {{ .Release.Name }}-managedcluster-setup

  name: {{ .Values.namespace.name }}-managedcluster-setup

roleRef:

  apiGroup: rbac.authorization.k8s.io

  kind: ClusterRole

  name: {{ .Release.Name }}-managedcluster-setup

  name: {{ .Values.namespace.name }}-managedcluster-setup

subjects:

  - kind: ServiceAccount

    name: hypo-scheduler-setup

    namespace: {{ .Release.Namespace }}

    namespace: {{ .Values.namespace.name }}

---

apiVersion: batch/v1

kind: Job

metadata:

  name: {{ .Release.Name }}-configure-clusters

  namespace: {{ .Release.Namespace }}

  name: {{ .Values.namespace.name }}-configure-clusters

  namespace: {{ .Values.namespace.name }}

  annotations:

    helm.sh/hook: post-install,post-upgrade

    helm.sh/hook-weight: "5"

chart/ocm-scheduler-chart/templates/namespace.yaml

0 → 100644
+8 −0
Changes for chart/ocm-scheduler-chart/templates/namespace.yaml: 8 added lines, 0 removed lines.
Original line number Diff line number Diff line 
{{- if .Values.namespace.create }}

apiVersion: v1

kind: Namespace

metadata:

  name: {{ .Values.namespace.name | quote }}

  annotations:

    "helm.sh/resource-policy": keep

{{- end }}

chart/ocm-scheduler-chart/templates/scheduler.yaml

+9 −9
Changes for chart/ocm-scheduler-chart/templates/scheduler.yaml: 9 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ apiVersion: v1 
kind: ServiceAccount

metadata:

  name: hypo-scheduler-controller-manager

  namespace: {{ .Release.Namespace }}

  namespace: {{ .Values.namespace.name }}

---

apiVersion: rbac.authorization.k8s.io/v1

kind: Role

metadata:

  name: hypo-scheduler-leader-election-role

  namespace: {{ .Release.Namespace }}

  namespace: {{ .Values.namespace.name }}

rules:

- apiGroups:

  - ''
@@ -205,7 +205,7 @@ apiVersion: rbac.authorization.k8s.io/v1 
kind: RoleBinding

metadata:

  name: hypo-scheduler-leader-election-rolebinding

  namespace: {{ .Release.Namespace }}

  namespace: {{ .Values.namespace.name }}

roleRef:

  apiGroup: rbac.authorization.k8s.io

  kind: Role
@@ -213,7 +213,7 @@ roleRef: 
subjects:

- kind: ServiceAccount

  name: hypo-scheduler-controller-manager

  namespace: {{ .Release.Namespace }}

  namespace: {{ .Values.namespace.name }}

---

apiVersion: rbac.authorization.k8s.io/v1

kind: ClusterRoleBinding
@@ -226,7 +226,7 @@ roleRef: 
subjects:

- kind: ServiceAccount

  name: hypo-scheduler-controller-manager

  namespace: {{ .Release.Namespace }}

  namespace: {{ .Values.namespace.name }}

---

apiVersion: rbac.authorization.k8s.io/v1

kind: ClusterRoleBinding
@@ -239,13 +239,13 @@ roleRef: 
subjects:

- kind: ServiceAccount

  name: hypo-scheduler-controller-manager

  namespace: {{ .Release.Namespace }}

  namespace: {{ .Values.namespace.name }}

---

apiVersion: v1

kind: Service

metadata:

  name: hypo-scheduler-controller-manager-metrics-service

  namespace: {{ .Release.Namespace }}

  namespace: {{ .Values.namespace.name }}

spec:

  ports:

  - name: https
@@ -259,7 +259,7 @@ apiVersion: apps/v1 
kind: Deployment

metadata:

  name: hypo-scheduler-controller-manager

  namespace: {{ .Release.Namespace }}

  namespace: {{ .Values.namespace.name }}

spec:

  replicas: {{ .Values.scheduler.replicaCount }}

  selector:
@@ -330,7 +330,7 @@ apiVersion: cluster.open-cluster-management.io/v1beta2 
kind: ManagedClusterSetBinding

metadata:

  name: {{ .Values.clusterSet.name | quote }}

  namespace: {{ .Release.Namespace }}

  namespace: {{ .Values.namespace.name }}

spec:

  clusterSet: {{ .Values.clusterSet.name | quote }}

{{- end }}

chart/ocm-scheduler-chart/values.yaml

+7 −5
Changes for chart/ocm-scheduler-chart/values.yaml: 7 added lines, 5 removed lines.
Original line number Diff line number Diff line 
namespace:

  create: false

  name: hypo-scheduler-system

scheduler:

  replicaCount: 1



  image:

    repository: labs.etsi.org:5050/osl/hypo/code/addons/ocm-scheduler/hypo-ocm-scheduler

    tag: v2
@@ -14,9 +16,9 @@ clusterSet: 


managedClusters:

  - name: managed-1

    location: managed-1

    kubeconfigSecretId: managed1-kubeconfig

    location: athens

    kubeconfigSecretId: 97b71df0-650a-4410-8b5f-10dfc08c031a



  - name: managed-2

    location: managed-2

    kubeconfigSecretId: managed2-kubeconfig
 
    location: patra

    kubeconfigSecretId: f55cfe33-18ef-46dc-a3ab-e095dd2af0b1