diff --git a/charts/argodeps/Chart.yaml b/charts/argodeps/Chart.yaml deleted file mode 100644 index a0a0d32..0000000 --- a/charts/argodeps/Chart.yaml +++ /dev/null @@ -1,3 +0,0 @@ -apiVersion: v2 -name: argodeps -version: "1.0.0" \ No newline at end of file diff --git a/charts/argodeps/values.yaml b/charts/argodeps/values.yaml deleted file mode 100644 index 8d84255..0000000 --- a/charts/argodeps/values.yaml +++ /dev/null @@ -1,7 +0,0 @@ -argo-cd: - dex: - enabled: false - notifications: - enabled: false - applicationSet: - enabled: false \ No newline at end of file diff --git a/charts/argodeps/templates/external-dns.yaml b/charts/fp/templates/external-dns.yaml similarity index 100% rename from charts/argodeps/templates/external-dns.yaml rename to charts/fp/templates/external-dns.yaml diff --git a/charts/argodeps/templates/letsencrypt-prod.yaml b/charts/fp/templates/letsencrypt-prod.yaml similarity index 100% rename from charts/argodeps/templates/letsencrypt-prod.yaml rename to charts/fp/templates/letsencrypt-prod.yaml diff --git a/charts/argodeps/templates/letsencrypt-staging.yaml b/charts/fp/templates/letsencrypt-staging.yaml similarity index 100% rename from charts/argodeps/templates/letsencrypt-staging.yaml rename to charts/fp/templates/letsencrypt-staging.yaml diff --git a/charts/argodeps/templates/roles.yaml b/charts/fp/templates/roles.yaml similarity index 100% rename from charts/argodeps/templates/roles.yaml rename to charts/fp/templates/roles.yaml diff --git a/charts/argodeps/templates/ingress.yaml b/charts/fp/templates/windmill-ingress.yaml similarity index 68% rename from charts/argodeps/templates/ingress.yaml rename to charts/fp/templates/windmill-ingress.yaml index fdf6872..77a6130 100644 --- a/charts/argodeps/templates/ingress.yaml +++ b/charts/fp/templates/windmill-ingress.yaml @@ -1,10 +1,10 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: argocd-server-ingress - namespace: argocd + name: windmill-ingress + namespace: default annotations: - cert-manager.io/cluster-issuer: "letsencrypt-prod" + cert-manager.io/cluster-issuer: "letsencrypt-staging" nginx.ingress.kubernetes.io/ssl-passthrough: "true" # If you encounter a redirect loop or are getting a 307 response code # then you need to force the nginx ingress to connect to the backend using HTTPS. @@ -12,17 +12,17 @@ metadata: spec: ingressClassName: nginx rules: - - host: argo.sbtp.xyz + - host: windmill2.sbtp.xyz http: paths: - path: / pathType: Prefix backend: service: - name: argo-argocd-server + name: windmmill-app port: name: https tls: - hosts: - - argo.sbtp.xyz - secretName: argocd-server-tls # as expected by argocd-server \ No newline at end of file + - windmill2.sbtp.xyz + secretName: windmill-tls \ No newline at end of file diff --git a/charts/fp/templates/windmill.yaml b/charts/fp/templates/windmill.yaml deleted file mode 100644 index 1253680..0000000 --- a/charts/fp/templates/windmill.yaml +++ /dev/null @@ -1,121 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: windmill - namespace: argocd - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - destination: - namespace: default - server: https://kubernetes.default.svc - project: default - source: - repoURL: https://windmill-labs.github.io/windmill-helm-charts - chart: windmill - targetRevision: "2.0.170" - helm: - valuesObject: - # windmill root values block - windmill: - # domain as shown in browser, this is used together with `baseProtocol` as part of the BASE_URL environment variable in app and worker container and in the ingress resource, if enabled - baseDomain: windmill2.sbtp.xyz - baseProtocol: https - # postgres URI, pods will crashloop if database is unreachable, sets DATABASE_URL environment variable in app and worker container - databaseUrl: postgres://postgres:windmill@windmill-postgresql/windmill?sslmode=disable - # replica for the application app - appReplicas: 2 - # replicas for the workers, jobs are executed on the workers - lspReplicas: 2 - workerGroups: - # The default worker group is the one that will execute jobs with any taggs except the native ones. Windmill has a default worker group configuration for it - - name: "default" - replicas: 3 - # -- Annotations to apply to the pods - annotations: {} - # -- Labels to apply to the pods - labels: {} - # -- Node selector to use for scheduling the pods - nodeSelector: {} - # -- Tolerations to apply to the pods - tolerations: [] - # -- Affinity rules to apply to the pods - affinity: {} - # -- Resource limits and requests for the pods - resources: - requests: - memory: "1028Mi" - cpu: "500m" - limits: - memory: "2048Mi" - cpu: "1000m" - # -- Extra environment variables to apply to the pods - extraEnv: [] - # -- Extra sidecar containers - extraContainers: [] - # -- Mode for workers, defaults to "worker" - alternative "agent" requires Enterprise license - mode: "worker" - # Thenative worker group will only execute native jobs. Windmill has a default worker group configuration for it - - name: "native" - replicas: 4 - # -- Resource limits and requests for the pods - resources: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "256Mi" - cpu: "200m" - # -- Extra environment variables to apply to the pods - extraEnv: [] - # -- Extra sidecar containers - extraContainers: [] - # -- Mode for workers, defaults to "worker" - alternative "agent" requires Enterprise license - mode: "worker" - - name: "gpu" - replicas: 0 - # Use those to override the tag or image used for the app and worker containers. Windmill uses the same image for both. - # By default, if enterprise is enable, the image is set to ghcr.io/windmill-labs/windmill-ee, otherwise the image is set to ghcr.io/windmill-labs/windmill - #tag: "mytag" - #image: "ghcr.io/windmill-labs/windmill" - # enable postgres (bitnami) on kubernetes - postgresql: - enabled: true - # enable minio (bitnami) on kubernetes - minio: - enabled: false - ingress: - enabled: false - enterprise: - enable: false ---- -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: windmill-ingress - namespace: default - annotations: - kubernetes.io/ingress.class: "nginx" - nginx.ingress.kubernetes.io/ssl-redirect: "true" - cert-manager.io/cluster-issuer: "letsencrypt-staging" -spec: - ingressClassName: nginx - secretTemplate: - annotations: - reflector.v1.k8s.emberstack.com/reflection-allowed: "true" - reflector.v1.k8s.emberstack.com/reflection-allowed-namespaces: "" - tls: - - hosts: - - windmill2.sbtp.xyz - secretName: windmill-tls - rules: - - host: windmill2.sbtp.xyz - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: windmill - port: - number: 80 \ No newline at end of file