Skip to content
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

Update deps across active projects (follow-up) #3319

Merged
merged 3 commits into from
Apr 1, 2024

Conversation

SorenSpicknall
Copy link
Contributor

Description

Completes the work started in #3318 by switching out version refs in various places to the versions of images, services, etc. published when the last PR merged.

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation

How has this been tested?

Kubernetes changes previewed in PR, one revised image built locally

Post-merge follow-ups

  • No action required
  • Actions required (specified below)

Copy link

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-3939840680/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-consumer /tmp/MERGED-3376617485/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-consumer
--- /tmp/LIVE-3939840680/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-consumer	2024-03-28 16:52:16.763774131 +0000
+++ /tmp/MERGED-3376617485/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-consumer	2024-03-28 16:52:16.763774131 +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:2024.2.12","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: 120
+  generation: 121
   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:2024.2.12
+        image: ghcr.io/cal-itp/data-infra/gtfs-rt-archiver-v3:2024.3.27
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:
diff -u -N /tmp/LIVE-3939840680/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-ticker /tmp/MERGED-3376617485/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-ticker
--- /tmp/LIVE-3939840680/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-ticker	2024-03-28 16:52:16.951776596 +0000
+++ /tmp/MERGED-3376617485/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-ticker	2024-03-28 16:52:16.951776596 +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:2024.2.12","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: 53
+  generation: 54
   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:2024.2.12
+        image: ghcr.io/cal-itp/data-infra/gtfs-rt-archiver-v3:2024.3.27
         imagePullPolicy: IfNotPresent
         livenessProbe:
           exec:
jupyterhub, continuous-image-puller, DaemonSet (apps) has changed:
...
            securityContext:
              allowPrivilegeEscalation: false
              runAsGroup: 65534
              runAsUser: 65534
          - name: image-pull-singleuser
-           image: ghcr.io/cal-itp/data-infra/jupyter-singleuser:2024.2.5
+           image: ghcr.io/cal-itp/data-infra/jupyter-singleuser:2024.3.27
            command:
              - /bin/sh
              - -c
              - echo "Pulling complete"
            securityContext:
...
jupyterhub, hub, ConfigMap (v1) has changed:
...
          configuration item if not None
          """
          data = get_config(key)
          if data is not None:
              setattr(cparent, name, data)
-   checksum_hook-image-puller: "cc1daaf8247ae9a0999f16fdb56e1b68df203609d8488aa3caf2bfa578241574"
+   checksum_hook-image-puller: "0611020043168a19fb34ee35d1b50e6297598c431e63fec76a497ea208eeb1fe"
jupyterhub, hub, Deployment (apps) has changed:
...
          release: jupyterhub
          hub.jupyter.org/network-access-proxy-api: "true"
          hub.jupyter.org/network-access-proxy-http: "true"
          hub.jupyter.org/network-access-singleuser: "true"
        annotations:
-         checksum/config-map: aa054c45a78acc973c272c03e5154edccccdf40e1ae8e8cc1187c9f077a4cd86
-         checksum/secret: 4cd0a2eaff16a0df81c52647507ac30f0adf28c9e493d4297ef77d833f50d4b4
+         checksum/config-map: ee831651c5d1cf4ccf1766977a0afe92c3933bb327e30ec91ad44d371bdd604a
+         checksum/secret: 90c4107fd259124f74d12419da5ae98bef186e75be8a6d2abbfd01cdbc0258ab
      spec:
        tolerations:
          - effect: NoSchedule
            key: hub.jupyter.org/dedicated
            operator: Equal
...
jupyterhub, hub, Secret (v1) has changed:
...
    name: hub
  data:
    hub.config.ConfigurableHTTPProxy.auth_token: 'REDACTED # (64 bytes)'
    hub.config.CryptKeeper.keys: 'REDACTED # (64 bytes)'
    hub.config.JupyterHub.cookie_secret: 'REDACTED # (64 bytes)'
-   values.yaml: '-------- # (10773 bytes)'
+   values.yaml: '++++++++ # (10774 bytes)'
  type: Opaque

dask, dask-scheduler, Deployment (apps) has changed:
...
          release: "dask"
          component: scheduler
      spec:
        containers:
          - name: dask-scheduler
-           image: "ghcr.io/cal-itp/data-infra/dask:2023.8.1"
+           image: "ghcr.io/cal-itp/data-infra/dask:2024.3.27"
            imagePullPolicy: IfNotPresent
            args:
              - dask-scheduler
              - --port
              - "8786"
...
dask, dask-worker, Deployment (apps) has changed:
...
          prometheus.io/port: "8790"
          prometheus.io/scrape: "true"
      spec:
        containers:
          - name: dask-worker
-           image: "ghcr.io/cal-itp/data-infra/dask:2023.8.1"
+           image: "ghcr.io/cal-itp/data-infra/dask:2024.3.27"
            imagePullPolicy: IfNotPresent
            args:
              - dask-worker
              - dask-scheduler:8786
              - --no-dashboard
...

Copy link

github-actions bot commented Mar 28, 2024

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-3069906686/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-consumer /tmp/MERGED-634823530/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-consumer
--- /tmp/LIVE-3069906686/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-consumer	2024-03-28 16:59:00.810839214 +0000
+++ /tmp/MERGED-634823530/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-consumer	2024-03-28 16:59:00.814839201 +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:2024.2.12","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: 120
+  generation: 121
   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:2024.2.12
+        image: ghcr.io/cal-itp/data-infra/gtfs-rt-archiver-v3:2024.3.27
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:
diff -u -N /tmp/LIVE-3069906686/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-ticker /tmp/MERGED-634823530/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-ticker
--- /tmp/LIVE-3069906686/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-ticker	2024-03-28 16:59:01.046838440 +0000
+++ /tmp/MERGED-634823530/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-ticker	2024-03-28 16:59:01.046838440 +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:2024.2.12","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: 53
+  generation: 54
   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:2024.2.12
+        image: ghcr.io/cal-itp/data-infra/gtfs-rt-archiver-v3:2024.3.27
         imagePullPolicy: IfNotPresent
         livenessProbe:
           exec:
jupyterhub, continuous-image-puller, DaemonSet (apps) has changed:
...
            securityContext:
              allowPrivilegeEscalation: false
              runAsGroup: 65534
              runAsUser: 65534
          - name: image-pull-singleuser
-           image: ghcr.io/cal-itp/data-infra/jupyter-singleuser:2024.2.5
+           image: ghcr.io/cal-itp/data-infra/jupyter-singleuser:2024.3.27
            command:
              - /bin/sh
              - -c
              - echo "Pulling complete"
            securityContext:
...
jupyterhub, hub, ConfigMap (v1) has changed:
...
          configuration item if not None
          """
          data = get_config(key)
          if data is not None:
              setattr(cparent, name, data)
