Param. des variables OCDEPLOY_

README
puml -> oc-doc
2024-09-12 13:12:17 +00:00 · 2024-09-12 11:27:47 +00:00 · 2024-09-11 13:52:27 +00:00 · 2024-09-11 13:49:13 +00:00
82 changed files with 127 additions and 1694 deletions
--- a/Helm/oc-catalog/Chart.yaml
+++ b/Helm/oc-catalog/Chart.yaml
@ -1,5 +0,0 @@
-apiVersion: v2
-name: oc-catalog
-description: A Helm chart for deploying the oc-catalog application
-version: 0.1.0
-appVersion: "1.0"
--- a/Helm/oc-catalog/templates/service.yml
+++ b/Helm/oc-catalog/templates/service.yml
@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Release.Name }}-oc-catalog
-spec:
-  selector:
-    app: {{ .Chart.Name }}
-  ports:
-    - protocol: TCP
-      port: {{ .Values.service.port }}
-      targetPort: {{ .Values.service.targetPort }}
-  type: {{ .Values.service.type }}
--- a/Helm/oc-catalog/templates/statefulset.yml
+++ b/Helm/oc-catalog/templates/statefulset.yml
@ -1,33 +0,0 @@
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: {{ .Release.Name }}-oc-catalog
-  labels:
-    app: oc-catalog
-spec:
-  serviceName: "{{ .Release.Name }}-oc-catalog"
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      app: oc-catalog
-  template:
-    metadata:
-      labels:
-        app: oc-catalog
-    spec:
-      containers:
-      - name: oc-catalog
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-        ports:
-        - containerPort: 8080
-        env:
-        - name: MONGO_DATABASE
-          value: "DC_myDC"
-        - name: MONGO_URI
-          value: "mongodb://mongo:27017"
-      imagePullSecrets:
-      {{- if .Values.imagePullSecrets }}
-      {{- range .Values.imagePullSecrets }}
-        - name: {{ .name }}
-      {{- end }}
-      {{- end }}
--- a/Helm/oc-catalog/values.yaml
+++ b/Helm/oc-catalog/values.yaml
@ -1,19 +0,0 @@
-replicaCount: 1
-
-image:
-  repository: registry.dev.svc.cluster.local:5000/oc-catalog
-  tag: latest
-  pullPolicy: IfNotPresent
-
-service:
-  type: NodePort
-  port: 8087
-  targetPort: 8080
-
-mongo:
-  database: DC_myDC
-  uri: mongodb://mongo:27017
-
-imagePullSecrets:
-  - name: regcred
-
--- a/Helm/oc-deploy/.helmignore
+++ b/Helm/oc-deploy/.helmignore
@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
--- a/Helm/oc-deploy/Chart.lock
+++ b/Helm/oc-deploy/Chart.lock
@ -1,12 +0,0 @@
-dependencies:
- name: oc-mongo
-  repository: file://../oc-mongo
-  version: 0.1.0
- name: oc-mongo-express
-  repository: file://../oc-mongo-express
-  version: 0.1.0
- name: oc-catalog
-  repository: file://../oc-catalog
-  version: 0.1.0
-digest: sha256:036af8acf7fe0a73f039776d13f63aeb7530e7a8b0febb49fd5e8415ac6672c6
-generated: "2024-08-27T14:34:41.6038407+02:00"
--- a/Helm/oc-deploy/Chart.yaml
+++ b/Helm/oc-deploy/Chart.yaml
@ -1,14 +0,0 @@
-apiVersion: v2
-name: oc-deploy
-description: A Helm chart to deploy oc-mongo, oc-mongo-express, and oc-catalog together
-version: 0.1.0
-dependencies:
-  - name: oc-mongo
-    version: 0.1.0
-    repository: "file://../oc-mongo"
-  - name: oc-mongo-express
-    version: 0.1.0
-    repository: "file://../oc-mongo-express"
-  - name: oc-catalog
-    version: 0.1.0
-    repository: "file://../oc-catalog"
--- a/Helm/oc-deploy/charts/oc-catalog-0.1.0.tgz
+++ b/Helm/oc-deploy/charts/oc-catalog-0.1.0.tgz
--- a/Helm/oc-deploy/charts/oc-catalog/Chart.yaml
+++ b/Helm/oc-deploy/charts/oc-catalog/Chart.yaml
@ -1,5 +0,0 @@
-apiVersion: v2
-name: oc-catalog
-description: A Helm chart for deploying the oc-catalog application
-version: 0.1.0
-appVersion: "1.0"
--- a/Helm/oc-deploy/charts/oc-catalog/templates/service.yml
+++ b/Helm/oc-deploy/charts/oc-catalog/templates/service.yml
@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: oc-catalog
-spec:
-  selector:
-    app: {{ .Chart.Name }}
-  ports:
-    - protocol: TCP
-      port: {{ .Values.service.port }}
-      targetPort: {{ .Values.service.targetPort }}
-  type: {{ .Values.service.type }}
--- a/Helm/oc-deploy/charts/oc-catalog/templates/statefulset.yml
+++ b/Helm/oc-deploy/charts/oc-catalog/templates/statefulset.yml
@ -1,33 +0,0 @@
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: {{ .Release.Name }}-oc-catalog
-  labels:
-    app: oc-catalog
-spec:
-  serviceName: "oc-catalog"
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      app: oc-catalog
-  template:
-    metadata:
-      labels:
-        app: oc-catalog
-    spec:
-      containers:
-      - name: oc-catalog
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-        ports:
-        - containerPort: 8080
-        env:
-        - name: MONGO_DATABASE
-          value: "DC_myDC"
-        - name: MONGO_URI
-          value: "mongodb://{{ .Release.Name }}-mongo:27017"
-      imagePullSecrets:
-      {{- if .Values.imagePullSecrets }}
-      {{- range .Values.imagePullSecrets }}
-        - name: {{ .name }}
-      {{- end }}
-      {{- end }}
--- a/Helm/oc-deploy/charts/oc-catalog/values.yaml
+++ b/Helm/oc-deploy/charts/oc-catalog/values.yaml
@ -1,19 +0,0 @@
-replicaCount: 1
-
-image:
-  repository: registry.dev.svc.cluster.local:5000/oc-catalog
-  tag: latest
-  pullPolicy: IfNotPresent
-
-service:
-  type: NodePort
-  port: 8087
-  targetPort: 8080
-
-mongo:
-  database: DC_myDC
-  uri: mongodb://oc-deploy-mongo:27017
-
-imagePullSecrets:
-  - name: regcred
-
--- a/Helm/oc-deploy/charts/oc-mongo-0.1.0.tgz
+++ b/Helm/oc-deploy/charts/oc-mongo-0.1.0.tgz
--- a/Helm/oc-deploy/charts/oc-mongo-express-0.1.0.tgz
+++ b/Helm/oc-deploy/charts/oc-mongo-express-0.1.0.tgz
--- a/Helm/oc-deploy/charts/oc-mongo-express/Chart.yaml
+++ b/Helm/oc-deploy/charts/oc-mongo-express/Chart.yaml
@ -1,5 +0,0 @@
-apiVersion: v2
-name: oc-mongo-express
-description: A Helm chart for deploying mongo-express
-version: 0.1.0
-appVersion: "1.0"
--- a/Helm/oc-deploy/charts/oc-mongo-express/templates/service.yaml
+++ b/Helm/oc-deploy/charts/oc-mongo-express/templates/service.yaml
@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: mongo-express
-spec:
-  selector:
-    app: mongo-express
-  ports:
-    - protocol: TCP
-      port: {{ .Values.service.port }}
-      targetPort: {{ .Values.service.targetPort }}
-  type: {{ .Values.service.type }}
--- a/Helm/oc-deploy/charts/oc-mongo-express/templates/statefulset.yaml
+++ b/Helm/oc-deploy/charts/oc-mongo-express/templates/statefulset.yaml
@ -1,39 +0,0 @@
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: {{ .Release.Name }}-mongo-express
-  labels:
-    app: mongo-express
-spec:
-  serviceName: "mongo-express"
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      app: mongo-express
-  template:
-    metadata:
-      labels:
-        app: mongo-express
-    spec:
-      containers:
-      - name: mongo-express
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-        ports:
-        - containerPort: {{ .Values.service.targetPort }}
-        env:
-        - name: ME_CONFIG_BASICAUTH_USERNAME
-          valueFrom:
-            secretKeyRef:
-              name: mongo-secret
-              key: {{ .Values.secret.usernameKey }}
-        - name: ME_CONFIG_BASICAUTH_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: mongo-secret
-              key: {{ .Values.secret.passwordKey }}
-      imagePullSecrets:
-      {{- if .Values.imagePullSecrets }}
-      {{- range .Values.imagePullSecrets }}
-        - name: {{ .name }}
-      {{- end }}
-      {{- end }}
--- a/Helm/oc-deploy/charts/oc-mongo-express/values.yaml
+++ b/Helm/oc-deploy/charts/oc-mongo-express/values.yaml
@ -1,18 +0,0 @@
-replicaCount: 1
-
-image:
-  repository: mongo-express
-  tag: latest
-  pullPolicy: IfNotPresent
-
-service:
-  port: 8081
-  targetPort: 8081
-  type: NodePort
-
-imagePullSecrets:
-  - name: my-registry-key
-
-secret:
-  usernameKey: mongo-username
-  passwordKey: mongo-password
--- a/Helm/oc-deploy/charts/oc-mongo/Chart.yaml
+++ b/Helm/oc-deploy/charts/oc-mongo/Chart.yaml
@ -1,5 +0,0 @@
-apiVersion: v2
-name: oc-mongo
-description: A Helm chart for deploying the oc-mongo component
-version: 0.1.0
-appVersion: "1.0"
--- a/Helm/oc-deploy/charts/oc-mongo/templates/pvc.yaml
+++ b/Helm/oc-deploy/charts/oc-mongo/templates/pvc.yaml
@ -1,10 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: {{ .Values.persistence.name }}
-spec:
-  accessModes:
-    - {{ .Values.persistence.accessMode }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.size }}
--- a/Helm/oc-deploy/charts/oc-mongo/templates/secret.yaml
+++ b/Helm/oc-deploy/charts/oc-mongo/templates/secret.yaml
@ -1,8 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ .Release.Name }}-mongo-secret
-type: Opaque
-data:
-  username: {{ .Values.secret.username }}
-  password: {{ .Values.secret.password }}
--- a/Helm/oc-deploy/charts/oc-mongo/templates/service.yaml
+++ b/Helm/oc-deploy/charts/oc-mongo/templates/service.yaml
@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: mongo
-spec:
-  selector:
-    app: mongo
-  ports:
-    - protocol: TCP
-      port: {{ .Values.service.port }}
-      targetPort: {{ .Values.service.port }}
--- a/Helm/oc-deploy/charts/oc-mongo/templates/statefulset.yaml
+++ b/Helm/oc-deploy/charts/oc-mongo/templates/statefulset.yaml
@ -1,31 +0,0 @@
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: {{ .Release.Name }}-mongo
-  labels:
-    app: mongo
-spec:
-  serviceName: "mongo"
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      app: mongo
-  template:
-    metadata:
-      labels:
-        app: mongo
-    spec:
-      containers:
-      - name: mongo
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-        ports:
-        - containerPort: 27017
-        volumeMounts:
-        - name: mongo-persistent-storage
-          mountPath: /data/db
-        - name: mongo-persistent-storage
-          mountPath: /data/configdb
-      volumes:
-      - name: mongo-persistent-storage
-        persistentVolumeClaim:
-          claimName: {{ .Values.persistence.name }}
--- a/Helm/oc-deploy/charts/oc-mongo/values.yaml
+++ b/Helm/oc-deploy/charts/oc-mongo/values.yaml
@ -1,19 +0,0 @@
-replicaCount: 1
-
-image:
-  repository: mongo
-  tag: latest
-  pullPolicy: IfNotPresent
-
-service:
-  port: 27017
-
-persistence:
-  name: mongo-pvc-helm
-  enabled: true
-  accessMode: ReadWriteOnce
-  size: 1Gi
-
-secret:
-  username: dGVzdA==  # base64 encoding of 'test'
-  password: dGVzdA==  # base64 encoding of 'test'
--- a/Helm/oc-deploy/values.yaml
+++ b/Helm/oc-deploy/values.yaml
@ -1,48 +0,0 @@
-oc-mongo:
-  replicaCount: 1
-  image:
-    repository: registry.dev.svc.cluster.local:5000/mongo
-    tag: latest
-    pullPolicy: IfNotPresent
-  service:
-    port: 27017
-  persistence:
-    name: mongo-pvc-helm
-    enabled: true
-    accessMode: ReadWriteOnce
-    size: 1Gi
-  secret:
-    username: dGVzdA==  # base64 encoding of 'test'
-    password: dGVzdA==  # base64 encoding of 'test'
-
-oc-mongo-express:
-  replicaCount: 1
-  image:
-    repository: registry.dev.svc.cluster.local:5000/mongo-express
-    tag: latest
-    pullPolicy: IfNotPresent
-  service:
-    port: 8081
-    targetPort: 8081
-    type: NodePort
-  imagePullSecrets:
-    - name: regcred
-  secret:
-    usernameKey: mongo-username
-    passwordKey: mongo-password
-
-oc-catalog:
-  replicaCount: 1
-  image:
-    repository: registry.dev.svc.cluster.local:5000/oc-catalog
-    tag: latest
-    pullPolicy: IfNotPresent
-  service:
-    type: NodePort
-    port: 8087
-    targetPort: 8080
-  mongo:
-    database: DC_myDC
-    uri: mongodb://oc-catalog-mongo:27017
-  imagePullSecrets:
-    - name: regcred
--- a/Helm/oc-mongo-express/Chart.yaml
+++ b/Helm/oc-mongo-express/Chart.yaml
@ -1,5 +0,0 @@
-apiVersion: v2
-name: oc-mongo-express
-description: A Helm chart for deploying mongo-express
-version: 0.1.0
-appVersion: "1.0"
--- a/Helm/oc-mongo-express/templates/service.yaml
+++ b/Helm/oc-mongo-express/templates/service.yaml
@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Release.Name }}-mongo-express
-spec:
-  selector:
-    app: mongo-express
-  ports:
-    - protocol: TCP
-      port: {{ .Values.service.port }}
-      targetPort: {{ .Values.service.targetPort }}
-  type: {{ .Values.service.type }}
--- a/Helm/oc-mongo-express/templates/statefulset.yaml
+++ b/Helm/oc-mongo-express/templates/statefulset.yaml
@ -1,39 +0,0 @@
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: {{ .Release.Name }}-mongo-express
-  labels:
-    app: mongo-express
-spec:
-  serviceName: "{{ .Release.Name }}-mongo-express"
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      app: mongo-express
-  template:
-    metadata:
-      labels:
-        app: mongo-express
-    spec:
-      containers:
-      - name: mongo-express
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-        ports:
-        - containerPort: {{ .Values.service.targetPort }}
-        env:
-        - name: ME_CONFIG_BASICAUTH_USERNAME
-          valueFrom:
-            secretKeyRef:
-              name: mongo-secret
-              key: {{ .Values.secret.usernameKey }}
-        - name: ME_CONFIG_BASICAUTH_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: mongo-secret
-              key: {{ .Values.secret.passwordKey }}
-      imagePullSecrets:
-      {{- if .Values.imagePullSecrets }}
-      {{- range .Values.imagePullSecrets }}
-        - name: {{ .name }}
-      {{- end }}
-      {{- end }}
--- a/Helm/oc-mongo-express/values.yaml
+++ b/Helm/oc-mongo-express/values.yaml
@ -1,18 +0,0 @@
-replicaCount: 1
-
-image:
-  repository: mongo-express
-  tag: latest
-  pullPolicy: IfNotPresent
-
-service:
-  port: 8081
-  targetPort: 8081
-  type: NodePort
-
-imagePullSecrets:
-  - name: my-registry-key
-
-secret:
-  usernameKey: mongo-username
-  passwordKey: mongo-password
--- a/Helm/oc-mongo/Chart.yaml
+++ b/Helm/oc-mongo/Chart.yaml
@ -1,5 +0,0 @@
-apiVersion: v2
-name: oc-mongo
-description: A Helm chart for deploying the oc-mongo component
-version: 0.1.0
-appVersion: "1.0"
--- a/Helm/oc-mongo/templates/pvc.yaml
+++ b/Helm/oc-mongo/templates/pvc.yaml
@ -1,10 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: {{ .Values.persistence.name }}
-spec:
-  accessModes:
-    - {{ .Values.persistence.accessMode }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.size }}
--- a/Helm/oc-mongo/templates/secret.yaml
+++ b/Helm/oc-mongo/templates/secret.yaml
@ -1,8 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ .Release.Name }}-mongo-secret
-type: Opaque
-data:
-  username: {{ .Values.secret.username }}
-  password: {{ .Values.secret.password }}
--- a/Helm/oc-mongo/templates/service.yaml
+++ b/Helm/oc-mongo/templates/service.yaml
@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: mongo
-spec:
-  selector:
-    app: mongo
-  ports:
-    - protocol: TCP
-      port: {{ .Values.service.port }}
-      targetPort: {{ .Values.service.port }}
--- a/Helm/oc-mongo/templates/statefulset.yaml
+++ b/Helm/oc-mongo/templates/statefulset.yaml
@ -1,31 +0,0 @@
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: {{ .Release.Name }}-mongo
-  labels:
-    app: mongo
-spec:
-  serviceName: "{{ .Release.Name }}-mongo"
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      app: mongo
-  template:
-    metadata:
-      labels:
-        app: mongo
-    spec:
-      containers:
-      - name: mongo
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-        ports:
-        - containerPort: 27017
-        volumeMounts:
-        - name: mongo-persistent-storage
-          mountPath: /data/db
-        - name: mongo-persistent-storage
-          mountPath: /data/configdb
-      volumes:
-      - name: mongo-persistent-storage
-        persistentVolumeClaim:
-          claimName: {{ .Values.persistence.name }}
--- a/Helm/oc-mongo/values.yaml
+++ b/Helm/oc-mongo/values.yaml
@ -1,19 +0,0 @@
-replicaCount: 1
-
-image:
-  repository: mongo
-  tag: latest
-  pullPolicy: IfNotPresent
-
-service:
-  port: 27017
-
-persistence:
-  name: mongo-pvc-helm
-  enabled: true
-  accessMode: ReadWriteOnce
-  size: 1Gi
-
-secret:
-  username: dGVzdA==  # base64 encoding of 'test'
-  password: dGVzdA==  # base64 encoding of 'test'
--- a/README.md
+++ b/README.md
@ -4,20 +4,17 @@ The purpose of oc-deploy, is to deploy all the OC components over a Kubernetes c

 An OpenCloud deployment is composed of the following layers: 

