feat: bump passenger up to 6.0.23 (#48)

rakutentech · Sep 22, 2024 · f85ca0b · f85ca0b
1 parent 5c12966
commit f85ca0b
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 22 deletions.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -18,9 +18,14 @@ jobs:
         - 6.0.20
     steps:
     - uses: actions/checkout@v4
-    - uses: helm/kind-action@v1.5.0
+    - uses: helm/kind-action@v1
       with:
         cluster_name: kind
+    - run: |
+        kind version
+        kubectl cluster-info
+        kubectl get nodes -o wide
+
     - name: Kind Load Image
       run: |
         docker build -t passenger-go-exporter:test .

diff --git a/.github/workflows/passenger-app.yml b/.github/workflows/passenger-app.yml
@@ -14,9 +14,9 @@ jobs:
     strategy:
       matrix:
         passenger-version:
-        - 6.0.18
-        - 6.0.19
-        - 6.0.20
+        - 6.0.21
+        - 6.0.22
+        - 6.0.23
     steps:
     - name: checkout
       uses: actions/checkout@v4

diff --git a/test/kubernetes/example/kustomization.yaml b/test/kubernetes/example/kustomization.yaml
@@ -1,9 +1,9 @@
-bases:
-  - ../base
+resources:
+- ../base
 images:
-  - name: example
-    newName: ghcr.io/rakutentech/passenger-go-exporter/passenger-app
-    newTag: 6.0.14
-  - name: passenger-exporter
-    newName: ghcr.io/rakutentech/passenger-go-exporter 
-    newTag: v1.2.3
+- name: example
+  newName: ghcr.io/rakutentech/passenger-go-exporter/passenger-app
+  newTag: 6.0.23
+- name: passenger-exporter
+  newName: ghcr.io/rakutentech/passenger-go-exporter
+  newTag: v1.2.3
diff --git a/test/kubernetes/test/kustomization.yaml b/test/kubernetes/test/kustomization.yaml
@@ -1,5 +1,5 @@
-bases:
-  - ../base
+resources:
+- ../base
 namespace: test
 patchesJson6902:
 - target:
@@ -9,9 +9,9 @@ patchesJson6902:
     name: example
   path: patch.yaml
 images:
-  - name: example
-    newName: ghcr.io/rakutentech/passenger-go-exporter/passenger-app
-    newTag: 6.0.13
-  - name: passenger-exporter
-    newName: passenger-go-exporter
-    newTag: test
+- name: example
+  newName: ghcr.io/rakutentech/passenger-go-exporter/passenger-app
+  newTag: 6.0.13
+- name: passenger-exporter
+  newName: passenger-go-exporter
+  newTag: test
diff --git a/test/passenger-app/Dockerfile b/test/passenger-app/Dockerfile
@@ -1,7 +1,7 @@
 FROM ruby:3.3
 
-ARG ARG_RAILS_VERSION=7.0.8
-ARG ARG_PASSENGER_VERSION=6.0.20
+ARG ARG_RAILS_VERSION=7.2.1
+ARG ARG_PASSENGER_VERSION=6.0.23
 ENV RAILS_VERSION $ARG_RAILS_VERSION
 ENV PASSENGER_VERSION $ARG_PASSENGER_VERSION