Merge pull request #946 from 3dwardch3ng/misc

update ingress for chartmuseum

apps/chartmuseum/env/k3s-cluster/ingress.yaml

@@ -2,7 +2,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: chartmuseum-ingress
-  namespace: chartmuseum
+  namespace: argocd
   annotations:
     nginx.ingress.kubernetes.io/ssl-redirect: "false"
     nginx.ingress.kubernetes.io/use-regex: "true"
@@ -11,7 +11,8 @@ spec:
   tls:
     - hosts:
         - "chartmuseum.cluster.edward.sydney"
-      secretName: "chartmuseum-tls"
+        - "chartmuseum.cluster.local"
+      secretName: "ingress-tls"
   rules:
     - host: "chartmuseum.cluster.edward.sydney"
       http:

resources/app-secrets/env/k3s-cluster/templates/ingress-tls.yaml

@@ -0,0 +1,67 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-options: Prune=false
+    sealedsecrets.bitnami.com/cluster-wide: "true"
+    sealedsecrets.bitnami.com/managed: "true"
+  creationTimestamp: null
+  name: ingress-tls
+  namespace: argocd
+type: kubernetes.io/tls
+stringData:
+  tls.crt: |
+    -----BEGIN CERTIFICATE-----
+    MIIDkDCCAxagAwIBAgISAzfHRyZrvk8WNGAHWrgbzciFMAoGCCqGSM49BAMDMDIx
+    CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJF
+    NjAeFw0yNDA4MjgyMzUwMTRaFw0yNDExMjYyMzUwMTNaMCIxIDAeBgNVBAMMFyou
+    Y2x1c3Rlci5lZHdhcmQuc3lkbmV5MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
+    8ud+9xO2ekXfvX8ghVd4rqJ/0nVqOAVvrxSNou17ofAhbKr6jhDhDuaKPPwu3r3t
+    YxcU/Ij1fviXhwLHU7psSqOCAhowggIWMA4GA1UdDwEB/wQEAwIHgDAdBgNVHSUE
+    FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQU
+    3cFhorY+2wTt4EVNA/3P6yN5m4gwHwYDVR0jBBgwFoAUkydGmAOpUWiOmNbEQkjb
+    I79YlNIwVQYIKwYBBQUHAQEESTBHMCEGCCsGAQUFBzABhhVodHRwOi8vZTYuby5s
+    ZW5jci5vcmcwIgYIKwYBBQUHMAKGFmh0dHA6Ly9lNi5pLmxlbmNyLm9yZy8wIgYD
+    VR0RBBswGYIXKi5jbHVzdGVyLmVkd2FyZC5zeWRuZXkwEwYDVR0gBAwwCjAIBgZn
+    gQwBAgEwggEFBgorBgEEAdZ5AgQCBIH2BIHzAPEAdwA/F0tP1yJHWJQdZRyEvg0S
+    7ZA3fx+FauvBvyiF7PhkbgAAAZGbmzAXAAAEAwBIMEYCIQD/V43Jy0KHLodl+gtE
+    RyvGcUrk6mzrUp3bIeRJRIGX5AIhAI76WUuByT+oVAu9+gpTRmbPnaEjIz23pX+D
+    +wl3KGXMAHYA7s3QZNXbGs7FXLedtM0TojKHRny87N7DUUhZRnEftZsAAAGRm5sw
+    DgAABAMARzBFAiATa1V7yZy0WU6Q1VhYFekp0w0RTqZuTLt7qHAFukH4IgIhAJ7J
+    h4W3Qu1xU9MzBiWVNfXyjt+xF/Z7psq0H3uC5QrUMAoGCCqGSM49BAMDA2gAMGUC
+    MGbxI061Ifmd5Ly5zXKUbkN2a3KwfGWNRcsnsJAMo/kztOGxACSObwsyhUzvByeV
+    0gIxANVVMDZ7biW0CTXtTdPhcwB3tMbxqc5XLqCw4LUaw4dNa+mU7twxyZDGHjSb
+    8kL+vg==
+    -----END CERTIFICATE-----
+    -----BEGIN CERTIFICATE-----
+    MIIEVzCCAj+gAwIBAgIRALBXPpFzlydw27SHyzpFKzgwDQYJKoZIhvcNAQELBQAw
+    TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
+    cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjQwMzEzMDAwMDAw
+    WhcNMjcwMzEyMjM1OTU5WjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
+    RW5jcnlwdDELMAkGA1UEAxMCRTYwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATZ8Z5G
+    h/ghcWCoJuuj+rnq2h25EqfUJtlRFLFhfHWWvyILOR/VvtEKRqotPEoJhC6+QJVV
+    6RlAN2Z17TJOdwRJ+HB7wxjnzvdxEP6sdNgA1O1tHHMWMxCcOrLqbGL0vbijgfgw
+    gfUwDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
+    ATASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBSTJ0aYA6lRaI6Y1sRCSNsj
+    v1iU0jAfBgNVHSMEGDAWgBR5tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcB
+    AQQmMCQwIgYIKwYBBQUHMAKGFmh0dHA6Ly94MS5pLmxlbmNyLm9yZy8wEwYDVR0g
+    BAwwCjAIBgZngQwBAgEwJwYDVR0fBCAwHjAcoBqgGIYWaHR0cDovL3gxLmMubGVu
+    Y3Iub3JnLzANBgkqhkiG9w0BAQsFAAOCAgEAfYt7SiA1sgWGCIpunk46r4AExIRc
+    MxkKgUhNlrrv1B21hOaXN/5miE+LOTbrcmU/M9yvC6MVY730GNFoL8IhJ8j8vrOL
+    pMY22OP6baS1k9YMrtDTlwJHoGby04ThTUeBDksS9RiuHvicZqBedQdIF65pZuhp
+    eDcGBcLiYasQr/EO5gxxtLyTmgsHSOVSBcFOn9lgv7LECPq9i7mfH3mpxgrRKSxH
+    pOoZ0KXMcB+hHuvlklHntvcI0mMMQ0mhYj6qtMFStkF1RpCG3IPdIwpVCQqu8GV7
+    s8ubknRzs+3C/Bm19RFOoiPpDkwvyNfvmQ14XkyqqKK5oZ8zhD32kFRQkxa8uZSu
+    h4aTImFxknu39waBxIRXE4jKxlAmQc4QjFZoq1KmQqQg0J/1JF8RlFvJas1VcjLv
+    YlvUB2t6npO6oQjB3l+PNf0DpQH7iUx3Wz5AjQCi6L25FjyE06q6BZ/QlmtYdl/8
+    ZYao4SRqPEs/6cAiF+Qf5zg2UkaWtDphl1LKMuTNLotvsX99HP69V2faNyegodQ0
+    LyTApr/vT01YPE46vNsDLgK+4cL6TrzC/a4WcmF5SRJ938zrv/duJHLXQIku5v0+
+    EwOy59Hdm0PT/Er/84dDV0CSjdR/2XuZM3kpysSKLgD1cKiDA+IRguODCxfO9cyY
+    Ig46v9mFmBvyH04=
+    -----END CERTIFICATE-----
+  tls.key: |
+    -----BEGIN PRIVATE KEY-----
+    MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgXuMIQX6LINaWverb
+    bXLW1pp43GDplg7gnSMfGVu04dShRANCAATy5373E7Z6Rd+9fyCFV3iuon/SdWo4
+    BW+vFI2i7Xuh8CFsqvqOEOEO5oo8/C7eve1jFxT8iPV++JeHAsdTumxK
+    -----END PRIVATE KEY-----

