Merge pull request #647 from GrahamDumpleton/update-package-versions

Update package versions.
educates · Feb 20, 2025 · 334bf25 · 334bf25
2 parents feb3a9b + daa7936
commit 334bf25
Show file tree

Hide file tree

Showing 11 changed files with 212 additions and 94 deletions.
diff --git a/...ckages/installer/bundle/config/ytt/_ytt_lib/packages/kapp-controller/upstream/release.yml b/...ckages/installer/bundle/config/ytt/_ytt_lib/packages/kapp-controller/upstream/release.yml
@@ -2344,18 +2344,18 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    kapp-controller.carvel.dev/version: v0.55.0
+    kapp-controller.carvel.dev/version: v0.55.1
     kbld.k14s.io/images: |
       - origins:
         - local:
             path: /home/runner/work/kapp-controller/kapp-controller
         - git:
             dirty: true
             remoteURL: https://github.com/carvel-dev/kapp-controller
-            sha: a1c5d04407f2781887e3488a4e0ffe104725c97d
+            sha: dd15f4ff05bc0d3a17ab739b3b86d84a1ae5d024
             tags:
-            - v0.55.0
-        url: ghcr.io/carvel-dev/kapp-controller@sha256:4c9802cb8d9fe3617169ce1d4338c187d6d00ddc88e796ba8d2c753cc356c3e3
+            - v0.55.1
+        url: ghcr.io/carvel-dev/kapp-controller@sha256:cf250cb1d03ba0f391fa35a9424ace7327a07bd69b41c94d62e69c58d143566e
   name: kapp-controller
   namespace: kapp-controller
 spec:
@@ -2385,7 +2385,7 @@ spec:
               fieldPath: metadata.namespace
         - name: KAPPCTRL_API_PORT
           value: "8443"
-        image: ghcr.io/carvel-dev/kapp-controller@sha256:4c9802cb8d9fe3617169ce1d4338c187d6d00ddc88e796ba8d2c753cc356c3e3
+        image: ghcr.io/carvel-dev/kapp-controller@sha256:cf250cb1d03ba0f391fa35a9424ace7327a07bd69b41c94d62e69c58d143566e
         name: kapp-controller
         ports:
         - containerPort: 8443
@@ -2419,7 +2419,7 @@ spec:
           value: /etc/kappctrl-mem-tmp/sidecarexec.sock
         - name: IMGPKG_ACTIVE_KEYCHAINS
           value: gke,aks,ecr
-        image: ghcr.io/carvel-dev/kapp-controller@sha256:4c9802cb8d9fe3617169ce1d4338c187d6d00ddc88e796ba8d2c753cc356c3e3
+        image: ghcr.io/carvel-dev/kapp-controller@sha256:cf250cb1d03ba0f391fa35a9424ace7327a07bd69b41c94d62e69c58d143566e
         name: kapp-controller-sidecarexec
         resources:
           requests:

diff --git a/docker-registry/Dockerfile b/docker-registry/Dockerfile
@@ -1 +1 @@
-FROM registry:2.8.1
+FROM registry:2.8.3
diff --git a/project-docs/release-notes/version-3.2.0.md b/project-docs/release-notes/version-3.2.0.md
@@ -35,8 +35,9 @@ Features Changed
 * Updated `kind` version bundled with `educates` CLI. Default Kubernetes cluster
   version now created by `educates create-cluster` command will be 1.32.
 
-* Updated versions of numerous bundled applications, including Docker, Helm,
-  Hugo, Carvel tools, `dive`, `yq`, `k9s`, `skaffold`, `kustomize`.
+* Updated versions of numerous bundled applications, including Contour, Docker,
+  Docker Registry, Helm, Hugo, Carvel tools, `dive`, `yq`, `k9s`, `skaffold`,
+  `kustomize`, `reveal.js`.
 
 * Update bundled VS Code Server to version 1.97.2.
 

diff --git a/session-manager/packages/contour/upstream/01-contour-config.yaml b/session-manager/packages/contour/upstream/01-contour-config.yaml
@@ -9,11 +9,12 @@ data:
     #
     # server:
     #   determine which XDS Server implementation to utilize in Contour.
-    #   xds-server-type: contour
+    #   xds-server-type: envoy
     #
     # Specify the Gateway API configuration.
     # gateway:
-    #   controllerName: projectcontour.io/gateway-controller
+    #   namespace: projectcontour
+    #   name: contour
     #
     # should contour expect to be running inside a k8s cluster
     # incluster: true

diff --git a/session-manager/packages/contour/upstream/01-crds.yaml b/session-manager/packages/contour/upstream/01-crds.yaml
diff --git a/session-manager/packages/contour/upstream/02-job-certgen.yaml b/session-manager/packages/contour/upstream/02-job-certgen.yaml
@@ -36,7 +36,7 @@ rules:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: contour-certgen-v1-28-5
+  name: contour-certgen-v1-30-2
   namespace: projectcontour
 spec:
   template:
@@ -46,7 +46,7 @@ spec:
     spec:
       containers:
       - name: contour
-        image: ghcr.io/projectcontour/contour:v1.28.5
+        image: ghcr.io/projectcontour/contour:v1.30.2
         imagePullPolicy: IfNotPresent
         command:
         - contour

diff --git a/session-manager/packages/contour/upstream/03-contour.yaml b/session-manager/packages/contour/upstream/03-contour.yaml
@@ -19,9 +19,6 @@ spec:
       app: contour
   template:
     metadata:
-      annotations:
-        prometheus.io/scrape: "true"
-        prometheus.io/port: "8000"
       labels:
         app: contour
     spec:
@@ -45,7 +42,7 @@ spec:
         - --contour-key-file=/certs/tls.key
         - --config-path=/config/contour.yaml
         command: ["contour"]
