Merge pull request #508 from cyberark/upgrade-ruby-branch

Upgrade ruby from 2.4 to 3.1
cyberark · Apr 20, 2023 · de821a8 · de821a8
2 parents 5e04542 + 5d25667
commit de821a8
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,12 +13,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
   [cyberark/conjur-authn-k8s-client#505](https://github.com/cyberark/conjur-authn-k8s-client/pull/505)
 
 ### Changed
+- Upgrade ruby from 2.4 to 3.1 in bin/test-workflow/test_app_summon/Dockerfile
+  [cyberark/conjur-authn-k8s-client#508](https://github.com/cyberark/conjur-authn-k8s-client/pull/508)
 - Upgrade base image in Dockerfiles to 1.19 and necessary dependencies
   [cyberark/conjur-authn-k8s-client#502](https://github.com/cyberark/conjur-authn-k8s-client/pull/502)
 - Add a wait for the master before provisioning the follower in the CI tests.
   [cyberark/conjur-authn-k8s-client#499](https://github.com/cyberark/conjur-authn-k8s-client/pull/499)
 - The version from the automated release should be used in the start up logs
   [cyberark/conjur-authn-k8s-client#503](https://github.com/cyberark/conjur-authn-k8s-client/pull/503)
+- Update the docs for service account secret
+  [cyberark/conjur-authn-k8s-client#509](https://github.com/cyberark/conjur-authn-k8s-client/pull/509)
 
 ## [0.24.0] - 2022-11-23
 ### Changed

diff --git a/bin/test-workflow/test_app_summon/Dockerfile b/bin/test-workflow/test_app_summon/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.4 as test-app-builder
+FROM ruby:3.1 as test-app-builder
 MAINTAINER CyberArk
 LABEL builder="test-app-builder"
 

diff --git a/helm/conjur-config-cluster-prep/README.md b/helm/conjur-config-cluster-prep/README.md
@@ -226,6 +226,20 @@ The steps are as follows:
    - Authenticator ServiceAccount 
    - Authenticator ClusterRole 
 
+   __NOTE: Beginning in Kubernetes 1.24 Kubernetes will not generate Secrets automatically for ServiceAccounts.
+     Conjur Config Cluster Prep Helm chart versions 0.2.1 and later will create this Service
+     account secret automatically. For Cluster Prep versions 0.1.x the secret will need to be created manually.
+     Below is an example to create a service account secret.__
+```
+apiVersion: v1
+kind: Secret
+type: kubernetes.io/service-account-token
+metadata:
+  name: conjur-oss-service-account-token
+  annotations:
+    kubernetes.io/service-account.name: conjur-oss
+```
+
 ## Examples: Running Helm Install
 
 ### Optional: Creating a Local Copy of This Helm Chart