opencloud/dev-values.yaml

@@ -238,108 +238,6 @@ keto:
           name: open-cloud
       dsn: memory
 
-
-loki:
-  enabled: true
-  loki:
-    auth_enabled: false
-    commonConfig:
-      replication_factor: 1
-    storage:
-      type: filesystem
-      filesystem:
-        chunks_directory: /var/loki/chunks
-        rules_directory: /var/loki/rules
-        admin_api_directory: /var/loki/admin
-    storage_config:
-      boltdb_shipper:
-        active_index_directory: /var/loki/index
-      filesystem:
-        directory: /var/loki/chunks
-    limits_config:
-      allow_structured_metadata: false
-    schemaConfig:
-      configs:
-        - from: "2020-01-01"
-          store: boltdb-shipper
-          object_store: filesystem
-          schema: v11
-          index:
-            prefix: index_
-            period: 24h
-    ingester:
-      chunk_encoding: snappy
-    tracing:
-      enabled: true
-    querier:
-      max_concurrent: 2
-
-  deploymentMode: SingleBinary
-  singleBinary:
-    extraVolumes:
-      - name: loki-storage
-        persistentVolumeClaim:
-          claimName: loki-pvc
-    persistence:
-      enabled: false # Deactivate loki auto provisioning, rely on existing PVC
-      accessMode: ReadWriteOnce
-      size: 1Gi
-      storageClassName: kind-sc
-      claimName: loki-pvc
-
-
-    extraVolumeMounts:
-      - name: loki-storage
-        mountPath: /var/loki 
-    replicas: 1
-    resources:
-      limits:
-        cpu: 3
-        memory: 4Gi
-      requests:
-        cpu: 1
-        memory: 0.5Gi
-    extraEnv:
-      - name: GOMEMLIMIT
-        value: 3750MiB
-
-  chunksCache:
-    # default is 500MB, with limited memory keep this smaller
-    writebackSizeLimit: 10MB
-
-  # Enable minio for storage
-  minio:
-    enabled: false
-
-  # Zero out replica counts of other deployment modes
-  backend:
-    replicas: 0
-  read:
-    replicas: 0
-  write:
-    replicas: 0
-  ingester:
-    replicas: 0
-  querier:
-    replicas: 0
-  queryFrontend:
-    replicas: 0
-  queryScheduler:
-    replicas: 0
-  distributor:
-    replicas: 0
-  compactor:
-    replicas: 0
-  indexGateway:
-    replicas: 0
-  bloomCompactor:
-    replicas: 0
-  bloomGateway:
-    replicas: 0
-
-grafana:
-  enabled: false
-
 ocAuth:
   enabled: true
   image: oc/oc-auth:0.0.1
@@ -438,13 +336,10 @@ ocDatacenter:
       cpu: "128m"
       memory: "256Mi"
 
-ocSchedulerd:
+
-  enabled: true
+
-  image: oc/oc-schedulerd:0.0.1
+loki:
-  resources:
+  enabled: false
-    limits:
+
-      cpu: "128m"
+grafana:
-      memory: "256Mi"
+  enabled: false
-    requests:
-      cpu: "128m"
-      memory: "256Mi"

opencloud/templates/loki.yaml

@@ -1,16 +0,0 @@
-{{- if index .Values.loki.enabled }}
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: {{ .Values.loki.singleBinary.persistence.claimName }}
-  namespace: {{ .Release.Namespace }}
-  annotations:
-    helm.sh/resource-policy: keep
-spec:
-  accessModes:
-    - {{ .Values.loki.singleBinary.persistence.accessMode }}
-  resources:
-    requests:
-      storage: {{ .Values.loki.singleBinary.persistence.size }}
-  storageClassName: {{ .Values.loki.singleBinary.persistence.storageClassName }}
-{{- end }}

opencloud/templates/oc-schedulerd/deployment.yaml

@@ -1,31 +0,0 @@
-{{- if index .Values.ocSchedulerd.enabled }}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: oc-schedulerd
-  name: {{ .Release.Name }}-oc-schedulerd
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: oc-schedulerd
-  template:
-    metadata:
-      labels:
-        app: oc-schedulerd
-    spec:
-      containers:
-      - image: "{{ .Values.ocSchedulerd.image }}"
-        name: oc-schedulerd
-        envFrom:
-        - configMapRef:
-            name: opencloud-config
-        resources:
-          limits:
-            cpu: "{{ .Values.ocSchedulerd.resources.limits.cpu }}"
-            memory: "{{ .Values.ocSchedulerd.resources.limits.memory }}"
-          requests:
-            cpu: "{{ .Values.ocSchedulerd.resources.requests.cpu }}"
-            memory: "{{ .Values.ocSchedulerd.resources.requests.memory }}"
-  {{- end }}

opencloud/templates/openCLoudConf.yaml

@@ -21,5 +21,5 @@ data:
   OC_LDAP_ROLE_BASEDN: "{{ index .Values.ocAuth.ldap.roleBaseDn }}"
   OC_MONGO_URL: "mongodb://{{ index .Values.mongodb.auth.usernames 0 }}:{{ index .Values.mongodb.auth.passwords 0 }}@{{ .Release.Name }}-mongodb.{{ .Release.Namespace }}:27017/{{ index .Values.mongodb.auth.databases 0 }}"
   OC_MONGO_DATABASE: "{{ index .Values.mongodb.auth.databases 0 }}"
-  OC_NATS_URL: "nats://dev-nats.{{ .Release.Namespace }}:4222"
+  OC_NATS_URL: "nats://dev-nats.{{ .Release.Namespace }}.svc.cluster.local:4222"
-  OC_LOKI_URL: "http://{{ .Release.Name }}-loki.{{ .Release.Namespace }}:3100"
+  OC_LOKI_URL: "{{ .Values.SERVER_PATH }}"