-   checksum_hook-image-puller: "cc1daaf8247ae9a0999f16fdb56e1b68df203609d8488aa3caf2bfa578241574"
+   checksum_hook-image-puller: "0611020043168a19fb34ee35d1b50e6297598c431e63fec76a497ea208eeb1fe"
jupyterhub, hub, Deployment (apps) has changed:
...
          release: jupyterhub
          hub.jupyter.org/network-access-proxy-api: "true"
          hub.jupyter.org/network-access-proxy-http: "true"
          hub.jupyter.org/network-access-singleuser: "true"
        annotations:
-         checksum/config-map: aa054c45a78acc973c272c03e5154edccccdf40e1ae8e8cc1187c9f077a4cd86
-         checksum/secret: 4cd0a2eaff16a0df81c52647507ac30f0adf28c9e493d4297ef77d833f50d4b4
+         checksum/config-map: ee831651c5d1cf4ccf1766977a0afe92c3933bb327e30ec91ad44d371bdd604a
+         checksum/secret: 90c4107fd259124f74d12419da5ae98bef186e75be8a6d2abbfd01cdbc0258ab
      spec:
        tolerations:
          - effect: NoSchedule
            key: hub.jupyter.org/dedicated
            operator: Equal
...
jupyterhub, hub, Secret (v1) has changed:
...
    name: hub
  data:
    hub.config.ConfigurableHTTPProxy.auth_token: 'REDACTED # (64 bytes)'
    hub.config.CryptKeeper.keys: 'REDACTED # (64 bytes)'
    hub.config.JupyterHub.cookie_secret: 'REDACTED # (64 bytes)'
-   values.yaml: '-------- # (10773 bytes)'
+   values.yaml: '++++++++ # (10774 bytes)'
  type: Opaque

dask, dask-scheduler, Deployment (apps) has changed:
...
          release: "dask"
          component: scheduler
      spec:
        containers:
          - name: dask-scheduler
-           image: "ghcr.io/cal-itp/data-infra/dask:2023.8.1"
+           image: "ghcr.io/cal-itp/data-infra/dask:2024.3.27"
            imagePullPolicy: IfNotPresent
            args:
              - dask-scheduler
              - --port
              - "8786"
...
dask, dask-worker, Deployment (apps) has changed:
...
          prometheus.io/port: "8790"
          prometheus.io/scrape: "true"
      spec:
        containers:
          - name: dask-worker
-           image: "ghcr.io/cal-itp/data-infra/dask:2023.8.1"
+           image: "ghcr.io/cal-itp/data-infra/dask:2024.3.27"
            imagePullPolicy: IfNotPresent
            args:
              - dask-worker
              - dask-scheduler:8786
              - --no-dashboard
...

Copy link