resources/app-secrets/env/k3s-cluster/templates/tls-secrets.yaml

@@ -1,22 +0,0 @@
----
-apiVersion: bitnami.com/v1alpha1
-kind: SealedSecret
-metadata:
-  annotations:
-    sealedsecrets.bitnami.com/cluster-wide: "true"
-  creationTimestamp: null
-  name: tls-secrets
-spec:
-  encryptedData:
-    ca.crt: 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
-    tls.crt: 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
-    tls.key: AgB25oSo9ij5Ab4s6mXV9R/dyRkNk8SwTvA3vKfmF/ZHuA5iCTPglnzntE+Ve+FGzE0BExVlERr0XiQehJllfYYC5QRCIB4kIWDE1NwrR+tjLOJSlx4JEQNVVk2LxoIf23tI9Bn+6qkq1hEREqSjefG5CAjF/unC0wq+AEFIqWnHPVuw72MKe5+G2RB39x+LXYKCMbHH9G5ee+FOsvhIeuYQi4WI5VdGyGuVgxCIY+AmvylBbw6bmY1rUe6pD6u6jDahPqgkQL1fNnxeMEvP8WKkm+wdnfY803MftrbsQMNvVYJ17Vod6xYol95lqXTH9O/gPVx5NCaOMy0Oq1/1ZIctA2s05cUyG+DCsEe5bL1dI/x+E2so1zMykkuNz85z0+stykE+n4DEE35WBEE5LV6s5lVFGkkx0IxFJFSTggOnwcvAawd0xrZSSlA2zFqom0FPIZUFSBhU9UZiDXudZKPD+v1nK9XHrcSaZI24qBPuPk46oIeNL0hZgklyeBzsKAKt0nI2LAzot3B2rhpi6x/mWjWlJkAcWDgoIcyyAGLZRfKoBO/jkgIXFWVFNJdqeK+wyH8/LbEnM58kWudrJf/fU8bxlDQkF8Ht+Y4WsqFElHDz0NhXMK3y/5PHg8uljrf+iFgZV3oaAGvwsqtJ9Lq5xKFDD0jDYThX17tzC7IoezBsaJpslzh8ZCvPa55iRta+dKEZXaNrLhMxVfPgUaWDFhnioGyrKEVVMEVsU14DgyrpQcuMR9dRLPCvxg2+/cMdq+vBZ4iRqpAc52TZDiaZauGq+bHOmIIOn1VJ6B8W2En+3zO1Tpht6vE+ZjjfhfBpbxWl8mg3jIt2xvIPXP77doFsc1AdNg08difigkUeXysrD4PGa2fTD0goPE6v1ntu8SRGw6dGYzvC5QPKCKULWIEr5WjCx2hWuXf8I9AXrR+jZ/Y6raZW+Ql0iTl56n9+VQ0UTt+JOCb3vKlQrwoeaipNqw+2nzgwaayg615Z+Z+PhEcRHW1UPJRgGJAD+6My
-  template:
-    metadata:
-      annotations:
-        argocd.argoproj.io/sync-options: Prune=false
-        sealedsecrets.bitnami.com/cluster-wide: "true"
-        sealedsecrets.bitnami.com/managed: "true"
-      creationTimestamp: null
-      name: tls-secrets
-    type: kubernetes.io/tls