Migrate search instance to use the elasticsearch in kube
This renames:
- the search-in-kube rpc which becomes the main staging rpc to search-rpc.
- the previous search-rpc which becomes unused (but kept for now) as search-static-rpc
This also:
- deactivates the search-static instance in the next-version environment
- decommissions the journal client which used to write to the previous search
- renames the external services names so the ingress resolution stays functional
helm diff
[swh] Comparing changes between branches production and mr/switch-staging-search (per environment)...
Your branch is up to date with 'origin/production'.
[swh] Generate config in production branch for environment staging, namespace swh...
[swh] Generate config in production branch for environment staging, namespace swh-cassandra...
[swh] Generate config in production branch for environment staging, namespace swh-cassandra-next-version...
[swh] Generate config in mr/switch-staging-search branch for environment staging...
[swh] Generate config in mr/switch-staging-search branch for environment staging...
[swh] Generate config in mr/switch-staging-search branch for environment staging...
Your branch is up to date with 'origin/production'.
[swh] Generate config in production branch for environment production, namespace swh...
[swh] Generate config in production branch for environment production, namespace swh-cassandra...
[swh] Generate config in production branch for environment production, namespace swh-cassandra-next-version...
[swh] Generate config in mr/switch-staging-search branch for environment production...
[swh] Generate config in mr/switch-staging-search branch for environment production...
[swh] Generate config in mr/switch-staging-search branch for environment production...
------------- diff for environment staging namespace swh -------------
--- /tmp/swh-chart.swh.Aq4cB0qZ/staging-swh.before 2024-12-19 17:26:37.421163843 +0100
+++ /tmp/swh-chart.swh.Aq4cB0qZ/staging-swh.after 2024-12-19 17:26:38.197163836 +0100
@@ -2419,21 +2419,21 @@
name: search-rpc-ingress
namespace: swh
spec:
type: ExternalName
externalName: archive-staging-rke2-ingress-nginx-controller.ingress-nginx.svc.cluster.local
---
# Source: swh/templates/external-services/cname.yaml
apiVersion: v1
kind: Service
metadata:
- name: search-in-kube-rpc-ingress
+ name: search-static-rpc-ingress
namespace: swh
spec:
type: ExternalName
externalName: archive-staging-rke2-ingress-nginx-controller.ingress-nginx.svc.cluster.local
---
# Source: swh/templates/external-services/cname.yaml
apiVersion: v1
kind: Service
metadata:
name: storage-cassandra-read-only-ingress
------------- diff for environment staging namespace swh-cassandra -------------
--- /tmp/swh-chart.swh.Aq4cB0qZ/staging-swh-cassandra.before 2024-12-19 17:26:37.757163840 +0100
+++ /tmp/swh-chart.swh.Aq4cB0qZ/staging-swh-cassandra.after 2024-12-19 17:26:38.529163834 +0100
@@ -6085,103 +6085,53 @@
objstorage:
cls: remote
enable_requests_retry: true
name: storage1
url: http://objstorage-storage1-ro-rpc-ingress
---
# Source: swh/templates/search/journal-client-configmap.yaml
apiVersion: v1
kind: ConfigMap
metadata:
- name: search-journal-client-indexed-configuration-template
- namespace: swh-cassandra
-data:
- config.yml.template: |
- search:
- cls: remote
- enable_requests_retry: true
- url: http://search-rpc-ingress
- storage:
- cls: remote
- enable_requests_retry: true
- url: http://storage-cassandra-read-only-ingress
- journal:
- brokers:
- - journal2.internal.staging.swh.network:9092
- group_id: swh.search.journal_client.indexed-v0.11
- object_types:
- - origin_intrinsic_metadata
- - origin_extrinsic_metadata
- prefix: swh.journal.indexed
----
-# Source: swh/templates/search/journal-client-configmap.yaml
-apiVersion: v1
-kind: ConfigMap
-metadata:
name: search-journal-client-indexed-v4-configuration-template
namespace: swh-cassandra
data:
config.yml.template: |
search:
cls: remote
enable_requests_retry: true
- url: http://search-in-kube-rpc-ingress
+ url: http://search-rpc-ingress
storage:
cls: remote
enable_requests_retry: true
url: http://storage-cassandra-read-only-ingress
journal:
brokers:
- journal2.internal.staging.swh.network:9092
group_id: swh.search.journal-client-indexed-v4-v0.11
object_types:
- origin_intrinsic_metadata
- origin_extrinsic_metadata
prefix: swh.journal.indexed
---
# Source: swh/templates/search/journal-client-configmap.yaml
apiVersion: v1
kind: ConfigMap
metadata:
- name: search-journal-client-objects-configuration-template
- namespace: swh-cassandra
-data:
- config.yml.template: |
- search:
- cls: remote
- enable_requests_retry: true
- url: http://search-rpc-ingress
- storage:
- cls: remote
- enable_requests_retry: true
- url: http://storage-cassandra-read-only-ingress
- journal:
- brokers:
- - journal2.internal.staging.swh.network:9092
- group_id: swh.search.journal_client-v0.11
- object_types:
- - origin
- - origin_visit_status
- prefix: swh.journal.objects
----
-# Source: swh/templates/search/journal-client-configmap.yaml
-apiVersion: v1
-kind: ConfigMap
-metadata:
name: search-journal-client-objects-v4-configuration-template
namespace: swh-cassandra
data:
config.yml.template: |
search:
cls: remote
enable_requests_retry: true
- url: http://search-in-kube-rpc-ingress
+ url: http://search-rpc-ingress
storage:
cls: remote
enable_requests_retry: true
url: http://storage-cassandra-read-only-ingress
journal:
brokers:
- journal2.internal.staging.swh.network:9092
group_id: swh.search.journal-client-objects-v4-v0.11
object_types:
- origin
@@ -6199,21 +6149,21 @@
search:
cls: elasticsearch
indexes:
origin:
index: origin-v0.11
read_alias: origin-read
write_alias: origin-write
hosts:
- - host: search-esnode0.internal.staging.swh.network
+ - host: search-es-http
port: 9200
---
# Source: swh/templates/search/rpc-configmap.yaml
apiVersion: v1
kind: ConfigMap
metadata:
namespace: swh-cassandra
name: search-rpc-configuration-logging
data:
logging-gunicorn.json: |
@@ -6274,43 +6224,43 @@
],
"level": "INFO"
},
"version": 1
}
---
# Source: swh/templates/search/rpc-configmap.yaml
apiVersion: v1
kind: ConfigMap
metadata:
- name: search-in-kube-rpc-configuration-template
+ name: search-static-rpc-configuration-template
namespace: swh-cassandra
data:
config.yml.template: |
search:
cls: elasticsearch
indexes:
origin:
index: origin-v0.11
read_alias: origin-read
write_alias: origin-write
hosts:
- - host: search-es-http
+ - host: search-esnode0.internal.staging.swh.network
port: 9200
---
# Source: swh/templates/search/rpc-configmap.yaml
apiVersion: v1
kind: ConfigMap
metadata:
namespace: swh-cassandra
- name: search-in-kube-rpc-configuration-logging
+ name: search-static-rpc-configuration-logging
data:
logging-gunicorn.json: |
{
"disable_existing_loggers": true,
"filters": {
"throttle_accesslog": {
"interval": 60,
"status_codes": [
200,
400
@@ -9025,21 +8975,21 @@
name: search-rpc-ingress
namespace: swh-cassandra
spec:
type: ExternalName
externalName: archive-staging-rke2-ingress-nginx-controller.ingress-nginx.svc.cluster.local
---
# Source: swh/templates/external-services/cname.yaml
apiVersion: v1
kind: Service
metadata:
- name: search-in-kube-rpc-ingress
+ name: search-static-rpc-ingress
namespace: swh-cassandra
spec:
type: ExternalName
externalName: archive-staging-rke2-ingress-nginx-controller.ingress-nginx.svc.cluster.local
---
# Source: swh/templates/external-services/cname.yaml
apiVersion: v1
kind: Service
metadata:
name: storage-cassandra-read-only-ingress
@@ -9310,28 +9260,28 @@
app: search-rpc
ports:
- port: 5010
targetPort: 5010
name: rpc
---
# Source: swh/templates/search/rpc-service.yaml
apiVersion: v1
kind: Service
metadata:
- name: search-in-kube-rpc
+ name: search-static-rpc
namespace: swh-cassandra
labels:
- app: search-in-kube-rpc
+ app: search-static-rpc
spec:
type: ClusterIP
selector:
- app: search-in-kube-rpc
+ app: search-static-rpc
ports:
- port: 5010
targetPort: 5010
name: rpc
---
# Source: swh/templates/statsd-exporter/service.yaml
apiVersion: v1
kind: Service
metadata:
name: prometheus-statsd-exporter
@@ -20082,152 +20032,39 @@
- name: config-utils
configMap:
name: config-utils
defaultMode: 0555
---
# Source: swh/templates/search/journal-client-deployment.yaml
apiVersion: apps/v1
kind: Deployment
metadata:
namespace: swh-cassandra
- name: search-journal-client-indexed
- labels:
- app: search-journal-client-indexed
-spec:
- replicas: 1
- revisionHistoryLimit: 2
- selector:
- matchLabels:
- app: search-journal-client-indexed
- strategy:
- type: RollingUpdate
- rollingUpdate:
- maxSurge: 1
- template:
- metadata:
- labels:
- app: search-journal-client-indexed
- annotations:
- checksum/config: 44e0cc66c14f9094881fffc768e860a737c4cb842af06cf8bf1e0fca9ed4a990
- checksum/config-utils: 13a26f6add17e96ce01550153c77dcd48de60241a3f4db3c93d5467234be2a7f
- spec:
- affinity:
- nodeAffinity:
- requiredDuringSchedulingIgnoredDuringExecution:
- nodeSelectorTerms:
- - matchExpressions:
- - key: swh/journal_client
- operator: In
- values:
- - "true"
- priorityClassName: swh-cassandra-normal-workload
-
- initContainers:
- - name: prepare-configuration
- image: container-registry.softwareheritage.org/swh/infra/swh-apps/utils:20231211.1
- imagePullPolicy: IfNotPresent
- command:
- - /entrypoints/prepare-configuration.sh
- env:
-
- volumeMounts:
- - name: config-utils
- mountPath: /entrypoints
- readOnly: true
- - name: configuration
- mountPath: /etc/swh
- - name: configuration-template
- mountPath: /etc/swh/configuration-template
- containers:
- - name: search-journal-client-indexed
- resources:
- requests:
- memory: 50Mi
- cpu: 10m
- image: container-registry.softwareheritage.org/swh/infra/swh-apps/search:20241211.1
- command:
- - /opt/swh/entrypoint.sh
- args:
- - swh
- - --log-level
- - INFO
- - search
- - --config-file
- - /etc/swh/config.yml
- - journal-client
- - objects
- env:
- - name: STATSD_HOST
- value: prometheus-statsd-exporter
- - name: STATSD_PORT
- value: "9125"
- - name: STATSD_TAGS
- value: deployment:search-journal-client-indexed
- - name: SWH_CONFIG_FILENAME
- value: /etc/swh/config.yml
- - name: SWH_LOG_LEVEL
- value: INFO
- - name: SWH_SENTRY_ENVIRONMENT
- value: staging
- - name: SWH_MAIN_PACKAGE
- value: swh.search
- - name: SWH_SENTRY_DSN
- valueFrom:
- secretKeyRef:
- name: swh-search-sentry-secret
- key: sentry-dsn
- # if the setting doesn't exist, sentry issue pushes will be disabled
- optional: false
- - name: SWH_SENTRY_DISABLE_LOGGING_EVENTS
- value: "true"
- imagePullPolicy: IfNotPresent
- volumeMounts:
- - name: configuration
- mountPath: /etc/swh
- volumes:
- - name: configuration
- emptyDir: {}
- - name: configuration-template
- configMap:
- name: search-journal-client-indexed-configuration-template
- items:
- - key: "config.yml.template"
- path: "config.yml.template"
- - name: config-utils
- configMap:
- name: config-utils
- defaultMode: 0555
----
-# Source: swh/templates/search/journal-client-deployment.yaml
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- namespace: swh-cassandra
name: search-journal-client-indexed-v4
labels:
app: search-journal-client-indexed-v4
spec:
replicas: 2
revisionHistoryLimit: 2
selector:
matchLabels:
app: search-journal-client-indexed-v4
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: search-journal-client-indexed-v4
annotations:
- checksum/config: 5e0235467a15fc9aef9f7ab93af1b809b9dc3d0972867cce27819260dbcacd5e
+ checksum/config: a53790a40a893bc0866b473d1470b2d8be8b4491c6f104be2fad1da441e30ab7
checksum/config-utils: 13a26f6add17e96ce01550153c77dcd48de60241a3f4db3c93d5467234be2a7f
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/journal_client
operator: In
values:
@@ -20308,152 +20145,39 @@
- name: config-utils
configMap:
name: config-utils
defaultMode: 0555
---
# Source: swh/templates/search/journal-client-deployment.yaml
apiVersion: apps/v1
kind: Deployment
metadata:
namespace: swh-cassandra
- name: search-journal-client-objects
- labels:
- app: search-journal-client-objects
-spec:
- replicas: 1
- revisionHistoryLimit: 2
- selector:
- matchLabels:
- app: search-journal-client-objects
- strategy:
- type: RollingUpdate
- rollingUpdate:
- maxSurge: 1
- template:
- metadata:
- labels:
- app: search-journal-client-objects
- annotations:
- checksum/config: 3f25e502550b7cd5e86b42ccf603c17b6e4b34c31444ab96031884db96cfefaa
- checksum/config-utils: 13a26f6add17e96ce01550153c77dcd48de60241a3f4db3c93d5467234be2a7f
- spec:
- affinity:
- nodeAffinity:
- requiredDuringSchedulingIgnoredDuringExecution:
- nodeSelectorTerms:
- - matchExpressions:
- - key: swh/journal_client
- operator: In
- values:
- - "true"
- priorityClassName: swh-cassandra-normal-workload
-
- initContainers:
- - name: prepare-configuration
- image: container-registry.softwareheritage.org/swh/infra/swh-apps/utils:20231211.1
- imagePullPolicy: IfNotPresent
- command:
- - /entrypoints/prepare-configuration.sh
- env:
-
- volumeMounts:
- - name: config-utils
- mountPath: /entrypoints
- readOnly: true
- - name: configuration
- mountPath: /etc/swh
- - name: configuration-template
- mountPath: /etc/swh/configuration-template
- containers:
- - name: search-journal-client-objects
- resources:
- requests:
- memory: 50Mi
- cpu: 10m
- image: container-registry.softwareheritage.org/swh/infra/swh-apps/search:20241211.1
- command:
- - /opt/swh/entrypoint.sh
- args:
- - swh
- - --log-level
- - INFO
- - search
- - --config-file
- - /etc/swh/config.yml
- - journal-client
- - objects
- env:
- - name: STATSD_HOST
- value: prometheus-statsd-exporter
- - name: STATSD_PORT
- value: "9125"
- - name: STATSD_TAGS
- value: deployment:search-journal-client-objects
- - name: SWH_CONFIG_FILENAME
- value: /etc/swh/config.yml
- - name: SWH_LOG_LEVEL
- value: INFO
- - name: SWH_SENTRY_ENVIRONMENT
- value: staging
- - name: SWH_MAIN_PACKAGE
- value: swh.search
- - name: SWH_SENTRY_DSN
- valueFrom:
- secretKeyRef:
- name: swh-search-sentry-secret
- key: sentry-dsn
- # if the setting doesn't exist, sentry issue pushes will be disabled
- optional: false
- - name: SWH_SENTRY_DISABLE_LOGGING_EVENTS
- value: "true"
- imagePullPolicy: IfNotPresent
- volumeMounts:
- - name: configuration
- mountPath: /etc/swh
- volumes:
- - name: configuration
- emptyDir: {}
- - name: configuration-template
- configMap:
- name: search-journal-client-objects-configuration-template
- items:
- - key: "config.yml.template"
- path: "config.yml.template"
- - name: config-utils
- configMap:
- name: config-utils
- defaultMode: 0555
----
-# Source: swh/templates/search/journal-client-deployment.yaml
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- namespace: swh-cassandra
name: search-journal-client-objects-v4
labels:
app: search-journal-client-objects-v4
spec:
replicas: 2
revisionHistoryLimit: 2
selector:
matchLabels:
app: search-journal-client-objects-v4
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: search-journal-client-objects-v4
annotations:
- checksum/config: cfbffe9a0196fa065b1df3016c1937c41b32e22332c56b7c2fc850686857f0c6
+ checksum/config: 94135bf137609006a7584568b3785c8005963499cc2f07cbc99013813b276320
checksum/config-utils: 13a26f6add17e96ce01550153c77dcd48de60241a3f4db3c93d5467234be2a7f
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/journal_client
operator: In
values:
@@ -20551,21 +20275,21 @@
app: search-rpc
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: search-rpc
annotations:
- checksum/config: 0abd1dc2ffc96dc2010834d9daca6437e70ca50411a18caeeec6976b4fb3e390
+ checksum/config: cb3458d5372d0f78a475da3ac1b4f474cebe95188ad4f0931eba0a7c9657122e
checksum/config-logging: 7bffbc6ce2cb11d88208ef0c5f1d8e6822659c361717afb51dcf0f4da02fe1f7
checksum/config-utils: 13a26f6add17e96ce01550153c77dcd48de60241a3f4db3c93d5467234be2a7f
checksum/backend-utils: f05e83ee23d0a6f024509f79edaa8e11d7e0829cea9481832ad0670267a3de60
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/rpc
@@ -20690,39 +20414,39 @@
- name: backend-utils
configMap:
name: backend-utils
defaultMode: 0555
---
# Source: swh/templates/search/rpc-deployment.yaml
apiVersion: apps/v1
kind: Deployment
metadata:
namespace: swh-cassandra
- name: search-in-kube-rpc
+ name: search-static-rpc
labels:
- app: search-in-kube-rpc
+ app: search-static-rpc
spec:
revisionHistoryLimit: 2
selector:
matchLabels:
- app: search-in-kube-rpc
+ app: search-static-rpc
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
- app: search-in-kube-rpc
+ app: search-static-rpc
annotations:
- checksum/config: 3f1440a815fbdd0844678ff2821915242c4a08bb42e88217b258badcb27d18e9
- checksum/config-logging: 3be26471b389a5a28ec713c139adb09d930858404843db1aebb5cd02017ed1d6
+ checksum/config: 7a5b75d976f3579a1c831aa35c012f5f15ff2e2b488fe1ae7f1da9ee4bb8ca3e
+ checksum/config-logging: bc2025f41b3eb8aa28b66033b96fdc1cb963f5c01fe33b2417c2378f715dbc32
checksum/config-utils: 13a26f6add17e96ce01550153c77dcd48de60241a3f4db3c93d5467234be2a7f
checksum/backend-utils: f05e83ee23d0a6f024509f79edaa8e11d7e0829cea9481832ad0670267a3de60
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/rpc
operator: In
@@ -20753,21 +20477,21 @@
- /entrypoints/initialize-search-backend.sh
env:
- name: SWH_CONFIG_FILENAME
value: /etc/swh/config.yml
volumeMounts:
- name: configuration
mountPath: /etc/swh
- name: backend-utils
mountPath: /entrypoints
containers:
- - name: search-in-kube-rpc
+ - name: search-static-rpc
resources:
requests:
memory: 300Mi
cpu: 100m
image: container-registry.softwareheritage.org/swh/infra/swh-apps/search:20241211.1
imagePullPolicy: IfNotPresent
ports:
- containerPort: 5010
name: rpc
readinessProbe:
@@ -20792,23 +20516,23 @@
value: "4"
- name: THREADS
value: "5"
- name: TIMEOUT
value: "3600"
- name: STATSD_HOST
value: prometheus-statsd-exporter
- name: STATSD_PORT
value: "9125"
- name: STATSD_TAGS
- value: deployment:search-in-kube-rpc
+ value: deployment:search-static-rpc
- name: STATSD_SERVICE_TYPE
- value: search-in-kube-rpc
+ value: search-static-rpc
- name: SWH_LOG_LEVEL
value: INFO
- name: SWH_LOG_CONFIG_JSON
value: /etc/swh/logging/logging-gunicorn.json
- name: SWH_SENTRY_ENVIRONMENT
value: staging
- name: SWH_MAIN_PACKAGE
value: swh.search
- name: SWH_SENTRY_DSN
valueFrom:
@@ -20822,27 +20546,27 @@
volumeMounts:
- name: configuration
mountPath: /etc/swh
- name: configuration-logging
mountPath: /etc/swh/logging
volumes:
- name: configuration
emptyDir: {}
- name: configuration-template
configMap:
- name: search-in-kube-rpc-configuration-template
+ name: search-static-rpc-configuration-template
items:
- key: "config.yml.template"
path: "config.yml.template"
- name: configuration-logging
configMap:
- name: search-in-kube-rpc-configuration-logging
+ name: search-static-rpc-configuration-logging
items:
- key: "logging-gunicorn.json"
path: "logging-gunicorn.json"
- name: config-utils
configMap:
name: config-utils
defaultMode: 0555
- name: backend-utils
configMap:
name: backend-utils
@@ -24139,28 +23863,28 @@
name: cpu
target:
type: Utilization
averageUtilization: 75
---
# Source: swh/templates/search/rpc-autoscale.yaml
apiVersion: autoscaling/v2
kind: HorizontalPodAutoscaler
metadata:
namespace: swh-cassandra
- name: search-in-kube-rpc
+ name: search-static-rpc
labels:
- app: search-in-kube-rpc
+ app: search-static-rpc
spec:
scaleTargetRef:
apiVersion: apps/v1
kind: Deployment
- name: search-in-kube-rpc
+ name: search-static-rpc
minReplicas: 2
maxReplicas: 4
metrics:
- type: Resource
resource:
name: cpu
target:
type: Utilization
averageUtilization: 75
---
@@ -25896,32 +25620,32 @@
annotations:
nginx.ingress.kubernetes.io/proxy-body-size: 4G
nginx.ingress.kubernetes.io/proxy-connect-timeout: "90"
nginx.ingress.kubernetes.io/proxy-read-timeout: "3600"
nginx.ingress.kubernetes.io/proxy-request-buffering: "on"
nginx.ingress.kubernetes.io/proxy-send-timeout: "90"
nginx.ingress.kubernetes.io/service-upstream: "true"
nginx.ingress.kubernetes.io/whitelist-source-range: 10.42.0.0/16,10.43.0.0/16,192.168.100.29/32,192.168.130.0/24,192.168.50.0/24
spec:
rules:
- - host: search-rpc-ingress
+ - host: search.internal.staging.swh.network
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: search-rpc
port:
number: 5010
- - host: search.internal.staging.swh.network
+ - host: search-rpc-ingress
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: search-rpc
port:
number: 5010
---
@@ -25937,21 +25661,21 @@
annotations:
nginx.ingress.kubernetes.io/proxy-body-size: 4G
nginx.ingress.kubernetes.io/proxy-connect-timeout: "90"
nginx.ingress.kubernetes.io/proxy-read-timeout: "3600"
nginx.ingress.kubernetes.io/proxy-request-buffering: "on"
nginx.ingress.kubernetes.io/proxy-send-timeout: "90"
nginx.ingress.kubernetes.io/service-upstream: "true"
nginx.ingress.kubernetes.io/whitelist-source-range: 10.42.0.0/16,10.43.0.0/16,192.168.100.29/32,192.168.101.0/24,192.168.130.0/24,192.168.50.0/24
spec:
rules:
- - host: search-rpc-ingress
+ - host: search.internal.staging.swh.network
http:
paths:
- path: /
pathType: Exact
backend:
service:
name: search-rpc
port:
number: 5010
@@ -25972,21 +25696,21 @@
number: 5010
- path: /visit_types_count
pathType: Exact
backend:
service:
name: search-rpc
port:
number: 5010
- - host: search.internal.staging.swh.network
+ - host: search-rpc-ingress
http:
paths:
- path: /
pathType: Exact
backend:
service:
name: search-rpc
port:
number: 5010
@@ -26012,96 +25736,96 @@
service:
name: search-rpc
port:
number: 5010
---
# Source: swh/templates/search/rpc-ingress.yaml
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
namespace: swh-cassandra
- name: search-in-kube-rpc-ingress-default
+ name: search-static-rpc-ingress-default
labels:
- app: search-in-kube-rpc
+ app: search-static-rpc
endpoint-definition: default
annotations:
nginx.ingress.kubernetes.io/proxy-body-size: 4G
nginx.ingress.kubernetes.io/proxy-connect-timeout: "90"
nginx.ingress.kubernetes.io/proxy-read-timeout: "3600"
nginx.ingress.kubernetes.io/proxy-request-buffering: "on"
nginx.ingress.kubernetes.io/proxy-send-timeout: "90"
nginx.ingress.kubernetes.io/service-upstream: "true"
nginx.ingress.kubernetes.io/whitelist-source-range: 10.42.0.0/16,10.43.0.0/16,192.168.100.29/32,192.168.130.0/24,192.168.50.0/24
spec:
rules:
- - host: search-in-kube-rpc-ingress
+ - host: search-static-rpc-ingress
http:
paths:
- path: /
pathType: Prefix
backend:
service:
- name: search-in-kube-rpc
+ name: search-static-rpc
port:
number: 5010
---
# Source: swh/templates/search/rpc-ingress.yaml
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
namespace: swh-cassandra
- name: search-in-kube-rpc-ingress-read-only
+ name: search-static-rpc-ingress-read-only
labels:
- app: search-in-kube-rpc
+ app: search-static-rpc
endpoint-definition: read-only
annotations:
nginx.ingress.kubernetes.io/proxy-body-size: 4G
nginx.ingress.kubernetes.io/proxy-connect-timeout: "90"
nginx.ingress.kubernetes.io/proxy-read-timeout: "3600"
nginx.ingress.kubernetes.io/proxy-request-buffering: "on"
nginx.ingress.kubernetes.io/proxy-send-timeout: "90"
nginx.ingress.kubernetes.io/service-upstream: "true"
nginx.ingress.kubernetes.io/whitelist-source-range: 10.42.0.0/16,10.43.0.0/16,192.168.100.29/32,192.168.101.0/24,192.168.130.0/24,192.168.50.0/24
spec:
rules:
- - host: search-in-kube-rpc-ingress
+ - host: search-static-rpc-ingress
http:
paths:
- path: /
pathType: Exact
backend:
service:
- name: search-in-kube-rpc
+ name: search-static-rpc
port:
number: 5010
- path: /origin/search
pathType: Exact
backend:
service:
- name: search-in-kube-rpc
+ name: search-static-rpc
port:
number: 5010
- path: /origin/get
pathType: Exact
backend:
service:
- name: search-in-kube-rpc
+ name: search-static-rpc
port:
number: 5010
- path: /visit_types_count
pathType: Exact
backend:
service:
- name: search-in-kube-rpc
+ name: search-static-rpc
port:
number: 5010
---
# Source: swh/templates/storage/ingress.yaml
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
namespace: swh-cassandra
name: storage-cassandra-ingress-default
labels:
------------- diff for environment staging namespace swh-cassandra-next-version -------------
--- /tmp/swh-chart.swh.Aq4cB0qZ/staging-swh-cassandra-next-version.before 2024-12-19 17:26:38.053163838 +0100
+++ /tmp/swh-chart.swh.Aq4cB0qZ/staging-swh-cassandra-next-version.after 2024-12-19 17:26:38.821163831 +0100
@@ -7850,21 +7850,21 @@
name: search-rpc-ingress
namespace: swh-cassandra-next-version
spec:
type: ExternalName
externalName: archive-staging-rke2-ingress-nginx-controller.ingress-nginx.svc.cluster.local
---
# Source: swh/templates/external-services/cname.yaml
apiVersion: v1
kind: Service
metadata:
- name: search-in-kube-rpc-ingress
+ name: search-static-rpc-ingress
namespace: swh-cassandra-next-version
spec:
type: ExternalName
externalName: archive-staging-rke2-ingress-nginx-controller.ingress-nginx.svc.cluster.local
---
# Source: swh/templates/external-services/cname.yaml
apiVersion: v1
kind: Service
metadata:
name: storage-cassandra-read-only-ingress
------------- diff for environment production namespace swh -------------
No differences
------------- diff for environment production namespace swh-cassandra -------------
No differences