diff --git a/software/applications/web-site/ingress.yaml b/software/applications/web-site/ingress.yaml index 05d63626..46eb632a 100644 --- a/software/applications/web-site/ingress.yaml +++ b/software/applications/web-site/ingress.yaml @@ -1,27 +1,4 @@ --- -apiVersion: security.istio.io/v1beta1 -kind: PeerAuthentication -metadata: - name: default - namespace: web-site -spec: - mtls: - mode: STRICT ---- -apiVersion: networking.istio.io/v1beta1 -kind: DestinationRule -metadata: - name: web-site-rule - namespace: web-site -spec: - host: osdu-developer-web-service.web-site.svc.cluster.local - trafficPolicy: - connectionPool: - tcp: - maxConnections: 100 - tls: - mode: ISTIO_MUTUAL ---- apiVersion: networking.istio.io/v1alpha3 kind: VirtualService metadata: diff --git a/software/applications/web-site/namespace.yaml b/software/applications/web-site/namespace.yaml index a5a2b469..c6888b71 100644 --- a/software/applications/web-site/namespace.yaml +++ b/software/applications/web-site/namespace.yaml @@ -4,4 +4,4 @@ metadata: name: web-site labels: toolkit.fluxcd.io/tenant: dev-team - istio-injection: enabled + istio-injection: disabled diff --git a/software/components/elastic-search/elastic-search.yaml b/software/components/elastic-search/elastic-search.yaml index 54601daf..9ae2491a 100644 --- a/software/components/elastic-search/elastic-search.yaml +++ b/software/components/elastic-search/elastic-search.yaml @@ -6,7 +6,7 @@ metadata: annotations: eck.k8s.elastic.co/downward-node-labels: "topology.kubernetes.io/zone" spec: - version: 7.17.22 + version: 8.15.2 http: tls: selfSignedCertificate: diff --git a/software/components/elastic-search/kibana.yaml b/software/components/elastic-search/kibana.yaml index 2aa66fb5..735a84bc 100644 --- a/software/components/elastic-search/kibana.yaml +++ b/software/components/elastic-search/kibana.yaml @@ -5,7 +5,7 @@ metadata: name: kibana namespace: elastic-search spec: - version: 7.17.22 + version: 8.15.2 elasticsearchRef: name: "elasticsearch" count: 3 diff --git a/software/components/osdu-system/elastic.yaml b/software/components/osdu-system/elastic.yaml index b500be9e..5380b35a 100644 --- a/software/components/osdu-system/elastic.yaml +++ b/software/components/osdu-system/elastic.yaml @@ -8,7 +8,7 @@ spec: interval: 5m url: https://github.com/elastic/cloud-on-k8s ref: - branch: "2.5" + branch: "2.14" ignore: | # exclude all /* diff --git a/tools/rest-scripts/check-csv.http b/tools/rest-scripts/check-csv.http index ab1f5959..7f9c01d0 100644 --- a/tools/rest-scripts/check-csv.http +++ b/tools/rest-scripts/check-csv.http @@ -551,14 +551,14 @@ Content-Type: application/json data-partition-id: {{data_partition_id}} -@FILE_ID = {{uploadURL.response.body.FileID}} -@FILE_URL = {{uploadURL.response.body.Location.SignedURL}} -@FILE_SOURCE = {{uploadURL.response.body.Location.FileSource}} +# @FILE_ID = {{uploadURL.response.body.FileID}} +# @FILE_URL = {{uploadURL.response.body.Location.SignedURL}} +# @FILE_SOURCE = {{uploadURL.response.body.Location.FileSource}} ### # @name uploadFile -PUT {{FILE_URL}} +PUT {{uploadURL.response.body.Location.SignedURL}} x-ms-blob-type: BlockBlob < ./sample.csv @@ -601,7 +601,7 @@ data-partition-id: {{data_partition_id}} "Checksum": "string", "DatasetProperties": { "FileSourceInfo": { - "FileSource": "{{FILE_SOURCE}}", + "FileSource": "{{uploadURL.response.body.Location.FileSource}}", "Name": "sample.csv" } }, diff --git a/tools/rest-scripts/check-file.http b/tools/rest-scripts/check-file.http index 3a5c4634..b3dade2b 100644 --- a/tools/rest-scripts/check-file.http +++ b/tools/rest-scripts/check-file.http @@ -112,10 +112,6 @@ Accept: application/json Content-Type: application/json data-partition-id: {{DATA_PARTITION}} -@FILE_ID = {{uploadURL.response.body.FileID}} -@FILE_URL = {{uploadURL.response.body.Location.SignedURL}} -@FILE_SOURCE = {{uploadURL.response.body.Location.FileSource}} - ### # @name getFileList @@ -137,10 +133,10 @@ data-partition-id: {{DATA_PARTITION}} ### # @name uploadFile -PUT {{FILE_URL}} +PUT {{uploadURL.response.body.Location.SignedURL}} x-ms-blob-type: BlockBlob -< ./README.md +< ./sample.las ### @@ -181,7 +177,7 @@ data-partition-id: {{DATA_PARTITION}} "SchemaFormatTypeID": "osdu:reference-data--SchemaFormatType:LAS2:", "DatasetProperties": { "FileSourceInfo": { - "FileSource": "{{FILE_SOURCE}}", + "FileSource": "{{uploadURL.response.body.Location.FileSource}}", "Name": "sample.las" } }, @@ -212,12 +208,10 @@ Accept: application/json Content-Type: application/json data-partition-id: {{DATA_PARTITION}} -@URL = {{getDownloadUrl.response.body.SignedUrl}} - ### # @name Download -GET {{URL}} +GET {{getDownloadUrl.response.body.SignedUrl}} diff --git a/tools/rest-scripts/check-record.http b/tools/rest-scripts/check-record.http index 4912a08d..e48ee467 100644 --- a/tools/rest-scripts/check-record.http +++ b/tools/rest-scripts/check-record.http @@ -147,18 +147,15 @@ Authorization: Bearer {{access_token}} Accept: application/json data-partition-id: {{DATA_PARTITION}} -@version = {{ListRecordVersions.response.body.versions[0]}} ### # @name GetRecordVersion -GET {{STORAGE_HOST}}/records/{{id}}/{{version}} +GET {{STORAGE_HOST}}/records/{{id}}/{{ListRecordVersions.response.body.versions[0]}} Authorization: Bearer {{access_token}} Accept: application/json data-partition-id: {{DATA_PARTITION}} -@dataID = {{GetRecordVersion.response.body.data.ID}} - # ----------------------- # API search @@ -172,7 +169,7 @@ data-partition-id: {{DATA_PARTITION}} { "kind": "{{kind}}", - "query": "data.ID:(\"{{dataID}}\")", + "query": "data.ID:(\"{{GetRecordVersion.response.body.data.ID}}\")", "offset": 0, "limit": 1 }