-        image: ghcr.io/projectcontour/contour:v1.28.5
+        image: ghcr.io/projectcontour/contour:v1.30.2
         imagePullPolicy: IfNotPresent
         name: contour
         ports:

diff --git a/session-manager/packages/contour/upstream/03-envoy.yaml b/session-manager/packages/contour/upstream/03-envoy.yaml
@@ -16,10 +16,6 @@ spec:
       app: envoy
   template:
     metadata:
-      annotations:
-        prometheus.io/scrape: "true"
-        prometheus.io/port: "8002"
-        prometheus.io/path: "/stats/prometheus"
       labels:
         app: envoy
     spec:
@@ -29,7 +25,7 @@ spec:
         args:
           - envoy
           - shutdown-manager
-        image: ghcr.io/projectcontour/contour:v1.28.5
+        image: ghcr.io/projectcontour/contour:v1.30.2
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:
@@ -50,7 +46,7 @@ spec:
         - --log-level info
         command:
         - envoy
-        image: docker.io/envoyproxy/envoy:v1.29.5
+        image: docker.io/envoyproxy/envoy:v1.31.5
         imagePullPolicy: IfNotPresent
         name: envoy
         env:
@@ -73,6 +69,10 @@ spec:
           hostPort: 443
           name: https
           protocol: TCP
+        - containerPort: 8002
+          hostPort: 8002
+          name: metrics
+          protocol: TCP
         readinessProbe:
           httpGet:
             path: /ready
@@ -107,7 +107,7 @@ spec:
         - --envoy-key-file=/certs/tls.key
         command:
         - contour
-        image: ghcr.io/projectcontour/contour:v1.28.5
+        image: ghcr.io/projectcontour/contour:v1.30.2
         imagePullPolicy: IfNotPresent
         name: envoy-initconfig
         volumeMounts:

diff --git a/vendir.lock.yml b/vendir.lock.yml
@@ -32,18 +32,18 @@ directories:
   path: carvel-packages/installer/bundle/config/ytt/_ytt_lib/packages/cert-manager/upstream
 - contents:
   - git:
-      commitTitle: Update Contour Docker image to v1.28.5....
-      sha: 1f4fe0502fe35c3726bee77f4f9ea06ac4c2f34d
+      commitTitle: Update Contour Docker image to v1.30.2....
+      sha: 6a5021dd96f7e1fe1b5859ee7632e8794328c396
       tags:
-      - v1.28.5
+      - v1.30.2
     path: .
   path: carvel-packages/installer/bundle/config/ytt/_ytt_lib/packages/contour/upstream
 - contents:
   - git:
-      commitTitle: Update Contour Docker image to v1.28.5....
-      sha: 1f4fe0502fe35c3726bee77f4f9ea06ac4c2f34d
+      commitTitle: Update Contour Docker image to v1.30.2....
+      sha: 6a5021dd96f7e1fe1b5859ee7632e8794328c396
       tags:
-      - v1.28.5
+      - v1.30.2
     path: .
   path: session-manager/packages/contour/upstream
 - contents:
@@ -56,8 +56,8 @@ directories:
   path: carvel-packages/installer/bundle/config/ytt/_ytt_lib/packages/external-dns/upstream
 - contents:
   - githubRelease:
-      tag: v0.55.0
-      url: https://api.github.com/repos/carvel-dev/kapp-controller/releases/193854415
+      tag: v0.55.1
+      url: https://api.github.com/repos/carvel-dev/kapp-controller/releases/200878709
     path: .
   path: carvel-packages/installer/bundle/config/ytt/_ytt_lib/packages/kapp-controller/upstream
 kind: LockConfig
diff --git a/vendir.yml b/vendir.yml
@@ -87,14 +87,14 @@ directories:
       - path: .
         git:
           url: https://github.com/projectcontour/contour
-          ref: v1.28.5
+          ref: v1.30.2
         newRootPath: examples/contour
   - path: session-manager/packages/contour/upstream
     contents:
       - path: .
         git:
           url: https://github.com/projectcontour/contour
-          ref: v1.28.5
+          ref: v1.30.2
         newRootPath: examples/contour
   - path: carvel-packages/installer/bundle/config/ytt/_ytt_lib/packages/external-dns/upstream
     contents:
@@ -110,7 +110,7 @@ directories:
       - path: .
         githubRelease:
           slug: carvel-dev/kapp-controller
-          tag: v0.55.0
+          tag: v0.55.1
           disableAutoChecksumValidation: true
         includePaths:
           - release.yml
diff --git a/workshop-images/base-environment/Dockerfile b/workshop-images/base-environment/Dockerfile
@@ -389,9 +389,9 @@ RUN mkdir -p /opt/slides/reveal.js/3.9.2 && \
     curl -sL -o src.tar.gz https://github.com/hakimel/reveal.js/archive/4.6.0.tar.gz && \
     tar --strip-components 1 -xf src.tar.gz && \
     rm src.tar.gz && \
-    mkdir -p /opt/slides/reveal.js/5.0.3 && \
-    cd /opt/slides/reveal.js/5.0.3 && \
-    curl -sL -o src.tar.gz https://github.com/hakimel/reveal.js/archive/5.0.3.tar.gz && \
+    mkdir -p /opt/slides/reveal.js/5.1.0 && \
+    cd /opt/slides/reveal.js/5.1.0 && \
+    curl -sL -o src.tar.gz https://github.com/hakimel/reveal.js/archive/5.1.0.tar.gz && \
     tar --strip-components 1 -xf src.tar.gz && \
     rm src.tar.gz && \
     mkdir -p /opt/slides/impress.js/1.1.0 && \