From 07745754ef6b60fcdf6a68da692e739dace4a523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Svantesson?= Date: Mon, 14 Oct 2024 13:13:35 +0200 Subject: [PATCH 1/3] docs: hide LTS and show warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mårten Svantesson --- content/en/v3/admin/setup/upgrades/cli.md | 2 +- content/en/v3/admin/setup/upgrades/lts.md | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/content/en/v3/admin/setup/upgrades/cli.md b/content/en/v3/admin/setup/upgrades/cli.md index 236abdad732..35af82c3df1 100644 --- a/content/en/v3/admin/setup/upgrades/cli.md +++ b/content/en/v3/admin/setup/upgrades/cli.md @@ -32,7 +32,7 @@ The `jx` CLI version used to upgrade to is derived from the Jenkins X [version s If you have not installed Jenkins X or are not connected to a Kubernetes cluster with Jenkins X running then the `jx` CLI version defaults to the latest version stream git repository [here](https://github.com/jenkins-x/jxr-versions/blob/master/packages/jx.yml) -If you are running the `jx upgrade cli` command from within a cloned cluster git repository (one that has the helmfile.yaml and jx-requirements.yml files at the root folder) then the [version stream](/about/concepts/version-stream/) URL used to find the correct jx CLI version use comes from the local file `versionStream/Kptfile`. The reason for this is when switching [version stream](/about/concepts/version-stream/) (like moving to LTS) you need to match the jx CLI version stored in that desired vesrion stream, as they may be different to you previous [version stream](/about/concepts/version-stream/). +If you are running the `jx upgrade cli` command from within a cloned cluster git repository (one that has the helmfile.yaml and jx-requirements.yml files at the root folder) then the [version stream](/about/concepts/version-stream/) URL used to find the correct jx CLI version use comes from the local file `versionStream/Kptfile`. The reason for this is when switching [version stream](/about/concepts/version-stream/) you need to match the jx CLI version stored in that desired vesrion stream, as they may be different to you previous [version stream](/about/concepts/version-stream/). If you want to find the `jx` CLI version that matches the [version stream](/about/concepts/version-stream/) used by your cluster git repository then pass this addional flag: diff --git a/content/en/v3/admin/setup/upgrades/lts.md b/content/en/v3/admin/setup/upgrades/lts.md index e8d1a1cb64f..4fb93e1cd86 100644 --- a/content/en/v3/admin/setup/upgrades/lts.md +++ b/content/en/v3/admin/setup/upgrades/lts.md @@ -6,8 +6,14 @@ description: Long Term Support (LTS) version stream weight: 40 aliases: - /v3/guides/upgrades/lts +toc_hide: true +hide_summary: true --- + + Jenkins X uses [version streams](/about/concepts/version-stream/) as a quality gate when promoting plugins, charts, cli packages, container images etc. This results in a release of Jenkins X. The default version stream for Jenkins X 3.x is https://github.com/jenkins-x/jx3-versions. The Jenkins X own infrastructure runs a number of end to end BDD tests for different base install options which covers the core of Jenkins X. Provided these tests pass on from a Pull Request it will be merged and users can upgrade their [CLI](/v3/guides/upgrades/cli) and [Cluster](/v3/guides/upgrades/cluster) bringing in the versions that make that release. From 550a4f708b96136b2b9c13559a3b1056d8b40d34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Svantesson?= Date: Mon, 14 Oct 2024 13:14:27 +0200 Subject: [PATCH 2/3] docs: move of bank vaults MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit part of fix for jenkins-x/jx#8688 Signed-off-by: Mårten Svantesson --- content/en/docs/install-setup/boot/secrets.md | 2 +- content/en/docs/reference/components/vault.md | 2 +- content/en/v3/about/overview/_index.md | 2 +- content/en/v3/about/overview/projects.md | 2 +- content/en/v3/admin/platforms/k3s/_index.md | 5 ++--- content/en/v3/admin/setup/secrets/vault.md | 2 +- content/en/v3/admin/setup/upgrades/migrations.md | 5 ++--- 7 files changed, 9 insertions(+), 11 deletions(-) diff --git a/content/en/docs/install-setup/boot/secrets.md b/content/en/docs/install-setup/boot/secrets.md index 323f60f52f6..ca08bb3d1fc 100644 --- a/content/en/docs/install-setup/boot/secrets.md +++ b/content/en/docs/install-setup/boot/secrets.md @@ -45,7 +45,7 @@ In case you are looking for a way to run Vault in your Kubernetes cluster, have {{% /alert %}} If you do not have a Vault instance, Jenkins X can, depending on where you run your cluster, install Vault as part of the installation process. -In this case, the Banzai Cloud [Bank-Vaults operator](https://github.com/banzaicloud/bank-vaults) is provisioned in the Jenkins X development namespace. +In this case, the [Bank-Vaults operator](https://github.com/bank-vaults/vault-operator) is provisioned in the Jenkins X development namespace. This apporach is referred to as the _internal_ Vault setup. #### Internal diff --git a/content/en/docs/reference/components/vault.md b/content/en/docs/reference/components/vault.md index 61f745a1968..f582a6865aa 100644 --- a/content/en/docs/reference/components/vault.md +++ b/content/en/docs/reference/components/vault.md @@ -21,7 +21,7 @@ There are two ways you can use Vault in Jenkins X. If you are already a Vault instance, you can configure Jenkins X to use this instance to store its secrets. This way you have a central location for managing all secrets of your infrastucture. If you do not have a Vault instance, Jenkins X can, depending on where you run your cluster, install Vault as part of the installation process. -In this case, the Banzai Cloud [Bank-Vaults operator](https://github.com/banzaicloud/bank-vaults) is provisioned in the Jenkins X development namespace. +In this case, the [Bank-Vaults operator](https://github.com/bank-vaults/vault-operator) is provisioned in the Jenkins X development namespace. {{% alert %}} The Bank-Vaults operator is currently only supported with GKE or EKS. diff --git a/content/en/v3/about/overview/_index.md b/content/en/v3/about/overview/_index.md index d69e36dc677..58659b82d2d 100644 --- a/content/en/v3/about/overview/_index.md +++ b/content/en/v3/about/overview/_index.md @@ -70,7 +70,7 @@ Contains the [nginx-ingress](https://github.com/helm/charts/tree/master/stable/n the following are optional extras if not using your cloud providers native secret manager: -* **vault-operator** contains the [vault operator](https://banzaicloud.com/docs/bank-vaults/operator/) which converts `Vault` resources into instances of [HashiCorp Vault](https://www.vaultproject.io/) +* **vault-operator** contains the [vault operator](https://bank-vaults.dev/docs/operator/) which converts `Vault` resources into instances of [HashiCorp Vault](https://www.vaultproject.io/) * **vault-instance** contains the [vault instance](https://github.com/jenkins-x-charts/vault-instance) which creates the default `Vault` resource diff --git a/content/en/v3/about/overview/projects.md b/content/en/v3/about/overview/projects.md index 69d2d367e28..9b57be867bf 100644 --- a/content/en/v3/about/overview/projects.md +++ b/content/en/v3/about/overview/projects.md @@ -38,4 +38,4 @@ Jenkins X stands on the shoulders of many open source giants... * [tekton pipelines](https://github.com/tektoncd/pipeline) cloud native pipeline engine for kubernetes and a fellow [CDF founding project](https://cd.foundation/projects/) * [tekton catalog](https://github.com/tektoncd/catalog) a catalog of reusable [tekton pipelines](https://github.com/tektoncd/pipeline) which [can be used easily with Jenkins ](/v3/develop/pipelines/#adding-tasks-from-the-tekton-catalog) * [vault](https://www.vaultproject.io/) a secret store -* [vault operator](https://banzaicloud.com/products/bank-vaults/) an operator for installing and unsealing [vault](https://www.vaultproject.io/) +* [vault operator](https://bank-vaults.dev/docs/operator/) an operator for installing and unsealing [vault](https://www.vaultproject.io/) diff --git a/content/en/v3/admin/platforms/k3s/_index.md b/content/en/v3/admin/platforms/k3s/_index.md index 5ba8a3a640d..dca51a57d1d 100644 --- a/content/en/v3/admin/platforms/k3s/_index.md +++ b/content/en/v3/admin/platforms/k3s/_index.md @@ -86,11 +86,10 @@ Once helm is installed, proceed to the next steps. To install vault inside the newly created k3s cluster, you need to install the vault operator and vault instance chart. ```bash -helm repo add banzaicloud-stable https://kubernetes-charts.banzaicloud.com helm repo add jxgh https://jenkins-x-charts.github.io/repo helm repo update -helm install vault-operator banzaicloud-stable/vault-operator --create-namespace -n jx-vault -helm install vault-instance jxgh/vault-instance -n jx-vault +helm upgrade --install --wait vault-operator oci://ghcr.io/bank-vaults/helm-charts/vault-operator --version 1.22.3 -n jx-vault +helm install vault-instance jx3/vault-instance --version 1.0.28 -n jx-vault ``` Wait for the vault pods to be in running status, before proceeding to the next steps. diff --git a/content/en/v3/admin/setup/secrets/vault.md b/content/en/v3/admin/setup/secrets/vault.md index db246fe58cc..9f40a8d43a5 100644 --- a/content/en/v3/admin/setup/secrets/vault.md +++ b/content/en/v3/admin/setup/secrets/vault.md @@ -19,7 +19,7 @@ Otherwise please see the [On-Premises Vault Install Guide](/v3/admin/platforms/o whichever apporoach take you should have: - [Kubernetes External Secrets](https://github.com/external-secrets/kubernetes-external-secrets) is installed to populate Secrets from vault -- the [vault operator](https://banzaicloud.com/products/bank-vaults/) is installed for operating vault +- the [vault operator](https://bank-vaults.dev/docs/operator/) is installed for operating vault - a vault instance is created in the `jx-vault` namespace You can wait for the `vault-0` pod in namespace `jx-vault` to be ready via [jx secret vault wait](https://github.com/jenkins-x/jx-secret/blob/master/docs/cmd/jx-secret_vault_wait.md) command: diff --git a/content/en/v3/admin/setup/upgrades/migrations.md b/content/en/v3/admin/setup/upgrades/migrations.md index 9d7b8f8ff1e..192baa5a1b3 100644 --- a/content/en/v3/admin/setup/upgrades/migrations.md +++ b/content/en/v3/admin/setup/upgrades/migrations.md @@ -43,10 +43,9 @@ terraform apply ```shell helm repo add jx3 https://jenkins-x-charts.github.io/repo -helm repo add banzaicloud-stable https://kubernetes-charts.banzaicloud.com helm repo update -helm install vault-operator banzaicloud-stable/vault-operator --version 1.10.0 -n jx-vault -helm install vault-instance jx3/vault-instance --version 1.0.20 -n jx-vault +helm upgrade --install --wait vault-operator oci://ghcr.io/bank-vaults/helm-charts/vault-operator --version 1.22.3 -n jx-vault +helm install vault-instance jx3/vault-instance --version 1.0.28 -n jx-vault ``` 4. If you wish to migrate secrets from your existing (soon to be decommissioned) Vault then now is the time to do that by From 01f194b984a06f65f32051eef2ba45eb5d740551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Svantesson?= Date: Fri, 18 Oct 2024 15:21:04 +0200 Subject: [PATCH 3/3] fix: update OWNERS and OWNERS_ALIASES --- OWNERS | 12 ++---------- OWNERS_ALIASES | 3 +++ 2 files changed, 5 insertions(+), 10 deletions(-) create mode 100644 OWNERS_ALIASES diff --git a/OWNERS b/OWNERS index 00bc98d79de..912e2d5ddd8 100644 --- a/OWNERS +++ b/OWNERS @@ -1,12 +1,4 @@ approvers: -- ankitm123 -- babadofar -- rawlingsj -- tomhobson -- msvticket +- maintainers reviewers: -- ankitm123 -- babadofar -- rawlingsj -- tomhobson -- msvticket +- maintainers \ No newline at end of file diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES new file mode 100644 index 00000000000..74e652b4e96 --- /dev/null +++ b/OWNERS_ALIASES @@ -0,0 +1,3 @@ +foreignAliases: +- name: jx-community + org: jenkins-x