upgrade components - closes #430

Signed-off-by: Marcin Fabrykowski git@fabrykowski.pl

chart/templates/cilium/cilium_addresspool.yml

@@ -6,6 +6,6 @@ metadata:
 spec:
   blocks:
 {{- range .Values.cilium.lb_pools }}
-  - cidr: {{ . }}
+  - {{ toYaml . }}
 {{- end }}
 {{- end }}

chart/templates/dex/dex-k8s-authenticator.yml

-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: dex-k8s-authenticator
-  namespace: argocd
-spec:
-  project: exphost
-  source:
-    #repoURL: 'https://mintel.github.io/helm-charts'
-    repoURL: 'https://gitlab.exphost.pl/charts'
-    targetRevision: v1.2.0
-    chart: dex-k8s-authenticator
-    helm:
-      values: |
-        ingress:
-          enabled: true
-          hosts:
-            - auth.{{ .Values.domain }}
-          annotations:
-            cert-manager.io/cluster-issuer: acme-issuer
-          tls:
-            - hosts:
-                - auth.{{ .Values.domain }}
-              secretName: dex-acme.tls
-        dexK8sAuthenticator:
-          clusters:
-            - name: k8s-{{ .Values.domain }}-cluster
-              short_description: "K8s cluster"
-              client_secret: GiQBxaKyVNsNkWshSzuNN8Xa6qnbZLYt
-              #issuer: http://dex.dex.svc.cluster.local:5556/dex
-              issuer: https://auth.{{ .Values.domain }}/dex
-              k8s_master_uri: https://kube-api.{{ .Values.domain }}
-              client_id: kubernetes
-              redirect_uri: https://auth.{{ .Values.domain }}/callback
-              scopes:
-                - openid
-                - groups
-                - profile
-
-  destination:
-    server: 'https://kubernetes.default.svc'
-    namespace: dex
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-    syncOptions:
-      - CreateNamespace=true
+#apiVersion: argoproj.io/v1alpha1
+#kind: Application
+#metadata:
+#  name: dex-k8s-authenticator
+#  namespace: argocd
+#spec:
+#  project: exphost
+#  source:
+#    repoURL: 'https://mintel.github.io/helm-charts'
+#    #repoURL: 'https://gitlab.exphost.pl/charts'
+#    targetRevision: v1.2.0
+#    chart: dex-k8s-authenticator
+#    helm:
+#      values: |
+#        ingress:
+#          enabled: true
+#          hosts:
+#            - auth.{{ .Values.domain }}
+#          annotations:
+#            cert-manager.io/cluster-issuer: acme-issuer
+#          tls:
+#            - hosts:
+#                - auth.{{ .Values.domain }}
+#              secretName: dex-acme.tls
+#        dexK8sAuthenticator:
+#          clusters:
+#            - name: k8s-{{ .Values.domain }}-cluster
+#              short_description: "K8s cluster"
+#              client_secret: GiQBxaKyVNsNkWshSzuNN8Xa6qnbZLYt
+#              #issuer: http://dex.dex.svc.cluster.local:5556/dex
+#              issuer: https://auth.{{ .Values.domain }}/dex
+#              k8s_master_uri: https://kube-api.{{ .Values.domain }}
+#              client_id: kubernetes
+#              redirect_uri: https://auth.{{ .Values.domain }}/callback
+#              scopes:
+#                - openid
+#                - groups
+#                - profile
+#
+#  destination:
+#    server: 'https://kubernetes.default.svc'
+#    namespace: dex
+#  syncPolicy:
+#    automated:
+#      prune: true
+#      selfHeal: true
+#    syncOptions:
+#      - CreateNamespace=true

chart/templates/dex/dex.yml

@@ -10,7 +10,7 @@ spec:
   project: exphost
   source:
     repoURL: 'https://charts.dexidp.io'
-    targetRevision: 0.14.1
+    targetRevision: 0.19.1
     chart: dex
     helm:
       values: |
@@ -23,7 +23,7 @@ spec:
             - host: auth.{{ .Values.domain }}
               paths:
                 - path: /dex
