staging/objstorage: Decommission storage1 r/w objstorage instance
helm diff
[swh] Comparing changes between branches production and staging (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...
Your branch is ahead of 'origin/staging' by 1 commit.
(use "git push" to publish your local commits)
[swh] Generate config in staging branch for environment staging...
[swh] Generate config in staging branch for environment staging...
[swh] Generate config in staging 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...
Your branch is ahead of 'origin/staging' by 1 commit.
(use "git push" to publish your local commits)
[swh] Generate config in staging branch for environment production...
[swh] Generate config in staging branch for environment production...
[swh] Generate config in staging branch for environment production...
------------- diff for environment staging namespace swh -------------
--- /tmp/swh-chart.swh.AnrWQczA/staging-swh.before 2024-03-05 15:06:30.768442134 +0100
+++ /tmp/swh-chart.swh.AnrWQczA/staging-swh.after 2024-03-05 15:06:31.512440926 +0100
@@ -11148,30 +11148,20 @@
name: objstorage-read-only-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: objstorage-read-write-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: objstorage-storage1-ro-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:
------------- diff for environment staging namespace swh-cassandra -------------
--- /tmp/swh-chart.swh.AnrWQczA/staging-swh-cassandra.before 2024-03-05 15:06:31.084441621 +0100
+++ /tmp/swh-chart.swh.AnrWQczA/staging-swh-cassandra.after 2024-03-05 15:06:31.828440413 +0100
@@ -4238,34 +4238,20 @@
namespace: swh-cassandra
name: objstorage-storage1-read-only-configuration-template
data:
config.yml.template: |
objstorage:
cls: pathslicing
root: /srv/softwareheritage/objects
slicing: 0:1/1:5
client_max_size: 1073741824
---
-# Source: swh/templates/objstorage/configmap.yaml
-apiVersion: v1
-kind: ConfigMap
-metadata:
- namespace: swh-cassandra
- name: objstorage-storage1-read-write-configuration-template
-data:
- config.yml.template: |
- objstorage:
- cls: pathslicing
- root: /srv/softwareheritage/objects
- slicing: 0:1/1:5
- client_max_size: 1073741824
----
# Source: swh/templates/scheduler/extra-services-configmap.yaml
apiVersion: v1
kind: ConfigMap
metadata:
name: extra-services-configuration-template
namespace: swh-cassandra
data:
config.yml.template: |
scheduler:
cls: remote
@@ -15351,30 +15337,20 @@
name: objstorage-read-only-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: objstorage-read-write-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: objstorage-storage1-ro-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:
@@ -15547,37 +15523,20 @@
app: objstorage-storage1-read-only
spec:
type: ClusterIP
selector:
app: objstorage-storage1-read-only
ports:
- port: 5003
targetPort: 5003
name: rpc
---
-# Source: swh/templates/objstorage/service.yaml
-apiVersion: v1
-kind: Service
-metadata:
- name: objstorage-storage1-read-write
- namespace: swh-cassandra
- labels:
- app: objstorage-storage1-read-write
-spec:
- type: ClusterIP
- selector:
- app: objstorage-storage1-read-write
- ports:
- - port: 5003
- targetPort: 5003
- name: rpc
----
# Source: swh/templates/scheduler/rpc-service.yaml
apiVersion: v1
kind: Service
metadata:
name: scheduler-rpc
namespace: swh-cassandra
labels:
app: scheduler-rpc
spec:
type: ClusterIP
@@ -23845,157 +23804,20 @@
configMap:
name: config-utils
defaultMode: 0555
- name: staging-pathslicing-ro
hostPath:
path: /srv/softwareheritage/objects
type: Directory
---
-# Source: swh/templates/objstorage/deployment.yaml
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- namespace: swh-cassandra
- name: objstorage-storage1-read-write
- labels:
- app: objstorage-storage1-read-write
-spec:
- revisionHistoryLimit: 2
- replicas: 2
- selector:
- matchLabels:
- app: objstorage-storage1-read-write
- strategy:
- type: RollingUpdate
- rollingUpdate:
- maxSurge: 1
- template:
- metadata:
- labels:
- app: objstorage-storage1-read-write
- annotations:
- checksum/config: 85909da2eac4de904fd51031fac7b9d3cf09c53c040d70dd6c028f3e170f3c1e
- checksum/config-utils: 13a26f6add17e96ce01550153c77dcd48de60241a3f4db3c93d5467234be2a7f
- spec:
- nodeSelector:
- kubernetes.io/hostname: storage1
- affinity:
- nodeAffinity:
- requiredDuringSchedulingIgnoredDuringExecution:
- nodeSelectorTerms:
- - matchExpressions:
- - key: swh/objstorage
- operator: In
- values:
- - "true"
- priorityClassName: swh-cassandra-frontend-rpc
- 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: configuration
- mountPath: /etc/swh
- - name: configuration-template
- mountPath: /etc/swh/configuration-template
- - name: config-utils
- mountPath: /entrypoints
- readOnly: true
- containers:
- - name: objstorage-storage1-read-write
- resources:
- requests:
- memory: 512Mi
- cpu: 500m
- image: container-registry.softwareheritage.org/swh/infra/swh-apps/objstorage:20240222.1
- imagePullPolicy: IfNotPresent
- ports:
- - containerPort: 5003
- name: rpc
- readinessProbe:
- httpGet:
- path: /
- port: rpc
- initialDelaySeconds: 15
- failureThreshold: 30
- periodSeconds: 5
- livenessProbe:
- tcpSocket:
- port: rpc
- initialDelaySeconds: 10
- periodSeconds: 5
- command:
- - /bin/bash
- args:
- - -c
- - /opt/swh/entrypoint.sh
- env:
- - name: THREADS
- value: "2"
- - name: WORKERS
- value: "4"
- - name: TIMEOUT
- value: "60"
- - name: STATSD_HOST
- value: prometheus-statsd-exporter
- - name: STATSD_PORT
- value: "9125"
- - name: LOG_LEVEL
- value: "INFO"
- - name: SWH_SENTRY_ENVIRONMENT
- value: staging
- - name: SWH_MAIN_PACKAGE
- value: swh.objstorage
- - name: SWH_SENTRY_DSN
- valueFrom:
- secretKeyRef:
- name: common-secrets
- key: objstorage-sentry-dsn
- # 'name' secret should exist & include key
- # if the setting doesn't exist, sentry pushes will be disabled
- optional: true
- - name: SWH_SENTRY_DISABLE_LOGGING_EVENTS
- value: "true"
- volumeMounts:
- - name: configuration
- mountPath: /etc/swh
- - name: staging-pathslicing-rw
- mountPath: /srv/softwareheritage/objects
- readOnly: false
-
- volumes:
- - name: configuration
- emptyDir: {}
- - name: configuration-template
- configMap:
- name: objstorage-storage1-read-write-configuration-template
- items:
- - key: "config.yml.template"
- path: "config.yml.template"
- - name: config-utils
- configMap:
- name: config-utils
- defaultMode: 0555
-
- - name: staging-pathslicing-rw
-
- hostPath:
- path: /srv/softwareheritage/objects
- type: Directory
----
# Source: swh/templates/scheduler/extra-services-deployment.yaml
apiVersion: apps/v1
kind: Deployment
metadata:
namespace: swh-cassandra
name: scheduler-listener
labels:
app: scheduler-listener
spec:
revisionHistoryLimit: 2
@@ -28579,50 +28401,20 @@
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: objstorage-storage1-read-only
port:
number: 5003
---
-# Source: swh/templates/objstorage/ingress.yaml
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
- namespace: swh-cassandra
- name: objstorage-storage1-read-write-ingress-default
- labels:
- app: objstorage-storage1-read-write
- endpoint-definition: default
- annotations:
- 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
- nginx.ingress.kubernetes.io/client-body-buffer-size: 128K
- nginx.ingress.kubernetes.io/proxy-body-size: 4G
- nginx.ingress.kubernetes.io/proxy-buffering: "on"
-
-spec:
- ingressClassName: nginx
- rules:
- - host: objstorage-read-write-rpc-ingress
- http:
- paths:
- - path: /
- pathType: Prefix
- backend:
- service:
- name: objstorage-storage1-read-write
- port:
- number: 5003
----
# Source: swh/templates/scheduler/rpc-ingress.yaml
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
namespace: swh-cassandra
name: scheduler-rpc-ingress-default
labels:
app: scheduler-rpc
endpoint-definition: default
annotations:
------------- diff for environment staging namespace swh-cassandra-next-version -------------
--- /tmp/swh-chart.swh.AnrWQczA/staging-swh-cassandra-next-version.before 2024-03-05 15:06:31.296441277 +0100
+++ /tmp/swh-chart.swh.AnrWQczA/staging-swh-cassandra-next-version.after 2024-03-05 15:06:32.040440068 +0100
@@ -11523,30 +11523,20 @@
name: objstorage-read-only-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: objstorage-read-write-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: objstorage-storage1-ro-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:
------------- diff for environment production namespace swh -------------
No differences
------------- diff for environment production namespace swh-cassandra -------------
No differences