diff --git a/hyrax/values.yaml b/hyrax/values.yaml index def494841..ca37370ba 100644 --- a/hyrax/values.yaml +++ b/hyrax/values.yaml @@ -246,9 +246,9 @@ nginx: # The set up below does malicious bot / ip blocking and mounts # vaolumes to allow nginx to server assets and other public directory items # image: - # registry: registry.gitlab.com - # repository: notch8/scripts/bitnami-nginx - # tag: 1.21.5-debian-10-r4 + # registry: ghcr.io + # repository: bitnamilegacy-nginx + # tag: 1.21.6-debian-11-r21 # extraVolumes: # - name: "uploads" # persistentVolumeClaim: @@ -377,6 +377,9 @@ nginx: redis: + image: + repository: bitnamilegacy/redis + tag: 6.0.6 enabled: true password: mysecret diff --git a/ops/production-deploy.tmpl.yaml b/ops/production-deploy.tmpl.yaml index 5f1fc6714..ba85d95b9 100644 --- a/ops/production-deploy.tmpl.yaml +++ b/ops/production-deploy.tmpl.yaml @@ -213,8 +213,11 @@ leaseRelease: enabled: false redis: + image: + repository: bitnamilegacy/redis + tag: 7.0.2-debian-11-r7 cluster: - enabled: true + enabled: false password: production imagePullSecrets: @@ -251,9 +254,9 @@ global: nginx: enabled: true image: - registry: registry.gitlab.com - repository: notch8/scripts/bitnami-nginx - tag: 1.21.5-debian-10-r7 + registry: ghcr.io + repository: notch8/scripts/bitnamilegacy-nginx + tag: 1.21.6-debian-11-r21 serverBlock: |- upstream rails_app { server {{ .Values.global.hyraxName }}; diff --git a/ops/provision/k8s/postgresql-values.enc.yaml b/ops/provision/k8s/postgresql-values.enc.yaml index dd6bb792a..b99a40188 100644 --- a/ops/provision/k8s/postgresql-values.enc.yaml +++ b/ops/provision/k8s/postgresql-values.enc.yaml @@ -1,50 +1,51 @@ image: - tag: ENC[AES256_GCM,data:iAG2PKYD4UpfiaXfVf8FJkX7Oyw=,iv:rAHG2eYsXYW00ov2nOju1LhiBe/1+/D4wpvftV/7j3Y=,tag:eAAHtUHK4p/GBNkvQBqaAg==,type:str] + repository: ENC[AES256_GCM,data:CV8Ahm0yGs/qGJuynA0HjEGYtXJVztG6,iv:PKDgPXAHYehdXNTBJ1MDvNGlPLkBuZZyAc4bC7EEZko=,tag:/dWZ7nOUd8aCpY40Zk3JUA==,type:str] + tag: ENC[AES256_GCM,data:hzXz4tVw,iv:4kYp0z6Sexd3gHcYvlER1UpND1wVKE8x2FLP/dzMzQc=,tag:PKOAqN+H5ouNMQmFpURhYQ==,type:str] primary: persistence: - enabled: ENC[AES256_GCM,data:RO1qEQ==,iv:dO4dyDuZAyhkW+2SiG7Zp6ARJZOH7mV/Y6Aj9PdCeTk=,tag:9d/fCKH8no+WTIix+R7EpQ==,type:bool] - size: ENC[AES256_GCM,data:qihV3w==,iv:Twnsq4m/GHqS7Zp+3ANXk7uxsUb3sWZBEchawiISanA=,tag:+DGC0GrgVdeElZ1rIFRuPg==,type:str] - storageClass: ENC[AES256_GCM,data:nXAY,iv:UKvhACjOSAhvBAmRB9Hg3gGEfOF4tdvBTxkPivVnH5A=,tag:vumDynu9DYKaVGw9Ven3oQ==,type:str] + enabled: ENC[AES256_GCM,data:FdoBvA==,iv:RQAvfglM+dI6ndeTYYItYdxAjc+k+Ypnu6HLUN1qjXU=,tag:ge5QZMk64SjM+3DEP/i9bg==,type:bool] + size: ENC[AES256_GCM,data:N3wX0A==,iv:HfBh261qygA9vWJj7P0KMDcyHYHWuoUyRV+nqU0bHDE=,tag:rVZ0Q8qWIbhgRGwzraUdoA==,type:str] + storageClass: ENC[AES256_GCM,data:+rma,iv:6ZYfXl7UMS5XS3tjdHM5ylGgoigv6gSXqMNhNO2JBM0=,tag:1RLUAMnm/jjNxKP6jnxvEQ==,type:str] readReplicas: persistence: - enabled: ENC[AES256_GCM,data:tGlqLA==,iv:Zlv4YVyu4uGe4NXv7nGDy/aNDaoqltUB9jpYO7spttU=,tag:smGCnOvWkhm3/grIhOHrrA==,type:bool] - size: ENC[AES256_GCM,data:TMSCAg==,iv:+2Ymn8VJk8yBRAskpDpLkAJ6O2eI4RJLC63b1cx/J4g=,tag:/AfMvCwt4BjDTjGPDl3MaQ==,type:str] - storageClass: ENC[AES256_GCM,data:z3/F,iv:BCy/D0RkUNGbtxNvVX5ZwwxA9RgkGx2J1JwFh2NNJps=,tag:+cpKKyir1JdD+v/wPLR0/Q==,type:str] + enabled: ENC[AES256_GCM,data:DWzQ0g==,iv:r+vNgz4rAPabKTrxeNYfYrM+kJVFqixLqahuI9qZ5VY=,tag:4ctKQ25DEdU8QZiKlwdPkA==,type:bool] + size: ENC[AES256_GCM,data:Ukrs5w==,iv:6glRsn6TllYtuWj+Lm0DcX3sYPmgXelbUtX/Cnge4oY=,tag:vewD4alk3hRMp3v2YCLiYA==,type:str] + storageClass: ENC[AES256_GCM,data:hUUY,iv:zQNznTO/5fin5H1HrHzjkBBAo4fXEEjyM2OO66y5bQM=,tag:h88RGgVhB6PxN1/u0ty4Pw==,type:str] auth: - username: ENC[AES256_GCM,data:Jy+RT5Xw,iv:BIUGJ2JWy79WeZX7ZCk3sgUewQydRD+TKFKkhC5JK0M=,tag:/v2KiDfboA0IsEG02AArqw==,type:str] - password: ENC[AES256_GCM,data:Ej8ybEIK77ybQesfd8oCkWTv,iv:R9S7lEoZJNpUly76+nB4Gt5OekJREAtn82tFPwo8Ygc=,tag:1ikKr7xgn5Q1OonbKwfSjQ==,type:str] - database: ENC[AES256_GCM,data:C2QC12Ip,iv:cHzb4i1zhwiIIh++XYhUWpkM6PYQcmcd7V6RzJw0cto=,tag:ZSvZWLwvXfDV+hZENzcbng==,type:str] - replicationPassword: ENC[AES256_GCM,data:3YQuOCWHmhX+EuD07IndY08kM8k=,iv:Z98UUAXWLtL9FsbxX8/OKbitVg/z9TnsfEpuJJgcnU4=,tag:MPvtiDMRZb11YjRUu3f/Og==,type:str] + username: ENC[AES256_GCM,data:kVAu4Nxu,iv:cLV02JQ0x3JxxloczWRsCYLgZD4vNCjfGiVAcFBPdSM=,tag:bUMucUbUQl2gwDL8oh2ZsA==,type:str] + password: ENC[AES256_GCM,data:q0dfeXyNjXt8Z01H7jTB6FWU,iv:aFwj3p8NPxISiWwfrygNlOPpdb8cnQT7C7N67OJEavQ=,tag:LMFGeNe+ZX6PwOgMo0Lfxg==,type:str] + database: ENC[AES256_GCM,data:eBGZAb4+,iv:plJk4GnnrN1bBvDBC+hkF5oT7IA+xf+ptm3Q8ei6m/k=,tag:HQ6duHMzmxm/5Obb7mXt8Q==,type:str] + replicationPassword: ENC[AES256_GCM,data:v8t31H4O/1sM8WP4znvzNOWIPqA=,iv:vPo2Lkzfj5zkEjLAbmezyGRFnjntWxBz/pck+HbVSGk=,tag:TqNz8RhVQSSz9F5wZvt2fA==,type:str] metrics: - enabled: ENC[AES256_GCM,data:Q6JMPQ==,iv:JTlGnXPDGtkffbJgJAGdzORDBM+XL7B/j7wSD3rq4Mc=,tag:CStZemTkaXZ8SETeZQdOQg==,type:bool] + enabled: ENC[AES256_GCM,data:cPwjLQ==,iv:+DlmJ58ym5uxdx1f46bNumftoS//W7qXrIuWAI6/Dpw=,tag:TCjW6XOxsAzkOa0WiHQZ6A==,type:bool] sops: kms: [] gcp_kms: [] azure_kv: [] hc_vault: [] age: [] - lastmodified: "2022-02-24T19:57:27Z" - mac: ENC[AES256_GCM,data:oRsKilw0xvRyPiXtbtoKm4zr/5vIDeFDkUA7/FyXYJtDGJ40/lUQSkajTpJ4xxx7YjbHEAuS8rCB/Lz1s6l37qMr2iaM1OJnDoRp0Y7suLRb/CmuvcuJ/fOJt8QLnv1Lqj3k1nAAnv5nhUlgUq+gNyVZ0WeHfHyrzhiO7mLpMIY=,iv:lFgu1n5PZHqOSZ+mfqbDFtiN2pFqHSiHasdjfmeRAYg=,tag:w/fqetawS7AHeR0KWfEyTQ==,type:str] + lastmodified: "2025-11-19T21:15:04Z" + mac: ENC[AES256_GCM,data:chdVgI0oC4wzJujvDGD7IW4AGBU6qIBf1F8XRBZWJZquh6Hsv11twV2IFCXkP03gbgnyaKkCqVGUK27YqPQQh6ua6Q5vytbcVIUYEfIbLIE+165hiRfCWjOM92MyiHPSI+6Rq/GlCq/TzlcUdnb1MlHykxe7XQROTEK69uObvXI=,iv:w27bdERHsktSA/uEVhmml1iJZKPGpdAq2Iz8NUWGWnM=,tag:cpJY/bNqJ2Y5LnrCLL9+3w==,type:str] pgp: - - created_at: "2022-02-24T19:57:26Z" + - created_at: "2025-11-19T21:15:04Z" enc: |- -----BEGIN PGP MESSAGE----- - wcFMA7doaBdjNJH+ARAAZi0uONBsQtUjPZXNF4/dI31jezPaBQ5a3g85RqYSbgOr - bsXM3z+Q2B7Xg0wPpVLelNUiz1da1TAQzBaPvOmZ1sAnY0S7hgFUxzkBaqCQ8IaQ - Ekn8feVKpQLcsDNxb4qTzs1iqGgqV+nJ7YT5oseeg2k9AB5JCXqnVZkBnWHz4dvC - D0YtksNS+HiAk/iA8SEIcV1Os8ynOWO/6Ss1mswznl3A985pBkUrhY/tsCuGfz3C - pmo680remRHJh7TkGvcjLl6rkCNeEsurUTKecnTAAsZhIuU0tp7rqroHLc+zyUQ1 - P3WDaNF6fbRp4b/5X4qt/3rgFgzw45HI/s4gRgh5KSjJR+5j7w72214/YDKfBUh4 - 9sJDRb1NR3oo1kxlowwLX1qu+eZOiG38u3Hdlou9hE/evX4IYRz5Ll/xacTfzauv - PNq2ZptayCDle3gQquHnmM/xeyYzscURqv7pTnd5hxqiqOG/gfA/Tzp6nL6sjer6 - /bV6BTjtLno6YVDy2fzXJGAUstK9A327DjUvyNaQMmwp8+g1Y7KDsofmWdvDcBtf - psUbB0vO6afOwFU8sjvN/YCJkzxIdSH8Jwzp+57bLROzFoLzcfjLt/kznR76c3iS - J7ENMd3hCKz4FR37m//+wt1szUxUgs3AYEAMF4q0ZIYZq9q9zTZe+UoKaiBE4TnS - 5gEOPpDs1MEMlRElFdB+ySeq2Y1ctuSnu7ejn5lSsUDHbT2aIfldT2ztpTDeEEOT - 5FJZ177ry8MBcAq5P8rzF3Tk1lsS6ScxtpZvXfsmVyPkpeKZqt1mAA== - =Efst + hQIMA7doaBdjNJH+AQ//R+EJyv7LPI/6cQx0KQfsJoQtm5J/NdAhJe/2ghBzMTTG + 3kgeD1lU8IdBokBeCNOnEGpmkEyNsWFeSTnu2sQ4w7I/0aBy+5zOIUE3Dzw8fC7s + 20iwrwsGLhq7+ZSVMh4W4wtmZGyTaHcmP0wiyW0b5gz+LjB/g72lyXqtLSm1trTQ + 6tzrPUH5wr1k5hMvFglP1gwxx6LLSudhL0q6VCyIl3kJbEYjIfY1734Cst6iIEQM + IcqiBEfXDs+R9i6eXjkcWec4ehrhNIp2VmysGqQxNKjUZVFTMczLOBqboa2goZwq + AHOIAqoMy+fp2wCppW4pE2Nz/tWpFY5uZcvTcMsa+vt5ZE4fZlLJgsDuPvZv4lyZ + oIUy4QaOKgVNGw39xI4adTDz2M7RvSUcjEReXp0wCjfdkGEDmhE946JMg+DUIrb8 + GIE+L1CWioSPf6r7fitqlJ4UTJuUdszkjgPQsvP4G10yuiZfO2vInLpJtRfu0Rvc + waz8jwk8U11Dk83wtFKoyKqNHSTXRLYn36cFhx9sX/1+gwNYJc0nU3RdUT85ld8F + A5i9Vo+ZVZ+RF9eZAJCS8Qc1bgVKzEAJKz/N4iPFhMAnZzRWnYMW9qK6Qg/5H+4C + bwwL4TnLNqZmHUGNylHqFhLsdIKChVJTyZnDSxB4/0veMIigfwe0v4YMeMn/DGzS + XAFcZI2fXbnU7RnCv3n1inf81xyq8dL5TA+GuaAwsyo/u2Pk94xsai+RF9gIEznN + 0lf4MdOVmgPVIJ7usFBGo53tUyDuGhW0VjR6nx7LWpK0RJY0DePb12fZG6tX + =rdjy -----END PGP MESSAGE----- fp: 40B3DE7A02CAC8D1DE76223483DA3B754DD29AF9 unencrypted_suffix: _unencrypted - version: 3.7.1 + version: 3.8.1 diff --git a/ops/provision/k8s/solr-values.enc.yaml b/ops/provision/k8s/solr-values.enc.yaml index 2574d3598..42a9aa3c7 100644 --- a/ops/provision/k8s/solr-values.enc.yaml +++ b/ops/provision/k8s/solr-values.enc.yaml @@ -1,57 +1,66 @@ -#ENC[AES256_GCM,data:H0vj8lwros2PT4PA,iv:2cPez1cNcec3PfoCnPyJv+gVxgSwAJhWiiFX0w9sj+g=,tag:z20aKOt4CCkQUtsDBb3umg==,type:comment] -replicaCount: ENC[AES256_GCM,data:Lg==,iv:mlTzuTMiN3FympVssnNlMNP5qRo/qzoR+ch2E72Vqb8=,tag:gjJ0shc3J+9Okr5BRIxsOA==,type:int] -collectionReplicas: ENC[AES256_GCM,data:8g==,iv:W5fztQJu2Km+w9Wj1lHij102qKSPgfJVczo450AM5uE=,tag:esj3dLWq6Ge86gcJes/Fjg==,type:int] +#ENC[AES256_GCM,data:gFt1Ll+ecOGPq1qd,iv:mmjDKs0XAvdRTFftrwr2NhRI1fq/BuWzvTOYufSqaKg=,tag:+IHfHgNljpCulAgkuj/bhg==,type:comment] +global: + security: + allowInsecureImages: ENC[AES256_GCM,data:buxRxw==,iv:RT4Sq7wIi28AY0N/bDA0jKY6yBTgvoZUEi8tvIv5fE0=,tag:T809tob9DB5Poi6QMRyYdw==,type:bool] +image: + repository: ENC[AES256_GCM,data:rPsYPLH2jhd6A27goSTkuTYr,iv:iLXy+S0jSJnRUgTHG4S2aFamGHcVCbpOoeNEnRagGUk=,tag:7JwRYJpGbnqiTYlzeMq1IQ==,type:str] + tag: ENC[AES256_GCM,data:iATp78xoy0Ek3M8LLtXBPAqTQg==,iv:XafhSkD2bolrd86pV5p1d4kUnKA4fbZLzc0G0n3yfkM=,tag:UaGuxwdggt3ZmJ3YSWZ6Mw==,type:str] +replicaCount: ENC[AES256_GCM,data:Sg==,iv:hBPnEr5hmo9WDzeuyZuuByKAP8f/AI/47D60RZVbxNE=,tag:g3N+7misLA0+3Z1S3hLTHA==,type:int] +collectionReplicas: ENC[AES256_GCM,data:GQ==,iv:cTdP+FZuF3KKJaBz4EyfmOxHyYh+Z2VNYcaotAThQb0=,tag:oH9xx8k4vg4yNylmE4NQvA==,type:int] authentication: - enabled: ENC[AES256_GCM,data:Dlwtqw==,iv:xyQDcLkUQYQO6D4ZaytgUNI0iuVyZx2yD/BTMd+/1aY=,tag:P1FrGRd6m/q1dy5NmfOTMw==,type:bool] - adminUsername: ENC[AES256_GCM,data:oC15Tqw=,iv:/j+v/AQAj2bQznlWh0TBByoFMLdMmDKMXg5pPZ2KLbY=,tag:GJFEukdh73Ky9AwZWYyl1w==,type:str] - adminPassword: ENC[AES256_GCM,data:yL0SznM=,iv:VHGJuvPn6KzusDrvmYw/Rr0RyAWxW+CREtu5C/eAhXg=,tag:oqzh/HTBsXanWj5KogKrtA==,type:str] -javaMem: ENC[AES256_GCM,data:vC3AeMiCVGJWvv8Z5Q==,iv:dsFlc1uuIrppquDvmIswO5ub4ffznY0Hfp2RoVLlyYw=,tag:9ckOE6hU0eU2uuAWseixdQ==,type:str] + enabled: ENC[AES256_GCM,data:QNYh5Q==,iv:eYg8ebEWX7SDd4izl/bXxHDqmN0NTnyEBBC+4zfVCdg=,tag:z6x+t2gn63oxfsY7AE9e5A==,type:bool] + adminUsername: ENC[AES256_GCM,data:Q1KwxDA=,iv:sA94gBi+viLnkIYss07i/K7bm5u9HzFEIRfbufpSgsY=,tag:oq8o7/9w2/VVaPVl7DJDUA==,type:str] + adminPassword: ENC[AES256_GCM,data:HN/gbiA=,iv:Wg/L/cC7kgMX/S0/r8AvRcNCWSFMdKh4OK9LZy+5neA=,tag:S2LnYpqUz8N1SXG7mPEpmg==,type:str] +javaMem: ENC[AES256_GCM,data:1ynjOIM7YAlzfyvnDA==,iv:Bmx1BL5YuljH4VqwhJMUAvOJ7J6Jfqc0/MczHuC7wN8=,tag:jH/cA+rXMIg4ahApLuRnzA==,type:str] resources: limits: - memory: ENC[AES256_GCM,data:+H5H,iv:zWfsEROoJkbDqLKugkI9prKR+btddYw1a4m/shYq2S0=,tag:wOMxZSawbc0V3s7cJ3jZWQ==,type:str] + memory: ENC[AES256_GCM,data:Nhtk,iv:axUFZaHiFwN6Cm5AEAQfddvRsaN9DC9pIzpamWUnfLw=,tag:tFI+Vcy59d+uVW6zQJI3/g==,type:str] requests: - memory: ENC[AES256_GCM,data:SmzV,iv:ERq4xrCzPQW144kB/rCCnoHuy/NCstn84/6at6Cvk5Y=,tag:lWA6TeGuqxfnS2I6AOOQmQ==,type:str] + memory: ENC[AES256_GCM,data:yVR9,iv:IGgbkTULSmgJeoKsn6Qb0eJwKLjuIkWhEzKVBJNeZbs=,tag:nRfETxs7haV5sk07gJA5cQ==,type:str] zookeeper: - replicaCount: ENC[AES256_GCM,data:oQ==,iv:1iAPa2arQJfz699pqVVeNhdq7ryqiQ9/86psC8WVxcA=,tag:5yG58mCj11ykxjYt1a9odQ==,type:int] + image: + repository: ENC[AES256_GCM,data:XlgmX/Itl7sfBQzl/cPnyGvL56Gg0rg=,iv:H7VQcpYr/vfwRAsGH+thT4pERHGudp+ZngkpcFYL77E=,tag:cDBG1fVz7xfC6v+eIjuvGQ==,type:str] + tag: ENC[AES256_GCM,data:uXEiktg=,iv:3W5p2/sFaKFL4gbpcJPaO51L5VDnYV1MdlFFzRLVaqE=,tag:T9bqBz8c4Z+QFqLSiIVx6Q==,type:str] + replicaCount: ENC[AES256_GCM,data:ng==,iv:xMAXt6ya/11pOO8ctS6Uxyj7/AWo9BabCDXb+99xPLo=,tag:t/x3uZ55IXUEnpRi2y7teg==,type:int] env: - JVMFLAGS: ENC[AES256_GCM,data:mneJkneX45BIpO0OIaUB,iv:zlVHRfd9/Ghf22C7Nw1yFENVGvdLTwhG2pxKOWKBqmI=,tag:SuRsDF6f5EJElMFWA6z1dg==,type:str] + JVMFLAGS: ENC[AES256_GCM,data:Q7CgH+c3CwGG7a1GR5gd,iv:VQuN/vWtjL2rn2Sc7ozqABnMLNLEhrAmSS2TyAVB5AM=,tag:XERzTVJvEh7NZItFb4fAmQ==,type:str] resources: limits: - memory: ENC[AES256_GCM,data:6M3b,iv:VaOCMeiWDAib9ji4IbxSBdHdFh2XUd2OmDqY6eQExZ0=,tag:r4h+su1F8EMaCGuDAR5z3w==,type:str] + memory: ENC[AES256_GCM,data:VGA7,iv:ghUdjiPMkUDIlQZ23mbT4TYZ5t3y+W2xbuBCNwFGfRE=,tag:0pvtHxbMxXeuTS0SoLEpig==,type:str] requests: - memory: ENC[AES256_GCM,data:p9o2AEY=,iv:zlqUrZVvbRrXMnRTQs4u1kfeMXxjucpO6yS6zb5D0HY=,tag:DmGVc5ikjDTpM04QhDfGng==,type:str] + memory: ENC[AES256_GCM,data:xrPkafE=,iv:vUjBLgTjugMn1m210kDA71SwlC4YoejyQ0BJyWt2lec=,tag:P5bFcH/O9Xfrwc5/BoTAzA==,type:str] persistence: - enabled: ENC[AES256_GCM,data:CDbwyg==,iv:yjnmkux5s4qJwwUuBwTkhfO9ykMcqSPQAaABY8RLm5E=,tag:FwS3YNjlIcJoy1MQalc6hw==,type:bool] - storageClass: ENC[AES256_GCM,data:btCv,iv:3uqeyScbodT0jZEpGZpiiCgVSt4OE6hehK1E7A/nQIM=,tag:vd9xy24olvL3ACMkm88aTw==,type:str] - size: ENC[AES256_GCM,data:lVJKN2g=,iv:EXJjPK1idIFcCg4Ov0/5XlPK2TWNuqDG2ERiNa77I8Y=,tag:HucLhwDZSX/TohZStKMjpQ==,type:str] + enabled: ENC[AES256_GCM,data:+MOwQQ==,iv:1u6+MUb/gl4s5cMarSO4pfBa6MO3+4X1nOQt4i/cLmU=,tag:LvbYpzfO3V6h5XZhAb18Kw==,type:bool] + storageClass: ENC[AES256_GCM,data:VrVg,iv:ObOwbhi21y+HSwoO0s0UC9z1UGgmr0F2pGctv1hACdY=,tag:X1a8TvsmS9drO5PPqEHwtg==,type:str] + size: ENC[AES256_GCM,data:3NVkwp4=,iv:ls0n9wXL7ofNV38VPp4BYqzSpsx68QP9ijgVaaFlyAY=,tag:hq+4iGUdKTVgeE/LlutWKw==,type:str] sops: kms: [] gcp_kms: [] azure_kv: [] hc_vault: [] age: [] - lastmodified: "2022-02-24T19:57:26Z" - mac: ENC[AES256_GCM,data:ISXEIpc179UkQszmQOQ14MUAKE9w+tXoK7wgtXU8yGvSTeBmCCC2nenq6Zf6mRtGglL04EKsDvVX3Vkfu3ZCZbt+5vZFsq7ZnlB7zfFrvmQBbPH2N/DO5Z/8N4gkxG2ya+LwsS13cGUqBTq6GDXjGT6QRKx9W+A7LdQZN1zxLwk=,iv:8e0hr8PMkKAi47oR9GIt5mftMzT4qK8etWv1yd27XGY=,tag:7soXA6quu2oTv8dwmJYRjQ==,type:str] + lastmodified: "2025-11-19T21:30:36Z" + mac: ENC[AES256_GCM,data:OSm7376YSQLFh0v6XvsU6mLEKwmBv91B2uC5BPoO4O526oNpIXVFgT3ctCgWOq1IPq3kUFivV3haayvxgfRZXVZeIYZjIhTbagMMVA6QS6jjNPpwznVzWdhPOHcHL7tB61LoNey1hQtPpDXqjtG+6WRBREU559neaYN4kGZkwwA=,iv:tLvLgQzD9aDwKpDQsDCY/lXigspYN+M+cuarDg+FrnU=,tag:OvNBGxDtDVwck9bQBxdrQg==,type:str] pgp: - - created_at: "2022-02-24T19:57:25Z" + - created_at: "2025-11-19T21:30:36Z" enc: |- -----BEGIN PGP MESSAGE----- - wcFMA7doaBdjNJH+ARAAZKuJd6d9YW2epai1eQf7Dab5uOuF3fUiRrg69lj2pmVV - kfXEzP3Hq5Va7i4w0C6RNHNfAxYSbjMthVHGwb5AIplFbmq46tSnjFNEwZ5M3UTS - IKzVv/5YqB3Dl9qnObABcKOPPLVg0KJ8tbKLOS7Nc282iMgaZJAY+ch7cWsDellm - xRp4sX7i6zzxiX3ouSJZOTh56JX6LSvPYYRltl7PYZzGGIkvfVfyW8JU1dTi7dRU - 9NwtLR3zfUFzy+AS+jWz+Dl2rvpwu9irSdqgDu2VZuCfa8whOY9vMq+dY6pq2Wfz - X3257mzds/zOXB6iSwgLaaxxQQnG/q+F8o+YPm/FipEEDtCl/y6qmHbFKMw55DnH - ZOMKoH8exWCakEw+0LgfHo2jWsLRcSzTJvGGZ/eksOPSCGJRx+9ssWPjrjEILnKR - F1FyXGyPmoTCToOyWwwQPCJcQ+XtHwUsCRlnfTwCykW6Ge4FW0XX2OEoEapCle7v - JyJEYAhLlbeMci/SPVwNI1iZ4fR5DWO9xjpVDxi8QVt1nuNOo3fa9uhboWxRKEoW - zeLfmxiWFmYchDjnNMwWTNKRamnY4GxpU9Uo513Cm+5fI7vzlQd+8KVMgM3VzIKi - QeiRVnz9NuoUjUtP0uyZToMnVXppD0EacjxSGn3gqGEKcl32MHSYjd22psLoZAfS - 5gHM5ntfXjJZeTUVz2SyhMiqWD6QOKPsO4YJLL2sW3iiX1rlVohrLV09GYd9T7P8 - hlQb25YQWlORgI51PVravZbkdJLPRZ1YVPQtlq50rfjMKuKLMKenAA== - =1hnP + hQIMA7doaBdjNJH+AQ/5AY5lf1KkVDPuQDGYeHHbcWmIpcvufgWgq11NmzYyN93a + Wglp6wh4vZY9TSGB1YVQk++pnA1XgAPMBWnlkBwmsD3SyRR8R14WESL/8kiFsTMW + l7O1MiEQ9ZsWtV/GPjWZZLXxlKvxLgjPOWxaAY1noSRiUXRrEYvy7jgx4K4fWKq0 + Y559xXh1qzCu8A1sAGzRSB197MYCzEBl+UY/mVnlMq0onSgXYCO6bdAwDnuvktBK + QU1vI9qBfsJZW82kpHdxLpQxikbDYLqNTmCJzU6XTuA82N8KxY4rvigXU7YbQOHl + zv2GLxWO1hFqGQF5MuDlWFY2upooGrYelE5REehkzF4HiLY4fkrSeH0vunaBpdF5 + 12+HPVdFZpqqlH0h4B8EdbzzkyilJCjDa/pblvpICwgekYM9XoZmvNTflCpu3NGP + bRGI5H/KQjnSUcWleMwf0JtCdDp+UJAYkZEc7JWybit+QeslX0VyJKtNhRN5i440 + 1DeaxYz03rm3Q4F8iyDxahPZXphIhdrI1h87fC8wAcUZ/rO7aoaR3TfTmWYAW/fg + YzeWeHF/CcAqa3Q+2jvn2jcMQgSPq9P8cGUfsBmzKv7g3c+DktTA8XimGs1F7grW + j5d8KBKxnCKYCG9nUqtX7s50rqRHry6h7wsGQBFecLSa8JoDtf9WwMf6BljIg0HS + XgEQazUi10PO4YvvyhPUNq2CxFslV6LQBMkWZ8qUbyqjEoAEHzwMcpv6gAZ4ZUE+ + t9Izw0gGKy0YivpKTPpshyqw7h7yaQQfhpzAPmnVtLQCzEnnITgN5fENi84ZbTI= + =mVlA -----END PGP MESSAGE----- fp: 40B3DE7A02CAC8D1DE76223483DA3B754DD29AF9 unencrypted_suffix: _unencrypted - version: 3.7.1 + version: 3.8.1 diff --git a/ops/provision/main.tf b/ops/provision/main.tf index 7eade1da4..3ce96d6d1 100644 --- a/ops/provision/main.tf +++ b/ops/provision/main.tf @@ -168,7 +168,7 @@ resource "helm_release" "fcrepos3-staging" { repository = "https://samvera-labs.github.io/fcrepo-charts" chart = "fcrepo" values = [ - file("k8s/fcrepos3-staging-values.yaml") + file("k8s/fcrepos3-values.yaml") ] } diff --git a/ops/review-deploy.tmpl.yaml b/ops/review-deploy.tmpl.yaml index 2dac79e2b..f8e3364ae 100644 --- a/ops/review-deploy.tmpl.yaml +++ b/ops/review-deploy.tmpl.yaml @@ -146,6 +146,9 @@ fcrepo: postgresql: enabled: true redis: + image: + repository: bitnamilegacy/redis + tag: 7.0.2-debian-11-r7 cluster: enabled: false password: staging diff --git a/ops/staging-deploy.tmpl.yaml b/ops/staging-deploy.tmpl.yaml index 3b7680824..13c7fbc95 100644 --- a/ops/staging-deploy.tmpl.yaml +++ b/ops/staging-deploy.tmpl.yaml @@ -213,7 +213,15 @@ embargoRelease: leaseRelease: enabled: false +postgresql: + image: + repository: bitnamilegacy/postgresql + tag: 12.9.0 + redis: + image: + repository: bitnamilegacy/redis + tag: 7.0.2-debian-11-r7 cluster: enabled: false password: staging @@ -222,9 +230,15 @@ imagePullSecrets: - name: github-registry solr: + image: + repository: bitnamilegacy/solr + tag: 8.11.1-debian-11-r7 replicaCount: 2 collectionReplicas: 1 zookeeper: + image: + repository: bitnamilegacy/zookeeper + tag: 3.9.3 replicaCount: 1 fcrepo: @@ -239,9 +253,9 @@ externalFcrepoHost: fcrepo-staging.fcrepo-staging.svc.cluster.local nginx: enabled: true image: - registry: registry.gitlab.com - repository: notch8/scripts/bitnami-nginx - tag: 1.21.5-debian-10-r7 + registry: ghcr.io + repository: notch8/scripts/bitnamilegacy-nginx + tag: 1.21.6-debian-11-r21 serverBlock: |- upstream rails_app { server {{ .Values.global.hyraxName }};