-
Notifications
You must be signed in to change notification settings - Fork 13
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.
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
Publish RT Archiver Images That Uses New calitp-data-infra Version #3278
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The following changes will be applied to the production Kubernetes cluster upon merge. BE AWARE this may not reveal changes that have been manually applied to the cluster getting undone—applying manual changes to the cluster should be avoided. diff -u -N /tmp/LIVE-696835196/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-consumer /tmp/MERGED-2765935544/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-consumer
--- /tmp/LIVE-696835196/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-consumer 2024-02-12 22:17:06.817671318 +0000
+++ /tmp/MERGED-2765935544/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-consumer 2024-02-12 22:17:06.817671318 +0000
@@ -6,7 +6,7 @@
kubectl.kubernetes.io/last-applied-configuration: |
{"apiVersion":"apps/v1","kind":"Deployment","metadata":{"annotations":{},"labels":{"name":"gtfs-rt-archiver-consumer"},"name":"gtfs-rt-archiver-consumer","namespace":"gtfs-rt-v3"},"spec":{"replicas":6,"selector":{"matchLabels":{"name":"gtfs-rt-archiver-consumer"}},"strategy":{"type":"Recreate"},"template":{"metadata":{"annotations":{"prometheus.io/port":"9102","prometheus.io/scrape":"true"},"labels":{"name":"gtfs-rt-archiver-consumer"}},"spec":{"affinity":{"nodeAffinity":{"requiredDuringSchedulingIgnoredDuringExecution":{"nodeSelectorTerms":[{"matchExpressions":[{"key":"resource-domain","operator":"In","values":["gtfsrtv3"]}]}]}},"podAntiAffinity":{"preferredDuringSchedulingIgnoredDuringExecution":[{"podAffinityTerm":{"labelSelector":{"matchExpressions":[{"key":"name","operator":"In","values":["gtfs-rt-archiver-consumer"]}]},"topologyKey":"kubernetes.io/hostname"},"weight":100}]}},"containers":[{"args":["-m","gtfs_rt_archiver_v3.consumer"],"command":["python"],"envFrom":[{"configMapRef":{"name":"archiver-app-vars"}},{"configMapRef":{"name":"archiver-channel-vars"}},{"secretRef":{"name":"gtfs-feed-secrets"}}],"image":"ghcr.io/cal-itp/data-infra/gtfs-rt-archiver-v3:2023.8.9","lifecycle":{"preStop":{"exec":{"command":["kill","-2","1"]}}},"livenessProbe":{"exec":{"command":["python","-m","gtfs_rt_archiver_v3.liveness","fetch"]},"initialDelaySeconds":30,"periodSeconds":30},"name":"app","resources":{"limits":{"memory":"1Gi"},"requests":{"cpu":1,"memory":"512Mi"}},"volumeMounts":[{"mountPath":"/secrets/gtfs-feed-secrets","name":"gtfs-feed-secrets"}]}],"terminationGracePeriodSeconds":5,"tolerations":[{"effect":"NoSchedule","key":"resource-domain","operator":"Equal","value":"gtfsrtv3"}],"volumes":[{"name":"gtfs-feed-secrets","secret":{"secretName":"gtfs-feed-secrets"}}]}}}}
creationTimestamp: "2022-07-23T19:33:35Z"
- generation: 119
+ generation: 120
labels:
name: gtfs-rt-archiver-consumer
name: gtfs-rt-archiver-consumer
@@ -65,7 +65,7 @@
name: archiver-channel-vars
- secretRef:
name: gtfs-feed-secrets
- image: ghcr.io/cal-itp/data-infra/gtfs-rt-archiver-v3:2023.8.9
+ image: ghcr.io/cal-itp/data-infra/gtfs-rt-archiver-v3:2024.2.12
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
diff -u -N /tmp/LIVE-696835196/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-ticker /tmp/MERGED-2765935544/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-ticker
--- /tmp/LIVE-696835196/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-ticker 2024-02-12 22:17:07.001673909 +0000
+++ /tmp/MERGED-2765935544/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-ticker 2024-02-12 22:17:07.001673909 +0000
@@ -6,7 +6,7 @@
kubectl.kubernetes.io/last-applied-configuration: |
{"apiVersion":"apps/v1","kind":"Deployment","metadata":{"annotations":{},"labels":{"name":"gtfs-rt-archiver-ticker"},"name":"gtfs-rt-archiver-ticker","namespace":"gtfs-rt-v3"},"spec":{"replicas":1,"selector":{"matchLabels":{"name":"gtfs-rt-archiver-ticker"}},"strategy":{"type":"Recreate"},"template":{"metadata":{"annotations":{"prometheus.io/port":"9102","prometheus.io/scrape":"true"},"labels":{"name":"gtfs-rt-archiver-ticker"}},"spec":{"affinity":{"nodeAffinity":{"requiredDuringSchedulingIgnoredDuringExecution":{"nodeSelectorTerms":[{"matchExpressions":[{"key":"resource-domain","operator":"In","values":["gtfsrtv3"]}]}]}},"podAffinity":{"preferredDuringSchedulingIgnoredDuringExecution":[{"podAffinityTerm":{"labelSelector":{"matchExpressions":[{"key":"name","operator":"In","values":["redis"]}]},"topologyKey":"kubernetes.io/hostname"},"weight":100}]}},"containers":[{"args":["-m","gtfs_rt_archiver_v3.ticker"],"command":["python"],"envFrom":[{"configMapRef":{"name":"archiver-app-vars"}},{"configMapRef":{"name":"archiver-channel-vars"}},{"secretRef":{"name":"gtfs-feed-secrets"}}],"image":"ghcr.io/cal-itp/data-infra/gtfs-rt-archiver-v3:2023.8.9","livenessProbe":{"exec":{"command":["python","-m","gtfs_rt_archiver_v3.liveness","tick"]},"initialDelaySeconds":30,"periodSeconds":30},"name":"app","resources":{"limits":{"memory":"1Gi"},"requests":{"cpu":1,"memory":"512Mi"}},"volumeMounts":[{"mountPath":"/secrets/gtfs-feed-secrets","name":"gtfs-feed-secrets"}]}],"tolerations":[{"effect":"NoSchedule","key":"resource-domain","operator":"Equal","value":"gtfsrtv3"}],"volumes":[{"name":"gtfs-feed-secrets","secret":{"secretName":"gtfs-feed-secrets"}}]}}}}
creationTimestamp: "2022-08-11T14:21:51Z"
- generation: 52
+ generation: 53
labels:
name: gtfs-rt-archiver-ticker
name: gtfs-rt-archiver-ticker
@@ -65,7 +65,7 @@
name: archiver-channel-vars
- secretRef:
name: gtfs-feed-secrets
- image: ghcr.io/cal-itp/data-infra/gtfs-rt-archiver-v3:2023.8.9
+ image: ghcr.io/cal-itp/data-infra/gtfs-rt-archiver-v3:2024.2.12
imagePullPolicy: IfNotPresent
livenessProbe:
exec: |
evansiroky
approved these changes
Feb 12, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM assuming manual testing works
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR, when merged, will publish a new version of the image underlying the RT archiver to make use of the latest version of the
calitp-data-infra
Python package. Changes to the archiver itself are applied by hand usingkubectl
, as a safety mechanism.Type of change
How has this been tested?
Code pathways were inspected by hand for any impacts from the change to
google-cloud-secret-manager
function calls that were implemented as part of the most recentcalitp-data-infra
release. The image was built successfully locally, and will be test-built by the PR CI, as well.Post-merge follow-ups
Archiver service changes are made by hand using
kubectl
. After merge, I'll attempt to make the relevant change to the test Archiver. Then, if successful, we'll roll out the same change to the prod archiver in the morning.