diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index ec4b057..71961e2 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -64,7 +64,8 @@ "extensions": [ "inercia.vscode-k3d", "tumido.crd-snippets", - "hilleer.yaml-plus-json" + "hilleer.yaml-plus-json", + "ipedrazas.kubernetes-snippets" ] } } diff --git a/k8s/argocd/templates/appset-infra.yaml b/k8s/argocd/templates/appset-infra.yaml index 1b222f5..9457f84 100644 --- a/k8s/argocd/templates/appset-infra.yaml +++ b/k8s/argocd/templates/appset-infra.yaml @@ -20,6 +20,10 @@ spec: repoURL: "git@github.com:{{ .Values.selfapp.repo }}.git" targetRevision: "{{ .Values.selfapp.commit }}" path: '{{ `{{path}}` }}' + helm: + valueFiles: + - values.yaml + - values-{{ .Values.selfapp.deployment }}.yaml destination: server: https://kubernetes.default.svc namespace: '{{ `{{path.basename}}` }}' diff --git a/k8s/infra/reverse-proxy/templates/argocd.yaml b/k8s/infra/longhorn/values-dev.yaml similarity index 100% rename from k8s/infra/reverse-proxy/templates/argocd.yaml rename to k8s/infra/longhorn/values-dev.yaml diff --git a/k8s/infra/reverse-proxy/templates/dummy-pod.yaml b/k8s/infra/reverse-proxy/templates/dummy-pod.yaml new file mode 100644 index 0000000..d6b7ff8 --- /dev/null +++ b/k8s/infra/reverse-proxy/templates/dummy-pod.yaml @@ -0,0 +1,25 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: dummy-app +spec: + replicas: 1 + template: + metadata: + labels: + app: dummy + chart: "{{ .Chart.Name }}" + release: "{{ .Release.Name }}" + service: "{{ .Release.Service }}" + spec: + containers: + - name: name + image: nginxdemos/hello + resources: + limits: + cpu: 1 + memory: 1Gi + ports: + - name: http + port: 80 + protocol: TCP diff --git a/k8s/infra/reverse-proxy/values-dev.yaml b/k8s/infra/reverse-proxy/values-dev.yaml new file mode 100644 index 0000000..e69de29 diff --git a/k8s/infra/reverse-proxy/values.yaml b/k8s/infra/reverse-proxy/values.yaml index f173824..e69de29 100644 --- a/k8s/infra/reverse-proxy/values.yaml +++ b/k8s/infra/reverse-proxy/values.yaml @@ -1,82 +0,0 @@ -# Default values for .. -# 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 - # 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: {} - -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 - -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 100 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - -nodeSelector: {} - -tolerations: [] - -affinity: {}