-                  pathType: ImplementationSpecific
+                  pathType: Prefix
           tls:
             - hosts:
                 - auth.{{ .Values.domain }}
@@ -34,7 +34,6 @@ spec:
             nginx.ingress.kubernetes.io/cors-allow-methods: "PUT, GET, POST, OPTIONS"
             nginx.ingress.kubernetes.io/cors-allow-origin: "*"
             nginx.ingress.kubernetes.io/cors-allow-credentials: "true"
-        priorityClassName: high-priority
   destination:
     server: 'https://kubernetes.default.svc'
     namespace: dex

chart/templates/external-dns/external-dns.yml

@@ -8,7 +8,7 @@ spec:
   source:
     repoURL: 'https://charts.bitnami.com/bitnami'
     chart: external-dns
-    targetRevision: 8.2.3
+    targetRevision: 8.3.5
     helm:
       values: |
         #image:
@@ -17,7 +17,7 @@ spec:
         #  tag: v1.0.0-mf
         #  pullPolicy: Always
         sources:
-          #- crd
+          - crd
           - ingress
           - service
         provider: rfc2136
@@ -33,8 +33,10 @@ spec:
           serviceMonitor:
             enabled: true
         logLevel: debug
-        #crd:
-        #  create: true
+        crd:
+          # temporary workaround
+          #create: false
+          create: true
         policy: sync
         publishHostIP: true
         txtOwnerId: "k8s_{{ .Values.domain }}"

chart/templates/external-dns/temporary_crd.yml

+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.14.0
+    api-approved.kubernetes.io: "https://github.com/kubernetes-sigs/external-dns/pull/2007"
+  name: dnsendpoints.externaldns.k8s.io
+spec:
+  group: externaldns.k8s.io
+  names:
+    kind: DNSEndpoint
+    listKind: DNSEndpointList
+    plural: dnsendpoints
+    singular: dnsendpoint
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: DNSEndpointSpec defines the desired state of DNSEndpoint
+            properties:
+              endpoints:
+                items:
+                  description: Endpoint is a high-level way of a connection between
+                    a service and an IP
+                  properties:
+                    dnsName:
+                      description: The hostname of the DNS record
+                      type: string
+                    labels:
+                      additionalProperties:
+                        type: string
+                      description: Labels stores labels defined for the Endpoint
+                      type: object
+                    providerSpecific:
+                      description: ProviderSpecific stores provider specific config
+                      items:
+                        description: ProviderSpecificProperty holds the name and value
+                          of a configuration which is specific to individual DNS providers
+                        properties:
+                          name:
+                            type: string
+                          value:
+                            type: string
+                        type: object
+                      type: array
+                    recordTTL:
+                      description: TTL for the record
+                      format: int64
+                      type: integer
+                    recordType:
+                      description: RecordType type of record, e.g. CNAME, A, AAAA,
+                        SRV, TXT etc
+                      type: string
+                    setIdentifier:
+                      description: Identifier to distinguish multiple records with
+                        the same name and type (e.g. Route53 records with routing
+                        policies other than 'simple')
+                      type: string
+                    targets:
+                      description: The targets the DNS record points to
+                      items:
+                        type: string
+                      type: array
+                  type: object
+                type: array
+            type: object
+          status:
+            description: DNSEndpointStatus defines the observed state of DNSEndpoint
+            properties:
+              observedGeneration:
+                description: The generation observed by the external-dns controller.
+                format: int64
+                type: integer
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}

chart/templates/longhorn/longhorn_oauth2.yml

