diff --git a/bin/dryrun-argo.sh b/bin/dryrun-argo.sh index 7193aa7..e7d0634 100755 --- a/bin/dryrun-argo.sh +++ b/bin/dryrun-argo.sh @@ -5,4 +5,6 @@ mkdir -p .tmp helm template argocd k8s/argocd \ --namespace argocd \ --create-namespace \ + --values k8s/argocd/values.yaml \ + --set selfapp.enabled="true" \ --set selfapp.sshkey="$(cat ~/.ssh/id_rsa)" > .tmp/argocd.yaml \ No newline at end of file diff --git a/bin/install-argo.sh b/bin/install-argo.sh index 6f9fddb..b3a2935 100755 --- a/bin/install-argo.sh +++ b/bin/install-argo.sh @@ -10,6 +10,7 @@ popd helm install argocd k8s/argocd \ --namespace argocd \ --create-namespace \ + --values k8s/argocd/values.yaml \ --set selfapp.sshkey="$(cat ~/.ssh/id_rsa)" watch -n1 "kubectl -n argocd get all" @@ -21,5 +22,6 @@ argocd admin initial-password helm upgrade argocd k8s/argocd \ --namespace argocd \ --create-namespace \ + --values k8s/argocd/values.yaml \ --set selfapp.enabled="true" \ --set selfapp.sshkey="$(cat ~/.ssh/id_rsa)" diff --git a/bin/upgrade-argo.sh b/bin/upgrade-argo.sh index 17ac8fc..923b620 100755 --- a/bin/upgrade-argo.sh +++ b/bin/upgrade-argo.sh @@ -3,5 +3,6 @@ helm upgrade argocd k8s/argocd \ --namespace argocd \ --create-namespace \ + --values k8s/argocd/values.yaml \ --set selfapp.sshkey="$(cat ~/.ssh/id_rsa)" \ --set selfapp.enabled="true" \ No newline at end of file diff --git a/k8s/argocd/templates/app-self.yaml b/k8s/argocd/templates/app-self.yaml index 912955e..bd5909d 100644 --- a/k8s/argocd/templates/app-self.yaml +++ b/k8s/argocd/templates/app-self.yaml @@ -12,6 +12,8 @@ spec: targetRevision: "{{ .Values.selfapp.commit }}" path: k8s/argocd helm: + values: | + selfapp: {{ .Values.selfapp | toYaml | nindent 10 }} parameters: - name: "selfapp.enabled" value: "true" diff --git a/k8s/argocd/templates/ingress.yaml b/k8s/argocd/templates/ingress.yaml new file mode 100644 index 0000000..ef6c6c8 --- /dev/null +++ b/k8s/argocd/templates/ingress.yaml @@ -0,0 +1,25 @@ +--- +apiVersion: traefik.containo.us/v1alpha1 +kind: IngressRoute +metadata: + name: argocd-server + namespace: argocd +spec: + entryPoints: + - websecure + routes: + - kind: Rule + match: Host(`argocd.{{ .Values.selfapp.domain }}`) + priority: 10 + services: + - name: argocd-server + port: 80 + - kind: Rule + match: Host(`argocd.{{ .Values.selfapp.domain }}`) && Headers(`Content-Type`, `application/grpc`) + priority: 11 + services: + - name: argocd-server + port: 80 + scheme: h2c + tls: + certResolver: default \ No newline at end of file diff --git a/k8s/argocd/templates/traefik-dashboard.yaml b/k8s/argocd/templates/traefik-dashboard.yaml new file mode 100644 index 0000000..43b00d0 --- /dev/null +++ b/k8s/argocd/templates/traefik-dashboard.yaml @@ -0,0 +1,39 @@ +--- +apiVersion: v1 +kind: Service +metadata: + name: traefik-dashboard + namespace: kube-system + labels: + app.kubernetes.io/instance: traefik + app.kubernetes.io/name: traefik-dashboard +spec: + type: ClusterIP + ports: + - name: traefik + port: 9000 + targetPort: traefik + protocol: TCP + selector: + app.kubernetes.io/instance: traefik + app.kubernetes.io/name: traefik +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: traefik-ingress + namespace: kube-system + annotations: + kubernetes.io/ingress.class: traefik +spec: + rules: + - host: traefik.{{ .Values.selfapp.domain }} + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: traefik-dashboard + port: + number: 9000 \ No newline at end of file diff --git a/k8s/argocd/values.yaml b/k8s/argocd/values.yaml index a8c22da..f1bc6d2 100644 --- a/k8s/argocd/values.yaml +++ b/k8s/argocd/values.yaml @@ -4,8 +4,9 @@ argo-cd: keep: false server: ingress: - enabled: true + enabled: false selfapp: commit: "stable" repo: "asosnovsky/homelab" sshkey: "" + domain: "sosnovsky.ca" diff --git a/k8s/infra/reverse-proxy/.helmignore b/k8s/infra/reverse-proxy/.helmignore new file mode 100644 index 0000000..0e8a0eb --- /dev/null +++ b/k8s/infra/reverse-proxy/.helmignore @@ -0,0 +1,23 @@ +# 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/ diff --git a/k8s/infra/reverse-proxy/Chart.yaml b/k8s/infra/reverse-proxy/Chart.yaml new file mode 100644 index 0000000..2195453 --- /dev/null +++ b/k8s/infra/reverse-proxy/Chart.yaml @@ -0,0 +1,24 @@ +apiVersion: v2 +name: . +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" diff --git a/k8s/infra/reverse-proxy/templates/argocd.yaml b/k8s/infra/reverse-proxy/templates/argocd.yaml new file mode 100644 index 0000000..e69de29 diff --git a/k8s/infra/reverse-proxy/values.yaml b/k8s/infra/reverse-proxy/values.yaml new file mode 100644 index 0000000..f173824 --- /dev/null +++ b/k8s/infra/reverse-proxy/values.yaml @@ -0,0 +1,82 @@ +# 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: {}