github-actions bot commented Mar 28, 2024

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-1335118765/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-consumer /tmp/MERGED-4238068184/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-consumer
--- /tmp/LIVE-1335118765/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-consumer	2024-03-28 17:01:04.951429887 +0000
+++ /tmp/MERGED-4238068184/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-consumer	2024-03-28 17:01:04.951429887 +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:2024.2.12","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: 120
+  generation: 121
   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:2024.2.12
+        image: ghcr.io/cal-itp/data-infra/gtfs-rt-archiver-v3:2024.3.27
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:
diff -u -N /tmp/LIVE-1335118765/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-ticker /tmp/MERGED-4238068184/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-ticker
--- /tmp/LIVE-1335118765/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-ticker	2024-03-28 17:01:05.203426619 +0000
+++ /tmp/MERGED-4238068184/apps.v1.Deployment.gtfs-rt-v3.gtfs-rt-archiver-ticker	2024-03-28 17:01:05.203426619 +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:2024.2.12","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: 53
+  generation: 54
   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:2024.2.12
+        image: ghcr.io/cal-itp/data-infra/gtfs-rt-archiver-v3:2024.3.27
         imagePullPolicy: IfNotPresent
         livenessProbe:
           exec:
jupyterhub, continuous-image-puller, DaemonSet (apps) has changed:
...
            securityContext:
              allowPrivilegeEscalation: false
              runAsGroup: 65534
              runAsUser: 65534
          - name: image-pull-singleuser
-           image: ghcr.io/cal-itp/data-infra/jupyter-singleuser:2024.2.5
+           image: ghcr.io/cal-itp/data-infra/jupyter-singleuser:2024.3.27
            command:
              - /bin/sh
              - -c
              - echo "Pulling complete"
            securityContext:
...
jupyterhub, hub, ConfigMap (v1) has changed:
...
          configuration item if not None
          """
          data = get_config(key)
          if data is not None:
              setattr(cparent, name, data)
-   checksum_hook-image-puller: "cc1daaf8247ae9a0999f16fdb56e1b68df203609d8488aa3caf2bfa578241574"
+   checksum_hook-image-puller: "0611020043168a19fb34ee35d1b50e6297598c431e63fec76a497ea208eeb1fe"
jupyterhub, hub, Deployment (apps) has changed:
...
          release: jupyterhub
          hub.jupyter.org/network-access-proxy-api: "true"
          hub.jupyter.org/network-access-proxy-http: "true"
          hub.jupyter.org/network-access-singleuser: "true"
        annotations:
-         checksum/config-map: aa054c45a78acc973c272c03e5154edccccdf40e1ae8e8cc1187c9f077a4cd86
-         checksum/secret: 4cd0a2eaff16a0df81c52647507ac30f0adf28c9e493d4297ef77d833f50d4b4
+         checksum/config-map: ee831651c5d1cf4ccf1766977a0afe92c3933bb327e30ec91ad44d371bdd604a
+         checksum/secret: 90c4107fd259124f74d12419da5ae98bef186e75be8a6d2abbfd01cdbc0258ab
      spec:
        tolerations:
          - effect: NoSchedule
            key: hub.jupyter.org/dedicated
            operator: Equal
...
jupyterhub, hub, Secret (v1) has changed:
...
    name: hub
  data:
    hub.config.ConfigurableHTTPProxy.auth_token: 'REDACTED # (64 bytes)'
    hub.config.CryptKeeper.keys: 'REDACTED # (64 bytes)'
    hub.config.JupyterHub.cookie_secret: 'REDACTED # (64 bytes)'
-   values.yaml: '-------- # (10773 bytes)'
+   values.yaml: '++++++++ # (10774 bytes)'
  type: Opaque

dask, dask-scheduler, Deployment (apps) has changed:
...
          release: "dask"
          component: scheduler
      spec:
        containers:
          - name: dask-scheduler
-           image: "ghcr.io/cal-itp/data-infra/dask:2023.8.1"
+           image: "ghcr.io/cal-itp/data-infra/dask:2024.3.27"
            imagePullPolicy: IfNotPresent
            args:
              - dask-scheduler
              - --port
              - "8786"
...
dask, dask-worker, Deployment (apps) has changed:
...
          prometheus.io/port: "8790"
          prometheus.io/scrape: "true"
      spec:
        containers:
          - name: dask-worker
-           image: "ghcr.io/cal-itp/data-infra/dask:2023.8.1"
+           image: "ghcr.io/cal-itp/data-infra/dask:2024.3.27"
            imagePullPolicy: IfNotPresent
            args:
              - dask-worker
              - dask-scheduler:8786
              - --no-dashboard
...

Copy link

Copy link
Member

@charlie-costanzo charlie-costanzo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@SorenSpicknall SorenSpicknall merged commit 34f66c8 into main Apr 1, 2024
5 checks passed
@SorenSpicknall SorenSpicknall deleted the soren-integrate_updated_resources branch April 1, 2024 14:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants