From 824f628273a2cf9f98727c3d1433ca188782dacf Mon Sep 17 00:00:00 2001 From: Rob Pothier Date: Mon, 10 Apr 2023 17:13:02 -0400 Subject: [PATCH 1/2] Update the docs for service account secret --- CHANGELOG.md | 2 ++ helm/conjur-config-cluster-prep/README.md | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 586b8cc1..bcacac5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. [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/helm/conjur-config-cluster-prep/README.md b/helm/conjur-config-cluster-prep/README.md index 45a7a826..eb183acf 100644 --- 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 From 5d2566701773a10aaa898a814049abc6861a5d0b Mon Sep 17 00:00:00 2001 From: "junior.taeza" Date: Wed, 5 Apr 2023 11:54:54 -0400 Subject: [PATCH 2/2] Upgrade ruby from 2.4 to 3.1 --- CHANGELOG.md | 2 ++ bin/test-workflow/test_app_summon/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bcacac5b..a02c1920 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ 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. diff --git a/bin/test-workflow/test_app_summon/Dockerfile b/bin/test-workflow/test_app_summon/Dockerfile index a643027c..d6b25f55 100644 --- 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"