-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: oauth2-longhorn
-  namespace: argocd
-spec:
-  project: exphost
-  source:
-    repoURL: 'https://charts.bitnami.com/bitnami'
-    chart: oauth2-proxy
-    targetRevision: 3.4.9
-    helm:
-      values: |
-        ingress:
-          enabled: true
-          hostname: "longhorn.{{ .Values.domain}}"
-          path: /oauth2
-          pathType: Prefix
-          tls: true
-          annotations:
-            cert-manager.io/cluster-issuer: acme-issuer
-        configuration:
-          existingSecret: oauth2-longhorn-oauth2-proxy
-          content: |
-            provider = "oidc"
-            oidc_issuer_url = "https://auth.{{ .Values.domain }}/dex"
-            allowed_groups = ["k8s-admins"]
-            email_domains = [ "*" ]
-            upstreams = [ "file:///dev/null" ]
-        redis:
-          auth:
-            existingSecret: oauth2-longhorn-redis
-
-  destination:
-    server: 'https://kubernetes.default.svc'
-    namespace: longhorn-system
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-    syncOptions:
-      - CreateNamespace=true
+#apiVersion: argoproj.io/v1alpha1
+#kind: Application
+#metadata:
+#  name: oauth2-longhorn
+#  namespace: argocd
+#spec:
+#  project: exphost
+#  source:
+#    repoURL: 'https://charts.bitnami.com/bitnami'
+#    chart: oauth2-proxy
+#    targetRevision: 3.4.9
+#    helm:
+#      values: |
+#        ingress:
+#          enabled: true
+#          hostname: "longhorn.{{ .Values.domain}}"
+#          path: /oauth2
+#          pathType: Prefix
+#          tls: true
+#          annotations:
+#            cert-manager.io/cluster-issuer: acme-issuer
+#        configuration:
+#          existingSecret: oauth2-longhorn-oauth2-proxy
+#          content: |
+#            provider = "oidc"
+#            oidc_issuer_url = "https://auth.{{ .Values.domain }}/dex"
+#            allowed_groups = ["k8s-admins"]
+#            email_domains = [ "*" ]
+#            upstreams = [ "file:///dev/null" ]
+#        redis:
+#          auth:
+#            existingSecret: oauth2-longhorn-redis
+#
+#  destination:
+#    server: 'https://kubernetes.default.svc'
+#    namespace: longhorn-system
+#  syncPolicy:
+#    automated:
+#      prune: true
+#      selfHeal: true
+#    syncOptions:
+#      - CreateNamespace=true

chart/templates/longhorn/prometheus_metrics.yml

-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: longhorn-prometheus-servicemonitor
-  namespace: longhorn-system
-  labels:
-    name: longhorn-prometheus-servicemonitor
-  annotations:
-    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
-spec:
-  selector:
-    matchLabels:
-      app: longhorn-manager
-  namespaceSelector:
-    matchNames:
-    - longhorn-system
-  endpoints:
-  - port: manager

chart/templates/prometheus/alertmanager_oauth2.yml

-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: oauth2-alertmanager
-  namespace: argocd
-spec:
-  project: exphost
-  source:
-    repoURL: 'https://charts.bitnami.com/bitnami'
-    chart: oauth2-proxy
-    targetRevision: 3.4.9
-    helm:
-      values: |
-        ingress:
-          enabled: true
-          hostname: "alertmanager.{{ .Values.domain}}"
-          path: /oauth2
-          pathType: Prefix
-          tls: true
-          annotations:
-            cert-manager.io/cluster-issuer: acme-issuer
-        configuration:
-          existingSecret: oauth2-alertmanager-oauth2-proxy
-          content: |
-            provider = "oidc"
-            oidc_issuer_url = "https://auth.{{ .Values.domain }}/dex"
-            allowed_groups = ["k8s-admins"]
-            email_domains = [ "*" ]
-            upstreams = [ "file:///dev/null" ]
-        redis:
-          auth:
-            existingSecret: oauth2-alertmanager-redis
-
-  destination:
-    server: 'https://kubernetes.default.svc'
-    namespace: prometheus-system
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-    syncOptions:
-      - CreateNamespace=true
+#apiVersion: argoproj.io/v1alpha1
+#kind: Application
+#metadata:
+#  name: oauth2-alertmanager
+#  namespace: argocd
+#spec:
+#  project: exphost
+#  source:
+#    repoURL: 'https://charts.bitnami.com/bitnami'
+#    chart: oauth2-proxy
+#    targetRevision: 3.4.9
+#    helm:
+#      values: |
+#        ingress:
+#          enabled: true
+#          hostname: "alertmanager.{{ .Values.domain}}"
+#          path: /oauth2
+#          pathType: Prefix
+#          tls: true
+#          annotations:
+#            cert-manager.io/cluster-issuer: acme-issuer
+#        configuration:
+#          existingSecret: oauth2-alertmanager-oauth2-proxy
+#          content: |
+#            provider = "oidc"
+#            oidc_issuer_url = "https://auth.{{ .Values.domain }}/dex"
+#            allowed_groups = ["k8s-admins"]
+#            email_domains = [ "*" ]
+#            upstreams = [ "file:///dev/null" ]
+#        redis:
+#          auth:
+#            existingSecret: oauth2-alertmanager-redis
+#
+#  destination:
+#    server: 'https://kubernetes.default.svc'
+#    namespace: prometheus-system
+#  syncPolicy:
+#    automated:
+#      prune: true
+#      selfHeal: true
+#    syncOptions:
+#      - CreateNamespace=true

