diff --git a/labmap-chart/Chart.yaml b/labmap-chart/Chart.yaml deleted file mode 100644 index 00d6670..0000000 --- a/labmap-chart/Chart.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v2 -name: labmap -description: LabMap fullstack app -type: application -version: 0.1.0 -appVersion: "1.0.0" diff --git a/labmap-chart/templates/backend-deployment.yaml b/labmap-chart/templates/backend-deployment.yaml deleted file mode 100644 index 2cc34b4..0000000 --- a/labmap-chart/templates/backend-deployment.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: labmap-backend -spec: - replicas: 1 - selector: - matchLabels: - app: labmap-backend - template: - metadata: - labels: - app: labmap-backend - spec: - containers: - - name: backend - image: {{ .Values.backend.image }}:{{ .Values.backend.tag }} - ports: - - containerPort: {{ .Values.backend.port }} diff --git a/labmap-chart/templates/backend-service.yaml b/labmap-chart/templates/backend-service.yaml deleted file mode 100644 index c3cabdf..0000000 --- a/labmap-chart/templates/backend-service.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: labmap-backend -spec: - selector: - app: labmap-backend - ports: - - port: 8000 - targetPort: {{ .Values.backend.port }} - type: ClusterIP diff --git a/labmap-chart/templates/frontend-deployment.yaml b/labmap-chart/templates/frontend-deployment.yaml deleted file mode 100644 index 22f60ed..0000000 --- a/labmap-chart/templates/frontend-deployment.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: labmap-frontend -spec: - replicas: 1 - selector: - matchLabels: - app: labmap-frontend - template: - metadata: - labels: - app: labmap-frontend - spec: - containers: - - name: frontend - image: {{ .Values.frontend.image }}:{{ .Values.frontend.tag }} - ports: - - containerPort: {{ .Values.frontend.port }} - env: - - name: API_BASE - value: {{ .Values.frontend.env.API_BASE | quote }} \ No newline at end of file diff --git a/labmap-chart/templates/frontend-service.yaml b/labmap-chart/templates/frontend-service.yaml deleted file mode 100644 index 41c8f35..0000000 --- a/labmap-chart/templates/frontend-service.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: labmap-frontend -spec: - selector: - app: labmap-frontend - ports: - - port: 80 - targetPort: {{ .Values.frontend.port }} - type: ClusterIP diff --git a/labmap-chart/templates/ingress.yaml b/labmap-chart/templates/ingress.yaml deleted file mode 100644 index 3f9d5e1..0000000 --- a/labmap-chart/templates/ingress.yaml +++ /dev/null @@ -1,43 +0,0 @@ -{{- if .Values.frontend.ingress.enabled }} -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: labmap-frontend - annotations: - traefik.ingress.kubernetes.io/router.entrypoints: web -spec: - rules: - - host: {{ .Values.frontend.ingress.host }} - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: labmap-frontend - port: - number: 80 -{{- end }} - ---- - -{{- if .Values.backend.ingress.enabled }} -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: labmap-backend - annotations: - traefik.ingress.kubernetes.io/router.entrypoints: web -spec: - rules: - - host: {{ .Values.backend.ingress.host }} - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: labmap-backend - port: - number: 8000 -{{- end }} diff --git a/labmap-chart/values.yaml b/labmap/values.yaml similarity index 87% rename from labmap-chart/values.yaml rename to labmap/values.yaml index 68307be..d4f6ecb 100644 --- a/labmap-chart/values.yaml +++ b/labmap/values.yaml @@ -1,16 +1,15 @@ frontend: image: harbor.dvirlabs.com/my-apps/labmap-frontend - tag: latest + tag: master-53d0770 port: 80 ingress: enabled: true host: labmap.dvirlabs.com env: API_BASE: "https://api-labmap.dvirlabs.com" - backend: image: harbor.dvirlabs.com/my-apps/labmap-backend - tag: latest + tag: "master-53d0770" port: 8000 ingress: enabled: false