-OpenCloud components | <-- TODO
--------------------------
-KubernetesCluster | <-- TODO
-------------------------- 
-IaaS (VMs, LAN) | <-- pre-requisite
--------------------------
-HW (network and servers) | <-- pre-requisite
--------------------------
+
+| Layer                    | Tool                  |
+| ------------------------ | --------------------- |
+| OpenCloud components     | oc-deploy binary      |
+| KubernetesCluster        | TODO or pre-requisite |
+| IaaS (VMs, LAN)          | pre-requisite         |
+| HW (network and servers) | <-- pre-requisite     |


 It thus contains a first optional installation layer which deploys the Kubernetes nodes (control plane(s) and workers) above an existing infrastructure (Iaas).

-Then the second installation layer uses Helm charts to deploy and configure all the OC components.
-
 This documentation will be updated with the needed command and/or requirements to properly execute the installation.

 # Deploy cluster
--- a/arch/oc-deploy.puml
+++ b/arch/oc-deploy.puml
@ -1,53 +0,0 @@
-@startuml
-
-top to bottom direction
-
-component front as "oc-front" #MistyRose
-
-component api as "oc-api" #BlueViolet
-component auth as "oc-auth" #BlueViolet
-
-component catalog as "oc-catalog" #MistyRose
-component workspace as "oc-workspace" #MistyRose
-component workflow as "oc-workflow" #MistyRose
-component calendarIn as "oc-calendar-in" #MistyRose
-component calendarOut as "oc-calendar-out" #MistyRose
-component stat as "oc-status" #MistyRose
-
-component disco as "oc-discovery" #MistyRose
-component agg as "oc-aggregator" #MistyRose
-
-component scheduler as "oc-scheduler" #LightYellow
-component monitor as "oc-monitor" #LightYellow
-
-database rd as "Nats" #Green
-database zn as "Zinc" #Green
-database loki as "Loki" #Green
-database mongo as "MongoDB" #Green
-database nats as "Nats" #Green
-
-front -- api
-
-api -- auth : auth user
-api -- catalog : local search
-api -- workspace : store user data
-api -- workflow
-api -- calendarIn
-api -- calendarOut
-api -- stat
-
-catalog -- disco
-catalog -- agg
-
-scheduler -- monitor
-scheduler -- catalog
-
-rd -- scheduler
-loki -- monitor
-
-catalog -- mongo  : store resources available for users
-workspace -- mongo  : store resources allocated to a workspace
-workflow -- mongo  : store workflow 
-calendarOut -- mongo  : store booking informations for this dc
-
-@enduml
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@ -1,88 +0,0 @@
-version: '3.8'
-
-services:
-  traefik:
-    image: traefik:latest
-    command:
-      - "--api.insecure=true"
-      - "--providers.docker=true"
-      - "--entrypoints.web.address=:80"
-    ports:
-      - "80:80"
-      - "8080:8080"
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-
-  mongo:
-    image: mongo:latest
-    ports:
-      - "27017:27017"
-    volumes:
-      - mongo-data:/data/db
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.mongo.rule=PathPrefix(`/mongo`)"
-      - "traefik.http.services.mongo.loadbalancer.server.port=27017"
-
-  nats:
-    image: nats:latest
-    ports:
-      - "4222:4222"
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.nats.rule=PathPrefix(`/nats`)"
-      - "traefik.http.services.nats.loadbalancer.server.port=4222"
-
-  zinc:
-    image: public.ecr.aws/zinclabs/zincsearch:latest
-    ports:
-      - "4080:4080"
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.zinc.rule=PathPrefix(`/zinc`)"
-      - "traefik.http.services.zinc.loadbalancer.server.port=4080"
-
-  dex:
-    image: quay.io/dexidp/dex:latest
-    ports:
-      - "5556:5556"
-    volumes:
-      - ./dex/config.yaml:/etc/dex/cfg/config.yaml
-    command: ["dex", "serve", "/etc/dex/cfg/config.yaml"]
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.dex.rule=PathPrefix(`/dex`)"
-      - "traefik.http.services.dex.loadbalancer.server.port=5556"
-
-  ldap:
-    image: bitnami/openldap
-    ports:
-      - "389:389"
-    environment:
-      - LDAP_ADMIN_USERNAME=admin
-      - LDAP_ADMIN_PASSWORD=adminpassword
-      - LDAP_USERS=user01,user02
-      - LDAP_PASSWORDS=password1,password2
-
-  grafana:
-    image: grafana/grafana:latest
-    ports:
-      - "3000:3000"
-    environment:
-      GF_SECURITY_ADMIN_PASSWORD: "admin"
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.grafana.rule=PathPrefix(`/grafana`)"
-      - "traefik.http.services.grafana.loadbalancer.server.port=3000"
-
-  loki:
-    image: grafana/loki:latest
-    ports:
-      - "3100:3100"
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.loki.rule=PathPrefix(`/loki`)"
-      - "traefik.http.services.loki.loadbalancer.server.port=3100"
-
-volumes:
-  mongo-data:
--- a/kube/occhart/.helmignore
+++ b/kube/occhart/.helmignore
@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
--- a/kube/occhart/Chart.yaml
+++ b/kube/occhart/Chart.yaml
@ -1,24 +0,0 @@
-apiVersion: v2
-name: occhart
-description: A Helm chart for Kubernetes
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
-appVersion: "1.16.0"
--- a/kube/occhart/charts/dex/dex-deployment.yaml
+++ b/kube/occhart/charts/dex/dex-deployment.yaml
@ -1,32 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: dex
-  labels:
-    app: dex
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: dex
-  template:
-    metadata:
-      labels:
-        app: dex
-    spec:
-      containers:
-        - name: dex
-          image: quay.io/dexidp/dex:v2.27.0
-          ports:
-            - containerPort: 5556
-          args:
-            - serve
-            - /etc/dex/cfg/config.yaml
-          volumeMounts:
-            - mountPath: /etc/dex/cfg
-              name: config
-      volumes:
-        - name: config
-          configMap:
-            name: dex-config
-  
--- a/kube/occhart/charts/dex/dex-service.yaml
+++ b/kube/occhart/charts/dex/dex-service.yaml
@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: dex
-  labels:
-    app: dex
-spec:
-  ports:
-    - port: 5556
-  selector:
-    app: dex
--- a/kube/occhart/charts/grafana/grafana-deployment.yaml
+++ b/kube/occhart/charts/grafana/grafana-deployment.yaml
@ -1,21 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: grafana
-  labels:
-    app: grafana
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: grafana
-  template:
-    metadata:
-      labels:
-        app: grafana
-    spec:
-      containers:
-        - name: grafana
-          image: grafana/grafana:7.5.0
-          ports:
-            - containerPort: 3000
--- a/kube/occhart/charts/grafana/grafana-service.yaml
+++ b/kube/occhart/charts/grafana/grafana-service.yaml
@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: grafana
-  labels:
-    app: grafana
-spec:
-  ports:
-    - port: 3000
-  selector:
-    app: grafana
--- a/kube/occhart/charts/ldap/ldap-deployment.yaml
+++ b/kube/occhart/charts/ldap/ldap-deployment.yaml
@ -1,21 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: ldap
-  labels:
-    app: ldap
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: ldap
-  template:
-    metadata:
-      labels:
-        app: ldap
-    spec:
-      containers:
-        - name: ldap
-          image: osixia/openldap:1.5.0
-          ports:
-            - containerPort: 389
--- a/kube/occhart/charts/ldap/ldap-service.yaml
+++ b/kube/occhart/charts/ldap/ldap-service.yaml
@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: ldap
-  labels:
-    app: ldap
-spec:
-  ports:
-    - port: 389
-  selector:
-    app: ldap
--- a/kube/occhart/charts/loki/loki-deployment.yaml
+++ b/kube/occhart/charts/loki/loki-deployment.yaml
@ -1,21 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: loki
-  labels:
-    app: loki
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: loki
-  template:
-    metadata:
-      labels:
-        app: loki
-    spec:
-      containers:
-        - name: loki
-          image: grafana/loki:2.2.0
-          ports:
-            - containerPort: 3100
--- a/kube/occhart/charts/loki/loki-service.yaml
+++ b/kube/occhart/charts/loki/loki-service.yaml
@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: loki
-  labels:
-    app: loki
-spec:
-  ports:
-    - port: 3100
-  selector:
-    app: loki
--- a/kube/occhart/charts/mongo/mongo-deployment.yaml
+++ b/kube/occhart/charts/mongo/mongo-deployment.yaml
@ -1,21 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: mongo
-  labels:
-    app: mongo
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: mongo
-  template:
-    metadata:
-      labels:
-        app: mongo
-    spec:
-      containers:
-        - name: mongo
-          image: mongo:4.4
-          ports:
-            - containerPort: 27017
--- a/kube/occhart/charts/mongo/mongo-service.yaml
+++ b/kube/occhart/charts/mongo/mongo-service.yaml
@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: mongo
-  labels:
-    app: mongo
-spec:
-  ports:
-    - port: 27017
-  selector:
-    app: mongo
--- a/kube/occhart/charts/nats/nats-deployment.yaml
+++ b/kube/occhart/charts/nats/nats-deployment.yaml
@ -1,21 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: nats
-  labels:
-    app: nats
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: nats
-  template:
-    metadata:
-      labels:
-        app: nats
-    spec:
-      containers:
-        - name: nats
-          image: nats:2.1.9
-          ports:
-            - containerPort: 4222
--- a/kube/occhart/charts/nats/nats-service.yaml
+++ b/kube/occhart/charts/nats/nats-service.yaml
@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: nats
-  labels:
-    app: nats
-spec:
-  ports:
-    - port: 4222
-  selector:
-    app: nats
--- a/kube/occhart/charts/traefik/traefik-deployment.yaml
+++ b/kube/occhart/charts/traefik/traefik-deployment.yaml
@ -1,37 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: traefik
-  labels:
-    app: traefik
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: traefik
-  template:
-    metadata:
-      labels:
-        app: traefik
-    spec:
-      containers:
-        - name: traefik
-          image: traefik:v2.4
-          ports:
-            - name: web
-              containerPort: 80
-            - name: admin
-              containerPort: 8080
-          args:
-            - --entrypoints.web.address=:80
-            - --entrypoints.websecure.address=:443
-            - --providers.kubernetescrd
-            - --api
-          volumeMounts:
-            - mountPath: /etc/traefik
-              name: traefik-config
-      volumes:
-        - name: traefik-config
-          configMap:
-            name: traefik-config
-
--- a/kube/occhart/charts/traefik/traefik-ingress.yaml
+++ b/kube/occhart/charts/traefik/traefik-ingress.yaml
@ -1,81 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: traefik-ingress
-  annotations:
-    traefik.ingress.kubernetes.io/router.entrypoints: web
-spec:
-  rules:
-    - host: <your-domain>
-      http:
-        paths:
-          - path: /front
-            pathType: Prefix
-            backend:
-              service:
-                name: front-service
-                port:
-                  number: 80
-          - path: /back1
-            pathType: Prefix
-            backend:
-              service:
-                name: back1-service
-                port:
-                  number: 80
-          - path: /back2
-            pathType: Prefix
-            backend:
-              service:
-                name: back2-service
-                port:
-                  number: 80
-          - path: /mongo
-            pathType: Prefix
-            backend:
-              service:
-                name: mongo
-                port:
-                  number: 27017
-          - path: /nats
-            pathType: Prefix
-            backend:
-              service:
-                name: nats
-                port:
-                  number: 4222
-          - path: /zinc
-            pathType: Prefix
-            backend:
-              service:
-                name: zinc
-                port:
-                  number: 4080
-          - path: /dex
-            pathType: Prefix
-            backend:
-              service:
-                name: dex
-                port:
-                  number: 5556
-          - path: /ldap
-            pathType: Prefix
-            backend:
-              service:
-                name: ldap
-                port:
-                  number: 389
-          - path: /grafana
-            pathType: Prefix
-            backend:
-              service:
-                name: grafana
-                port:
-                  number: 3000
-          - path: /loki
-            pathType: Prefix
-            backend:
-              service:
-                name: loki
-                port:
-                  number: 3100
--- a/kube/occhart/charts/traefik/traefik-service.yaml
+++ b/kube/occhart/charts/traefik/traefik-service.yaml
@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: traefik
-  labels:
-    app: traefik
-spec:
-  type: LoadBalancer
-  ports:
-    - port: 80
-      name: web
-      targetPort: 80
-    - port: 8080
-      name: admin
-      targetPort: 8080
-  selector:
-    app: traefik
--- a/kube/occhart/charts/zinc/zinc-deployment.yaml
+++ b/kube/occhart/charts/zinc/zinc-deployment.yaml
@ -1,21 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: zinc
-  labels:
-    app: zinc
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: zinc
-  template:
-    metadata:
-      labels:
-        app: zinc
-    spec:
-      containers:
-        - name: zinc
-          image: public.ecr.aws/zinclabs/zinc:latest
-          ports:
-            - containerPort: 4080
--- a/kube/occhart/charts/zinc/zinc-service.yaml
+++ b/kube/occhart/charts/zinc/zinc-service.yaml
@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: zinc
-  labels:
-    app: zinc
-spec:
-  ports:
-    - port: 4080
-  selector:
-    app: zinc
--- a/kube/occhart/templates/NOTES.txt
+++ b/kube/occhart/templates/NOTES.txt
@ -1,22 +0,0 @@
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range $host := .Values.ingress.hosts }}
-  {{- range .paths }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
-  {{- end }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "occhart.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch its status by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "occhart.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "occhart.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "occhart.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
-{{- end }}
--- a/kube/occhart/templates/_helpers.tpl
+++ b/kube/occhart/templates/_helpers.tpl
@ -1,62 +0,0 @@
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "occhart.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "occhart.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "occhart.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "occhart.labels" -}}
-helm.sh/chart: {{ include "occhart.chart" . }}
-{{ include "occhart.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "occhart.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "occhart.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "occhart.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "occhart.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
--- a/kube/occhart/templates/deployment.yaml
+++ b/kube/occhart/templates/deployment.yaml
@ -1,68 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "occhart.fullname" . }}
-  labels:
-    {{- include "occhart.labels" . | nindent 4 }}
-spec:
-  {{- if not .Values.autoscaling.enabled }}
-  replicas: {{ .Values.replicaCount }}
-  {{- end }}
-  selector:
-    matchLabels:
-      {{- include "occhart.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      {{- with .Values.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      labels:
-        {{- include "occhart.labels" . | nindent 8 }}
-        {{- with .Values.podLabels }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-    spec:
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "occhart.serviceAccountName" . }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      containers:
-        - name: {{ .Chart.Name }}
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          ports:
-            - name: http
-              containerPort: {{ .Values.service.port }}
-              protocol: TCP
-          livenessProbe:
-            {{- toYaml .Values.livenessProbe | nindent 12 }}
-          readinessProbe:
-            {{- toYaml .Values.readinessProbe | nindent 12 }}
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-          {{- with .Values.volumeMounts }}
-          volumeMounts:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-      {{- with .Values.volumes }}
-      volumes:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
--- a/kube/occhart/templates/hpa.yaml
+++ b/kube/occhart/templates/hpa.yaml
@ -1,32 +0,0 @@
-{{- if .Values.autoscaling.enabled }}
-apiVersion: autoscaling/v2
-kind: HorizontalPodAutoscaler
-metadata:
-  name: {{ include "occhart.fullname" . }}
-  labels:
-    {{- include "occhart.labels" . | nindent 4 }}
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: {{ include "occhart.fullname" . }}
-  minReplicas: {{ .Values.autoscaling.minReplicas }}
-  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
-  metrics:
-    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: cpu
-        target:
-          type: Utilization
-          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
-    {{- end }}
-    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: memory
-        target:
-          type: Utilization
-          averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    {{- end }}
-{{- end }}
--- a/kube/occhart/templates/ingress.yaml
+++ b/kube/occhart/templates/ingress.yaml
@ -1,61 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "occhart.fullname" . -}}
-{{- $svcPort := .Values.service.port -}}
-{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
-  {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
-  {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
-  {{- end }}
-{{- end }}
-{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1
-{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    {{- include "occhart.labels" . | nindent 4 }}
-  {{- with .Values.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
-  ingressClassName: {{ .Values.ingress.className }}
-  {{- end }}
-  {{- if .Values.ingress.tls }}
-  tls:
-    {{- range .Values.ingress.tls }}
-    - hosts:
-        {{- range .hosts }}
-        - {{ . | quote }}
-        {{- end }}
-      secretName: {{ .secretName }}
-    {{- end }}
-  {{- end }}
-  rules:
-    {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
-        paths:
-          {{- range .paths }}
-          - path: {{ .path }}
-            {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
-            pathType: {{ .pathType }}
-            {{- end }}
-            backend:
-              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
-              service:
-                name: {{ $fullName }}
-                port:
-                  number: {{ $svcPort }}
-              {{- else }}
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
-              {{- end }}
-          {{- end }}
-    {{- end }}
-{{- end }}
--- a/kube/occhart/templates/service.yaml
+++ b/kube/occhart/templates/service.yaml
@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "occhart.fullname" . }}
-  labels:
-    {{- include "occhart.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - port: {{ .Values.service.port }}
-      targetPort: http
-      protocol: TCP
-      name: http
-  selector:
-    {{- include "occhart.selectorLabels" . | nindent 4 }}
--- a/kube/occhart/templates/serviceaccount.yaml
+++ b/kube/occhart/templates/serviceaccount.yaml
@ -1,13 +0,0 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "occhart.serviceAccountName" . }}
-  labels:
-    {{- include "occhart.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-automountServiceAccountToken: {{ .Values.serviceAccount.automount }}
-{{- end }}
--- a/kube/occhart/templates/tests/test-connection.yaml
+++ b/kube/occhart/templates/tests/test-connection.yaml
@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "{{ include "occhart.fullname" . }}-test-connection"
-  labels:
-    {{- include "occhart.labels" . | nindent 4 }}
-  annotations:
-    "helm.sh/hook": test
-spec:
-  containers:
-    - name: wget
-      image: busybox
-      command: ['wget']
-      args: ['{{ include "occhart.fullname" . }}:{{ .Values.service.port }}']
-  restartPolicy: Never
--- a/kube/occhart/values.yaml
+++ b/kube/occhart/values.yaml
@ -1,107 +0,0 @@
-# Default values for occhart.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-image:
-  repository: nginx
-  pullPolicy: IfNotPresent
-  # Overrides the image tag whose default is the chart appVersion.
-  tag: ""
-
-imagePullSecrets: []
-nameOverride: ""
-fullnameOverride: ""
-
-serviceAccount:
-  # Specifies whether a service account should be created
-  create: true
-  # Automatically mount a ServiceAccount's API credentials?
-  automount: true
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: ""
-
-podAnnotations: {}
-podLabels: {}
-
-podSecurityContext: {}
-  # fsGroup: 2000
-
-securityContext: {}
-  # capabilities:
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
-
-ingress:
-  enabled: false
-  className: ""
-  annotations: {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
-  hosts:
-    - host: chart-example.local
-      paths:
-        - path: /
-          pathType: ImplementationSpecific
-  tls: []
-  #  - secretName: chart-example-tls
-  #    hosts:
-  #      - chart-example.local
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-livenessProbe:
-  httpGet:
-    path: /
-    port: http
-readinessProbe:
-  httpGet:
-    path: /
-    port: http
-
-autoscaling:
-  enabled: false
-  minReplicas: 1
-  maxReplicas: 100
-  targetCPUUtilizationPercentage: 80
-  # targetMemoryUtilizationPercentage: 80
-
-# Additional volumes on the output Deployment definition.
-volumes: []
-# - name: foo
-#   secret:
-#     secretName: mysecret
-#     optional: false
-
-# Additional volumeMounts on the output Deployment definition.
-volumeMounts: []
-# - name: foo
-#   mountPath: "/etc/foo"
-#   readOnly: true
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
--- a/oc-catalog/oc-catalog-deployment.yml
+++ b/oc-catalog/oc-catalog-deployment.yml
@ -1,29 +0,0 @@
-# oc-catalog-deployment.yml
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: oc-catalog
-  labels:
-    app: oc-catalog
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: oc-catalog
-  template:
-    metadata:
-      labels:
-        app: oc-catalog
-    spec:
-      containers:
-      - name: oc-catalog
-        image: registry.dev.svc.cluster.local:5000/oc-catalog:latest
-        ports:
-        - containerPort: 8080
-        env:
-        - name: MONGO_DATABASE
-          value: "DC_myDC"
-        - name: MONGO_URI
-          value: "mongodb://mongo:27017"
-      imagePullSecrets:
-      - name: regcred
--- a/oc-catalog/oc-catalog-service.yml
+++ b/oc-catalog/oc-catalog-service.yml
@ -1,13 +0,0 @@
-# oc-catalog-service.yml
-apiVersion: v1
-kind: Service
-metadata:
-  name: oc-catalog
-spec:
-  selector:
-    app: oc-catalog
-  ports:
-    - protocol: TCP
-      port: 8087
-      targetPort: 8080
-  type: NodePort  # Optional, useful for accessing via Minikube IP and NodePort
--- a/oc-mongo/mongo-express/mongo-express-deployment.yml
+++ b/oc-mongo/mongo-express/mongo-express-deployment.yml
@ -1,32 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: mongo-express
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: mongo-express
-  template:
-    metadata:
-      labels:
-        app: mongo-express
-    spec:
-      containers:
-      - name: mongo-express
-        image: mongo-express:latest
-        ports:
-        - containerPort: 8081
-        env:
-        - name: ME_CONFIG_BASICAUTH_USERNAME
-          valueFrom:
-            secretKeyRef:
-              name: mongo-secret
-              key: mongo-username
-        - name: ME_CONFIG_BASICAUTH_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: mongo-secret
-              key: mongo-password
-      imagePullSecrets:
-      - name: my-registry-key
--- a/oc-mongo/mongo-express/mongo-express-service.yml
+++ b/oc-mongo/mongo-express/mongo-express-service.yml
@ -1,13 +0,0 @@
-# mongo-express-service.yml
-apiVersion: v1
-kind: Service
-metadata:
-  name: mongo-express
-spec:
-  selector:
-    app: mongo-express
-  ports:
-    - protocol: TCP
-      port: 8081
-      targetPort: 8081
-  type: NodePort  # Optional, useful for accessing via Minikube IP and NodePort
--- a/oc-mongo/mongo/mongo-deployment.yml
+++ b/oc-mongo/mongo/mongo-deployment.yml
@ -1,42 +0,0 @@
-# mongo-deployment.yml
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: mongo
-  labels:
-    app: mongo
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: mongo
-  template:
-    metadata:
-      labels:
-        app: mongo
-    spec:
-      containers:
-      - name: mongo
-        image: mongo:latest
-        ports:
-        - containerPort: 27017
-        volumeMounts:
-        - name: mongo-persistent-storage
-          mountPath: /data/db
-        - name: mongo-persistent-storage
-          mountPath: /data/configdb
-      volumes:
-      - name: mongo-persistent-storage
-        persistentVolumeClaim:
-          claimName: mongo-pvc
---
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: mongo-pvc
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 1Gi
--- a/oc-mongo/mongo/mongo-secret.yml
+++ b/oc-mongo/mongo/mongo-secret.yml
@ -1,9 +0,0 @@
-# mongo-secret.yml
-apiVersion: v1
-kind: Secret
-metadata:
-  name: mongo-secret
-type: Opaque
-data:
-  username: dGVzdA==  # base64 encoding of 'test'
-  password: dGVzdA==  # base64 encoding of 'test'
--- a/oc-mongo/mongo/mongo-service.yml
+++ b/oc-mongo/mongo/mongo-service.yml
@ -1,12 +0,0 @@
-# mongo-service.yml
-apiVersion: v1
-kind: Service
-metadata:
-  name: mongo
-spec:
-  selector:
-    app: mongo
-  ports:
-    - protocol: TCP
-      port: 27017
-      targetPort: 27017
--- a/offline/default_value_1.0.yml
+++ b/offline/default_value_1.0.yml
@ -1,7 +0,0 @@
---
-
-globals:
-
-composant1:
-
-composant2:
--- a/offline/oc_1.0.yml
+++ b/offline/oc_1.0.yml
@ -6,10 +6,10 @@ version: 1.0
 tools:
  - name: kubectl
    url: https://dl.k8s.io/release/%s/bin/linux/amd64/kubectl
-    version: v1.30.3
+    version: v1.31.0
  - name: helm
    url: https://get.helm.sh/helm-%s-linux-amd64.tar.gz
-    version: v3.15.4
+    version: v3.16.0

 # helm install my-release <repo>/<chart>
 opencloud:
--- a/src/README.md
+++ b/src/README.md
@ -0,0 +1,85 @@
+# Purpose
+
+**oc-deploy** is a tool to deploy (with **helm**) all component of **OpenCloud**.
+
+# Usage
+
+| Command                                                                       | Description                 |
+| ----------------------------------------------------------------------------- | --------------------------- |
+| ```oc-deploy```                                                               | Display help                |
+| ```oc-deploy version```                                                       | Display the version of tool |
+| ```oc-deploy install [-c\|--context <context>] [-v\|--version <OcVersion>]``` | Deploy an OpenCloud         |
+| ```oc-deploy uninstall [-c\|--context <context>]```                           | Undeploy an OpenCloud       |
+
+| Arguments        | Description                 | Default      |
+| ---------------- | --------------------------- | ------------ |
+| ```context```    | Context Kubernetes          |  _opencloud_ |
+| ```OcVersion```  | Specific version or latest  | _latest_     |
+
+# Principe
+
+# Pre-requis
+
+**oc-deploy** need to access to an Kubernetes Cluster, c'est-à-dire : kubeconfig.
+
+**oc-deploy** need to access to Internet :
+
+* to download the _oc.json_ file (contient _oc.yml_) :
+  * Url : https://cloud.o-forge.io/core/oc-deploy/releases
+* to download _kubectl_ and _helm_ tools if
+  * Url : Urls are specified into _oc.yml_
+
+# Development
+
+To init: 
+
+```
+  make get-deps
+```
+
+## To build
+
+```
+  make build
+```
+
+## To run
+
+```
+  make run_install [BIN_OPTS="<args>"]
+  make run_uninstall [BIN_OPTS="<args>"]
+  make run_generate [BIN_OPTS="<args>"]
+```
+
+or
+
+```
+  make exec_install [BIN_OPTS="<args>"]
+  make exec_uninstall [BIN_OPTS="<args>"]
+  make exec_generate [BIN_OPTS="<args>"]
+```
+
+# To Test
+
+All packages:
+
+```
+  make test
+```
+
+or to test an specific package:
+
+```
+  make test_<package>
+```
+
+Test generate _.coverage.html_ file to view the coverage of test.
+
+## To Publish
+
+Cf : ../publish
+
+## Divers
+
+* Latest version for _kubectl_: https://dl.k8s.io/release/stable.txt
+* Release for _helm_: https://github.com/helm/helm/releases
--- a/src/cmd/args.go
+++ b/src/cmd/args.go
@ -24,9 +24,9 @@ func cobraInstallCmd() *cobra.Command {
    Long: `deploy Charts`,
    Args: cobra.MaximumNArgs(0),
    RunE: func(cmd *cobra.Command, args []string) error {
-      return InstallCmd(context, version, modules)
+      return InstallCmd(context, "v"+version, modules)
    },
-    Example: "oc-deploy install --version 1.0 --context ex1",
+    Example: "oc-deploy install --version 0.1.0 --context ex1",
  }
 }

@ -51,9 +51,9 @@ func cobraGenerateCmd() *cobra.Command{
    Long: "Value",
    Args: cobra.MaximumNArgs(0),
    RunE: func(cmd *cobra.Command, args []string) error {
-        return GenerateCmd(context, version)
+        return GenerateCmd(context, "v"+version)
    },
-    Example: "oc-deploy generate --version 1.0 --context ex1",
+    Example: "oc-deploy generate --version 0.1.0 --context ex1",
  }
 }

--- a/src/occonst/variables.go
+++ b/src/occonst/variables.go
@ -1,6 +1,18 @@
 package occonst

-var ONLINE_URL = "https://cloud.o-forge.io"
-var ONLINE_VERSION = "core/oc-deploy"
+import (
+	"os"
+)

-var OFFLINE_DIR = "../../offline"
+var OCDEPLOY_ONLINE_URL = getenv("OCDEPLOY_ONLINE_URL", "https://cloud.o-forge.io")
+var OCDEPLOY_ONLINE_REPO = getenv("OCDEPLOY_ONLINE_REPO", "core/oc-version")
+
+var OCDEPLOY_OFFLINE_DIR = getenv("OCDEPLOY_OFFLINE_DIR", "../../offline")
+
+func getenv(key string, defaut string) string {
+	value := os.Getenv(key)
+	if len(value) == 0 {
+		return defaut
+	}
+	return value
+}
--- a/src/versionOc/offline.go
+++ b/src/versionOc/offline.go
@ -29,7 +29,7 @@ func GetFromOffline(version string) (string, string, error) {
    }

    ficversion := fmt.Sprintf("oc_%s.yml", version2)
-    src := filepath.Join(occonst.OFFLINE_DIR, ficversion)
+    src := filepath.Join(occonst.OCDEPLOY_OFFLINE_DIR, ficversion)
    if _, err := os.Stat(src); err != nil {
        log.Log().Debug().Msg(err.Error())
        return "", "", errors.New("Version non disponible")
@ -47,7 +47,7 @@ func GetFromOffline(version string) (string, string, error) {

 // readLatestFile : Lit le numéro de la version dans le fichier lastest.yml
 func readLatestFromOffline() (string, error) {
-    src := filepath.Join(occonst.OFFLINE_DIR, "latest.yml")
+    src := filepath.Join(occonst.OCDEPLOY_OFFLINE_DIR, "latest.yml")

    fin, err := os.Open(src)
    if err != nil {
--- a/src/versionOc/offline_test.go
+++ b/src/versionOc/offline_test.go
@ -18,10 +18,10 @@ func TestGetOffline(t *testing.T) {

 func TestGetLatest(t *testing.T) {

-    occonst.OFFLINE_DIR = filepath.Join(TEST_SRC_DIR, "offline")
+    occonst.OCDEPLOY_OFFLINE_DIR = filepath.Join(TEST_SRC_DIR, "offline")

    version, _, err := GetFromOffline("latest")
    assert.Nilf(t, err, "error message %s", err)
    assert.Equal(t, "99.1", version, "TestGetFromFile error")

-}
+}
--- a/src/versionOc/online.go
+++ b/src/versionOc/online.go
@ -46,8 +46,8 @@ type ocJsonStruct struct {
 func readLatestFromOnline() (string, error) {

    url := fmt.Sprintf("%s/api/v1/repos/%s/releases/latest",
-                        occonst.ONLINE_URL,
-                        occonst.ONLINE_VERSION)
+                        occonst.OCDEPLOY_ONLINE_URL,
+                        occonst.OCDEPLOY_ONLINE_REPO)

    res, err := http.Get(url)
    if err != nil {
@ -72,8 +72,8 @@ func readLatestFromOnline() (string, error) {
 func getFileVersion(version string) (string, error) {

    url := fmt.Sprintf("%s/%s/releases/download/%s/oc.json",
-                        occonst.ONLINE_URL,
-                        occonst.ONLINE_VERSION,
+                        occonst.OCDEPLOY_ONLINE_URL,
+                        occonst.OCDEPLOY_ONLINE_REPO,
                        version)

    res, err := http.Get(url)
--- a/src/versionOc/online_test.go
+++ b/src/versionOc/online_test.go
@ -18,8 +18,8 @@ func TestGetOnline(t *testing.T) {

    version := "99.1"
    url := fmt.Sprintf("%s/%s/releases/download/%s/oc.json",
-                        occonst.ONLINE_URL,
-                        occonst.ONLINE_VERSION,
+                        occonst.OCDEPLOY_ONLINE_URL,
+                        occonst.OCDEPLOY_ONLINE_REPO,
                        version)
    
    httpmock.RegisterResponder("GET", url,
@ -37,16 +37,16 @@ func TestGetOnlineLatest(t *testing.T) {

    // version := "99.1"
    url := fmt.Sprintf("%s/api/v1/repos/%s/releases/latest",
-                        occonst.ONLINE_URL,
-                        occonst.ONLINE_VERSION)
+                        occonst.OCDEPLOY_ONLINE_URL,
+                        occonst.OCDEPLOY_ONLINE_REPO)
    
    httpmock.RegisterResponder("GET", url,
      httpmock.NewStringResponder(200, `{"name": "99.0", "id": 2}`))

    version := "99.0"
    url2 := fmt.Sprintf("%s/%s/releases/download/%s/oc.json",
-                          occonst.ONLINE_URL,
-                          occonst.ONLINE_VERSION,
+                          occonst.OCDEPLOY_ONLINE_URL,
+                          occonst.OCDEPLOY_ONLINE_REPO,
                          version)
  
    httpmock.RegisterResponder("GET", url2,
Author	SHA1	Message	Date
admju	5d4de618dd	Param. des variables OCDEPLOY_	2024-09-12 13:12:17 +00:00
admju	3481bccc22	README	2024-09-12 11:27:47 +00:00
admju	199209d9f1	puml -> oc-doc	2024-09-11 13:52:27 +00:00
admju	330e4e9d4a	Suppression fichiers obsolèles	2024-09-11 13:49:13 +00:00