chart/templates/prometheus/prometheus.yml

@@ -19,6 +19,7 @@ spec:
           ingress:
             enabled: true
             hostname: "prometheus.{{ .Values.domain }}"
+            pathType: Prefix
             certManager: true
             tls: true
             annotations:
@@ -48,6 +49,7 @@ spec:
             enabled: true
             hostname: "alertmanager.{{ .Values.domain }}"
             certManager: true
+            pathType: Prefix
             tls: true
             annotations:
               cert-manager.io/cluster-issuer: acme-issuer

chart/templates/apiserver-expose.yml

@@ -5,9 +5,7 @@ metadata:
   namespace: default
   annotations:
     cert-manager.io/cluster-issuer: acme-issuer
-    nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
-    nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
-    nginx.ingress.kubernetes.io/proxy-send-timeout: "600"
+    ingress.cilium.io/tls-passthrough: "true"
 spec:
   rules:
   - host: kube-api.{{ .Values.domain }}
@@ -18,7 +16,8 @@ spec:
             name: kubernetes
             port:
               number: 443
-        pathType: ImplementationSpecific
+        pathType: Prefix
+        path: /
   tls:
   - hosts:
     - kube-api.{{ .Values.domain }}

chart/templates/argocd.yml

@@ -28,24 +28,16 @@ spec:
               enabled: true
           ingress:
             enabled: true
-            hosts:
-              - argocd.{{ .Values.domain}}
-            tls:
-              - secretName: argocd-server-tls
-                hosts:
-                  - argocd.{{ .Values.domain}}
-            https: false
+            hostname: argocd.{{ .Values.domain}}
+            tls: true
+            #https: false
             annotations:
               cert-manager.io/cluster-issuer: acme-issuer
           ingressGrpc:
             enabled: false
-            hosts:
-              - argocd.{{ .Values.domain}}
-            tls:
-              - secretName: argocd-server-tls
-                hosts:
-                  - argocd.{{ .Values.domain}}
-            https: false
+            hostname: argocd.{{ .Values.domain}}
+            tls: true
+            #https: false
         config:
           cm:
             url: https://argocd.{{ .Values.domain }}

chart/values.yaml

@@ -29,7 +29,7 @@ exphostConfigurator:
     tag:
 
 named:
-  version: v1.0.2
+  version: v1.0.2-1-g65ca4e7
 
 config:
   k8sAdminGroup: oidc:k8s-admins
@@ -37,12 +37,14 @@ config:
     ldap:
       host: openldap.tenant-exphost-services.svc.cluster.local:389
       password:
-        secretName: password-password-dex-from-tenant-exphost-services
+        secretName: password-tenant-exphost-services-openldap-sa-dex-from-tenant-exphost-services
         key: password
     staticClients:
       - id: kubernetes
         redirectURIs:
         - 'https://auth.{{ .Values.domain }}/callback'
+        - 'http://localhost:8000'
+        - 'http://localhost:18000'
         name: 'Kubernetes'
         secret: GiQBxaKyVNsNkWshSzuNN8Xa6qnbZLYt
       - id: argo