Skip to content

CCD-6367 Upgrade ES vms to version 9 #42024

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
markdathornehmcts wants to merge 8 commits into
base: master
Choose a base branch
from
Open

CCD-6367 Upgrade ES vms to version 9 #42024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3996703
CCD-6509 Upgrade Logstash in int-demo to ES 9.1.2
markdathornehmcts Sep 4, 2025
ace5efc
CCD-6509 Upgrade Logstash in int-demo to ES 9.1.2
markdathornehmcts Sep 4, 2025
18a0264
CCD-6367 Point int demo to latest data-store and def-store PRs
markdathornehmcts Sep 8, 2025
cd067e9
Revert "CCD-6367 Point int demo to latest data-store and def-store PRs"
markdathornehmcts Sep 8, 2025
6ba02d1
CCD-6367 Point int demo to latest data-store and def-store PRs
markdathornehmcts Sep 8, 2025
bc68813
CCD-6367 Update logstash secrets
markdathornehmcts Nov 20, 2025
971eded
Merge branch 'master' into CCD-6367
markdathornehmcts Nov 20, 2025
0035c67
CCD-6367 Update logstash secrets int-demo
markdathornehmcts Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/ccd/ccd-int-data-store-api/demo-image-policy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
hmcts.github.com/prod-automated: enabled
spec:
filterTags:
pattern: '^prod-[a-f0-9]+-(?P<ts>[0-9]+)'
pattern: '^pr-2620-[a-f0-9]+-(?P<ts>[0-9]+)'
extract: '$ts'
policy:
alphabetical:
Expand Down
2 changes: 1 addition & 1 deletion apps/ccd/ccd-int-data-store-api/demo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ spec:
releaseName: ccd-int-data-store-api
values:
java:
image: hmctspublic.azurecr.io/ccd/data-store-api:prod-6918d4e-20251117093614 #{"$imagepolicy": "flux-system:ccd-int-data-store-api"}
image: hmctspublic.azurecr.io/ccd/data-store-api:pr-2620-8b1af8e-20250905110237 #{"$imagepolicy": "flux-system:ccd-int-data-store-api"}
replicas: 2
autoscaling:
enabled: false
Expand Down
2 changes: 1 addition & 1 deletion apps/ccd/ccd-int-definition-store-api/demo-image-policy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
hmcts.github.com/prod-automated: enabled
spec:
filterTags:
pattern: '^prod-[a-f0-9]+-(?P<ts>[0-9]+)'
pattern: '^pr-1611-[a-f0-9]+-(?P<ts>[0-9]+)'
extract: '$ts'
policy:
alphabetical:
Expand Down
2 changes: 1 addition & 1 deletion apps/ccd/ccd-int-definition-store-api/demo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
alias: AZURE_STORAGE_CONNECTION_STRING
- name: app-insights-connection-string
alias: app-insights-connection-string
image: hmctspublic.azurecr.io/ccd/definition-store-api:prod-2a1bfbd-20251110091502 #{"$imagepolicy": "flux-system:ccd-int-definition-store-api"}
image: hmctspublic.azurecr.io/ccd/definition-store-api:pr-1611-ca28611-20250905112936 #{"$imagepolicy": "flux-system:ccd-int-definition-store-api"}
environment:
IDAM_USER_URL: https://idam-web-public.demo.platform.hmcts.net
DEFINITION_STORE_DB_OPTIONS: "?sslmode=require&gssEncMode=disable"
Expand Down
4 changes: 2 additions & 2 deletions apps/ccd/ccd-logstash-intdemo/ccd-logstash-intdemo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
values:
replicas: 1
image: "hmctspublic.azurecr.io/imported/logstash/logstash"
imageTag: "7.16.1"
imageTag: "9.1.2"
imagePullPolicy: "IfNotPresent"
logstashJavaOpts: "-Xms4g -Xmx8g"
resources:
Expand Down Expand Up @@ -239,7 +239,7 @@ spec:
chart:
spec:
chart: logstash
version: 8.5.1
version: 9.2.1
sourceRef:
kind: HelmRepository
name: elastic
Expand Down
25 changes: 12 additions & 13 deletions apps/ccd/demo/base/logstash-secret-intdemo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
apiVersion: v1
data:
DATA_STORE_INT_DEMO_PASS: ENC[AES256_GCM,data:VXmZMAgYCUH9yFRCQxdTJSFhsLEokMc+cBISbw==,iv:Y6jlLApAO8DVv/wrAxcnQMoG7XZdz8ce/Rt4APqUeOk=,tag:rLTv9+6oSQ9J+5eG5EDZRQ==,type:str]
DATA_STORE_INT_DEMO_URL: ENC[AES256_GCM,data:lg6Cru9W49uaSvGvitEyItmkni/fIJyxvJlGFOy1Svs2nmwMySrpzlLxm5U5oeJzzCzEqBB7Wa0M1UZpr3ZNrruo+FPSmOFtx6XKje8oLhWSX9syeM5mgfjZm7GKOuzdMwmHmNgeTUUeDEQeL3U07YJk0/+Lfz0kp4ebuSds7n96+3AQJZeMFHVoMfBUvEY2fpitV5h5C0nMvBWnyIo7iWJti0M42LTi,iv:fExH1TcBdUECS5IZDf9AzmJil4rOgK1NQHN9FmJgDA0=,tag:TgQDxT4wpq5SI6nyGRoZVA==,type:str]
DATA_STORE_INT_DEMO_USER: ENC[AES256_GCM,data:WLRU9YrVaewShvvH,iv:DPacWhj92AaRVNoUiAJP+xH1eTImYGPgFC+Z3jC/LYo=,tag:sbe9Js5txoyTT7qivE10fQ==,type:str]
DATA_STORE_PASS: ENC[AES256_GCM,data:5VoQhY+X3dgfx61dq21sn9s8bfHNYE8ksVlGKQ==,iv:lZ7Xkg2JHYaDVS2+B3no+a89YUhkz9quqoYhY18L++k=,tag:WALOIv5cSkIMkReohIadXw==,type:str]
DATA_STORE_URL: ENC[AES256_GCM,data:x3idaNepZXnhzpt+STxOC3eSUhwdlHJZ2W6TmAfteLNLA+6ygs6hqChZVNh+YTUKT3E+BwdCPzMdSZdnymObj7wjJ2Pd1iV0iS0NchWoPIdDAAXrnvhY6mNaWGVzag9KQ61A9PU7IbuYxXpIOAAgQucxTOd6jSdrf+cGKhy6umZIbV9RcdwtGuXz9NVUQzblH2cqpzmE6RsYbjf9SaGUl2sre8Q=,iv:KP9yS9lve8HAZpA7MEjvXF3hS680Z1oW44UzSI2BOhI=,tag:LOK2jIrCHlCQoXaswb4yvQ==,type:str]
DATA_STORE_USER: ENC[AES256_GCM,data:GOrQj4Ar4wpZORSG,iv:VSmOiJIfhmeEA3/ClBhB2MnZHpaUfN/F9OAwrPvXvqU=,tag:AutnOE7w0dg7YV5yBQNyIg==,type:str]
ES_HOSTS: ENC[AES256_GCM,data:T74r1AbptlAf3pizKX5KdLNwyJbp3aSR2TpKrruANIDrdr0uWXLsMrA5+BYkj56LyTafMyO4vrzvdjSwsScbca+1I2Nt01G+/IreOzoDU5UYgKQz,iv:3xe4T/4kO0htgr3bha5LRvQLX+3m6c8PwA4IUOZGnjs=,tag:uKuiUK8HOOQLqm18GOws1Q==,type:str]
DATA_STORE_INT_DEMO_PASS: ENC[AES256_GCM,data:HmbldWbqRR0G8yx/qFNkmm2xv5EkCBvD8+n/Wg==,iv:qmzeTlfZWZX5VIpYMQ01UTDMj13qKh/WD2pUWuUlyWw=,tag:X67iUZon2OWbaJz8l4JykA==,type:str]
DATA_STORE_INT_DEMO_URL: ENC[AES256_GCM,data:eR6KBebIAKk27mBpnRk2plYAZZP+Izo3qFD85Mr72HkAag7I8Lg3P3iUj4QoNquyegbmbWYjYhXdD3vNah2nS9DGW2jpVkz9WfMIy784Qdra47YJO38+srKV6x5fx2GpOmEBqaz+K0g6FZq9mvlLntMuCcWVwVDqhs18XBaFD33rZ+5dRvc5LLuWx3f5JSRcz5KzpXk4PTMrJJEVcdWXgty4mDOkYJvw,iv:N3nnEFi+hwjiVO92QxZounedFKg/0e3pP71eQMMqrGc=,tag:3FdM8eocLAk/QyVsD/6B4g==,type:str]
DATA_STORE_INT_DEMO_USER: ENC[AES256_GCM,data:9KyQmEToiGET9Wh0,iv:d0SM82aBmkRmKWBxZmERgt7RiVkC0RG2RCUAeA0fKco=,tag:xzZgxfvUjKAIDnA+Xqa5CA==,type:str]
DATA_STORE_PASS: ENC[AES256_GCM,data:sytl2W6imgzLZpoYqcKIXIJt5GKAAbnisllrtA==,iv:D7/CDy8rc/WblhMl78E8oUbz8Hpi5WrA2TOjlTZVuHM=,tag:3zV3dOsTWgayLfSCni3KWQ==,type:str]
DATA_STORE_URL: ENC[AES256_GCM,data:I30IgD+EtUBHsVy+XIjScf+vWPLwo+o9WCjxWj2GZt5bdVEDkCO33STPhMZf0XE1pWaBtc5uBnOSGxtO6F4MIPKDJFHBeUtJBGGlfRpmSvYzJ0Lg7gvza0TNQjbYT7LcbSCHtN/HP/KipYvwQXqy8ylmNQc8LPhIzlDSIWlLpUOD1o9SRrWIOe5+S5DZxTynVQhIeqXWdvNzRBxhPpKWm1IDQIc=,iv:sBoQlhasKW2W8F+7OcE7jh0qAKpvC9RqvPv6CCUD7Yw=,tag:cwSRpF8xlLopVfX7sXdrag==,type:str]
DATA_STORE_USER: ENC[AES256_GCM,data:UydN9OhRa4Mldo3i,iv:PgTSQaaxFH81h4MaJ8QDh8CZr070+0w6/d1sDX0MQJ4=,tag:RBalNSvJ3bHE+sC4hVgrtg==,type:str]
ES_HOSTS: ENC[AES256_GCM,data:cwzJc9siwzzYq3KgRJqVu25aifZCpz6rXzwZGbGAkYdrGCR06oIasm2AfrkIsNVvf0JX2Zq/9W33IMT6q17ukeY9sr5p5nSz0vhhH9EbyMk4m2ah,iv:rTo1VIfDm2eBh66ENdRMQmdHJPD87RXwxHDHRWspXXc=,tag:LBW0MlRO7HJYIERaaIiI7w==,type:str]
kind: Secret
metadata:
creationTimestamp: null
name: logstash-secret-intdemo
namespace: ccd
type: Opaque
Expand All @@ -18,9 +17,9 @@ sops:
- vault_url: https://dcdcftappsdemokv.vault.azure.net
name: sops-key
version: 7a5cc0c79b02466c86bc594c431e00f7
created_at: "2025-06-26T08:35:45Z"
enc: AqI6ZPSLHUMsWeksrdceZzOpQegMa2cHhqhIlDphcV8whmD65tOQU9TzZ_Zyo0mNOd7QhMcsVZudkuZ41ZTYGDhJ4yM0dhA6Uc6QqUWGIMrAWbGTKqCw__luopJHQCyW2XMoEaJ1mknt5uFVTV5x6QXSodyqg1F-a_Zttrh01sGv7RVPFkSmddPF4yO-93NmVnuD80XEsVwcQP_jZZbntXetAdEix59IMyRYCtzNNKopqbG9FPpu8TINumenez2vhhy_7OUbF0MbTewty1KnbcoMXphKHF2vzJZ4t1QrSVmDd4Lg3qgSC936HD61b96juE2KDs8-alEPmD_2f6SR5w
lastmodified: "2025-06-26T08:35:48Z"
mac: ENC[AES256_GCM,data:Ls2+7QxXcHINl75BfyNORwkM/tWM/8h4jxqF5Av/6fdovGmjDA5zsTpUFt+ybFLH66mMBjFu6xo6je5WsSgwrOPI94Jid4w1hmiHD3jUWtxdXcw3VU1mNwvJ8p6m5ckHYbhiyzKTLm02CCgvHPn1X166i0E8rRlwxRoiLNxuwlI=,iv:DzHicgUzhK3jSwHTPV9Edj3x6/JrQlB5hSLI3ffhDxY=,tag:NzW4kPbPVwKF56HUZIWFlA==,type:str]
created_at: "2025-12-02T17:44:27Z"
enc: g8jzg8IKWS_NHRzLmAaCOmgRFFKs9jNRh5mprOww-L4PARfe7IaCb-y3Oyampa4Z8TO69j3XQrFaAEsBON_Fq6XrXRqhomqLSL2-p8qDG3i978koAU_rYR-L65dhkt8HlFq60IVJsyfiMDVlL2QdLf21kTdqOm4C-wGeYBBHVsIcHJbJ8aIb0Ytka8KQL9YgLcbj7b_R4gIJnBcWEP3qR19s4VLvzqrQPxC8XRt4hBPl6kLQdxv0EUtcf5JShwik-rZkbSJHEW-P4AyeW9hPm0lNDu-dL5wk7aFvPkgZkvNb_ilhhm4_tIcaeKe35i6v_P8fQisr0GvARxMSJo-lhw
lastmodified: "2025-12-02T17:44:27Z"
mac: ENC[AES256_GCM,data:6zJNP1hwImvCgV9nQ2rnJfHmfmyoD/YQBGijcUm2bKE2inJvb7wMB6/eZw9BK1i0EdmW3kzI5CYcm0fqQWQLGAy1uWKTWkc1KrZCB1KCa1txGO2eADAA5da/LafeRVtggXfwbgpxUZ/e41zLX8dX/XMH3xBJCi1xDTkXebt3QUI=,iv:OjuSXZkAVqvzHZEOUhGUuA0Sqt0Tkj+VmOdm+/I0TlY=,tag:tdDwlLnlOajFEOex92QTaw==,type:str]
encrypted_regex: ^(data|stringData)$
version: 3.10.2
version: 3.11.0