From 713fa4dc6bf08abfc9d54f628bb41f8ff2a6ad5c Mon Sep 17 00:00:00 2001
From: yas <45549-yas@users.noreply.drupalcode.org>
Date: Thu, 6 Apr 2023 04:36:19 -0700
Subject: [PATCH] Issue #3352627 by yas: Cloud 6.x-dev
---
.tugboat/config.yml | 4 +--
README.md | 6 ++--
cloud.doxyfile | 2 +-
cloud.info.yml | 2 +-
cloud.libraries.yml | 14 ++++----
composer.json | 10 +++---
.../cfn/nested/cloud_orchestrator_full.yaml | 8 ++---
.../cloud_orchestrator_full_manual_vpc.yaml | 8 ++---
.../cfn/nested/cloud_orchestrator_single.yaml | 8 ++---
.../nested/cloud_orchestrator_single_ami.yaml | 8 ++---
.../cloud_orchestrator_single_manual_vpc.yaml | 8 ++---
...ud_orchestrator_single_rds_manual_vpc.yaml | 8 ++---
deployments/cfn/nested/ec2/ami/template.yaml | 2 +-
deployments/cfn/nested/includes/docker.yaml | 4 +--
deployments/kubernetes/README.md | 8 ++---
.../kubernetes/amd64/cloud_orchestrator.yml | 6 ++--
.../kubernetes/arm64/cloud_orchestrator.yml | 6 ++--
modules/cloud_budget/README.md | 4 +--
modules/cloud_budget/cloud_budget.info.yml | 2 +-
modules/cloud_cluster_worker/README.md | 4 +--
modules/cloud_dashboard/README.md | 4 +--
.../cloud_dashboard.libraries.yml | 2 +-
.../aws_cloud/README.md | 4 +--
.../aws_cloud/aws_cloud.info.yml | 2 +-
.../aws_cloud/aws_cloud.libraries.yml | 16 +++++-----
.../cloud_cluster/README.md | 4 +--
.../cloud_cluster/cloud_cluster.libraries.yml | 2 +-
.../templates/k8s/cloud_orchestrator.yml | 6 ++--
.../cloud_service_providers/docker/README.md | 4 +--
.../docker/docker.info.yml | 2 +-
modules/cloud_service_providers/k8s/README.md | 4 +--
.../cloud_service_providers/k8s/k8s.info.yml | 2 +-
.../k8s/k8s.libraries.yml | 32 +++++++++----------
.../features/templates/params/k8s_common.yml | 2 +-
.../openstack/README.md | 4 +--
.../openstack/openstack.info.yml | 2 +-
.../openstack/openstack.libraries.yml | 2 +-
.../terraform/README.md | 4 +--
.../terraform/terraform.info.yml | 2 +-
.../terraform/terraform.libraries.yml | 2 +-
.../cloud_service_providers/vmware/README.md | 4 +--
.../vmware/vmware.info.yml | 2 +-
modules/gapps/README.md | 4 +--
modules/gapps/gapps.info.yml | 2 +-
modules/tools/k8s_to_s3/README.md | 4 +--
modules/tools/k8s_to_s3/k8s_to_s3.info.yml | 2 +-
modules/tools/s3_to_k8s/README.md | 4 +--
modules/tools/s3_to_k8s/s3_to_k8s.info.yml | 2 +-
src/Service/CloudServiceInterface.php | 2 +-
49 files changed, 125 insertions(+), 125 deletions(-)
diff --git a/.tugboat/config.yml b/.tugboat/config.yml
index b3e52332de..acbe4305cb 100644
--- a/.tugboat/config.yml
+++ b/.tugboat/config.yml
@@ -1,6 +1,6 @@
services:
php:
- image: q0rban/tugboat-drupal:9.4.2
+ image: q0rban/tugboat-drupal:9.5.7
privileged: true
default: true
http: false
@@ -177,7 +177,7 @@ services:
set -eux
# Delete and re-check out this branch in case this is built from a Base Preview.
- git checkout 5.x && git branch -D "${TUGBOAT_REPO_ID}" && git checkout -b "${TUGBOAT_REPO_ID}" || true
+ git checkout 6.x && git branch -D "${TUGBOAT_REPO_ID}" && git checkout -b "${TUGBOAT_REPO_ID}" || true
export COMPOSER_MEMORY_LIMIT=-1
cd "${DRUPAL_COMPOSER_ROOT}"
composer install --optimize-autoloader
diff --git a/README.md b/README.md
index 6af4e85764..5b220c0df3 100644
--- a/README.md
+++ b/README.md
@@ -10,8 +10,8 @@ Requirements
- PHP `8.0` or higher (`128 MB` memory or higher)
- MySQL `5.7` or higher _OR_ MariaDB `10.3` or higher
- - Drupal `9.4` or higher
- - Cloud `5.x`
+ - Drupal `9.5` or higher
+ - Cloud `6.x`
- This branch includes support for _AWS_, _Kubernetes_, _OpenStack_,
_VMware_ and _Terraform Cloud_
- Future support includes _GCP_ and _MS Azure_
@@ -44,7 +44,7 @@ Installation
docomoinnovations/cloud_orchestrator cloud_orchestrator`
2. Launch Cloud [Cloud Orchestrator](
https://www.drupal.org/project/cloud_orchestrator
- ) `5.x-dev` from [AWS Marketplace](
+ ) `6.x-dev` from [AWS Marketplace](
https://aws.amazon.com/marketplace/pp/B08PN2Z6X6?ref_=srh_res_product_title
)
3. Launch an Amazon EC2 instance of Cloud Orchestrator using
diff --git a/cloud.doxyfile b/cloud.doxyfile
index a7fa2a2215..ce2b519ffe 100644
--- a/cloud.doxyfile
+++ b/cloud.doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = Cloud
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = ver.5.x-dev
+PROJECT_NUMBER = ver.6.x-dev
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/cloud.info.yml b/cloud.info.yml
index ac9b4b2ab3..cd50ee6c5e 100644
--- a/cloud.info.yml
+++ b/cloud.info.yml
@@ -2,7 +2,7 @@ name: 'Cloud'
type: module
description: 'Allows users to manage cloud service providers.'
package: Cloud
-core_version_requirement: ^9.4
+core_version_requirement: ^9.5
configure: cloud.settings
dependencies:
- drupal:field
diff --git a/cloud.libraries.yml b/cloud.libraries.yml
index c56934bb68..03611c6c70 100644
--- a/cloud.libraries.yml
+++ b/cloud.libraries.yml
@@ -1,12 +1,12 @@
cloud:
- version: 5.x-dev
+ version: 6.x-dev
js:
js/cloud.js: {}
dependencies:
- core/jquery
cloud_view_builder:
- version: 5.x-dev
+ version: 6.x-dev
css:
theme:
css/cloud_view_builder.css: {}
@@ -21,7 +21,7 @@ d3:
https://d3js.org/d3.v5.min.js: { type: external, minified: true }
d3-horizon-chart:
- version: 5.x-dev
+ version: 6.x-dev
license:
name: Apache License, Version 2.0
url: https://www.apache.org/licenses/LICENSE-2.0
@@ -82,7 +82,7 @@ chartjs:
https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.8.0/Chart.min.js: { type: external, minified: true }
cloud_config_location:
- version: 5.x-dev
+ version: 6.x-dev
js:
js/cloud_config_location.js: {}
dependencies:
@@ -93,20 +93,20 @@ cloud_config_location:
css/cloud_config_location.css: {}
cloud_geocoder:
- version: 5.x-dev
+ version: 6.x-dev
js:
js/cloud_geocoder.js: {}
dependencies:
- core/jquery
cloud_icon:
- version: 5.x-dev
+ version: 6.x-dev
css:
theme:
css/cloud_icon.css: {}
cloud_ansi_color:
- version: 5.x-dev
+ version: 6.x-dev
css:
theme:
css/cloud_ansi_color.css: {}
diff --git a/composer.json b/composer.json
index f935bc081c..3f26d5dfb8 100644
--- a/composer.json
+++ b/composer.json
@@ -17,14 +17,14 @@
},
"require": {
"aws/aws-sdk-php": "^3",
- "drupal/rigel": "^5",
- "drupal/bootstrap_cloud": "^5",
+ "drupal/rigel": "^6",
+ "drupal/bootstrap_cloud": "^6",
"drupal/geocoder": "^3",
"drupal/entity_export_csv": "1.x-dev@dev",
- "drupal/simple_oauth": "^5.0",
+ "drupal/simple_oauth": "^5.2",
"geocoder-php/nominatim-provider" : "^5",
"google/apiclient": "^2",
- "maclof/kubernetes-client": "^0.26",
+ "maclof/kubernetes-client": "^0.27",
"ext-json": "*"
},
"require-dev": {
@@ -47,7 +47,7 @@
"extra": {
"drush": {
"services": {
- "drush.services.yml": "^10"
+ "drush.services.yml": "^11"
}
}
},
diff --git a/deployments/cfn/nested/cloud_orchestrator_full.yaml b/deployments/cfn/nested/cloud_orchestrator_full.yaml
index ef1b30cae5..5a71adbd67 100644
--- a/deployments/cfn/nested/cloud_orchestrator_full.yaml
+++ b/deployments/cfn/nested/cloud_orchestrator_full.yaml
@@ -707,12 +707,12 @@ Parameters:
- UTC
CloudOrchestratorVersion:
Description: Version of the Cloud Orchestrator to install.
- Default: 5.x-dev
+ Default: 6.x-dev
Type: String
AllowedValues:
- - 4.6.0
- - 5.0.0-rc2
- - 5.x-dev
+ - 4.7.0
+ - 5.0.1
+ - 6.x-dev
CacheNodeType:
Description: >-
Cache node instance class, e.g. cache.t2.micro(free tier).
diff --git a/deployments/cfn/nested/cloud_orchestrator_full_manual_vpc.yaml b/deployments/cfn/nested/cloud_orchestrator_full_manual_vpc.yaml
index 1da11f5f6e..232afe1284 100644
--- a/deployments/cfn/nested/cloud_orchestrator_full_manual_vpc.yaml
+++ b/deployments/cfn/nested/cloud_orchestrator_full_manual_vpc.yaml
@@ -738,12 +738,12 @@ Parameters:
- UTC
CloudOrchestratorVersion:
Description: Version of the Cloud Orchestrator to install.
- Default: 5.x-dev
+ Default: 6.x-dev
Type: String
AllowedValues:
- - 4.6.0
- - 5.0.0-rc2
- - 5.x-dev
+ - 4.7.0
+ - 5.0.1
+ - 6.x-dev
CacheNodeType:
Description: >-
Cache node instance class, e.g. cache.t2.micro(free tier).
diff --git a/deployments/cfn/nested/cloud_orchestrator_single.yaml b/deployments/cfn/nested/cloud_orchestrator_single.yaml
index b30e679a4f..64524d54de 100644
--- a/deployments/cfn/nested/cloud_orchestrator_single.yaml
+++ b/deployments/cfn/nested/cloud_orchestrator_single.yaml
@@ -624,12 +624,12 @@ Parameters:
- UTC
CloudOrchestratorVersion:
Description: Version of the Cloud Orchestrator to install.
- Default: 5.x-dev
+ Default: 6.x-dev
Type: String
AllowedValues:
- - 4.6.0
- - 5.0.0-rc2
- - 5.x-dev
+ - 4.7.0
+ - 5.0.1
+ - 6.x-dev
Resources:
IamRole:
Type: AWS::CloudFormation::Stack
diff --git a/deployments/cfn/nested/cloud_orchestrator_single_ami.yaml b/deployments/cfn/nested/cloud_orchestrator_single_ami.yaml
index 06aa071c74..d3cbbeb354 100644
--- a/deployments/cfn/nested/cloud_orchestrator_single_ami.yaml
+++ b/deployments/cfn/nested/cloud_orchestrator_single_ami.yaml
@@ -142,12 +142,12 @@ Parameters:
and contain alphanumeric characters and underscores.
CloudOrchestratorVersion:
Description: Version of the Cloud Orchestrator to install.
- Default: 5.x-dev
+ Default: 6.x-dev
Type: String
AllowedValues:
- - 4.6.0
- - 5.0.0-rc2
- - 5.x-dev
+ - 4.7.0
+ - 5.0.1
+ - 6.x-dev
Resources:
IamRole:
Type: AWS::CloudFormation::Stack
diff --git a/deployments/cfn/nested/cloud_orchestrator_single_manual_vpc.yaml b/deployments/cfn/nested/cloud_orchestrator_single_manual_vpc.yaml
index ac1c59d3a9..1fbff96b40 100644
--- a/deployments/cfn/nested/cloud_orchestrator_single_manual_vpc.yaml
+++ b/deployments/cfn/nested/cloud_orchestrator_single_manual_vpc.yaml
@@ -639,12 +639,12 @@ Parameters:
- UTC
CloudOrchestratorVersion:
Description: Version of the Cloud Orchestrator to install.
- Default: 5.x-dev
+ Default: 6.x-dev
Type: String
AllowedValues:
- - 4.6.0
- - 5.0.0-rc2
- - 5.x-dev
+ - 4.7.0
+ - 5.0.1
+ - 6.x-dev
Resources:
IamRole:
Type: AWS::CloudFormation::Stack
diff --git a/deployments/cfn/nested/cloud_orchestrator_single_rds_manual_vpc.yaml b/deployments/cfn/nested/cloud_orchestrator_single_rds_manual_vpc.yaml
index 87a5df6f38..2168ff7423 100644
--- a/deployments/cfn/nested/cloud_orchestrator_single_rds_manual_vpc.yaml
+++ b/deployments/cfn/nested/cloud_orchestrator_single_rds_manual_vpc.yaml
@@ -721,12 +721,12 @@ Parameters:
- UTC
CloudOrchestratorVersion:
Description: Version of the Cloud Orchestrator to install.
- Default: 5.x-dev
+ Default: 6.x-dev
Type: String
AllowedValues:
- - 4.6.0
- - 5.0.0-rc2
- - 5.x-dev
+ - 4.7.0
+ - 5.0.1
+ - 6.x-dev
Resources:
IamRole:
Type: AWS::CloudFormation::Stack
diff --git a/deployments/cfn/nested/ec2/ami/template.yaml b/deployments/cfn/nested/ec2/ami/template.yaml
index ec99727d6b..ca923b48b1 100644
--- a/deployments/cfn/nested/ec2/ami/template.yaml
+++ b/deployments/cfn/nested/ec2/ami/template.yaml
@@ -146,7 +146,7 @@ Resources:
IMAGE_TAG='docomoinnovations/cloud_orchestrator'
CONTAINER_NAME='cloud-orchestrator'
- DOCKER_FILE_URL='https://git.drupalcode.org/project/cloud/-/raw/5.x/deployments/docker/Dockerfile'
+ DOCKER_FILE_URL='https://git.drupalcode.org/project/cloud/-/raw/6.x/deployments/docker/Dockerfile'
sudo docker build -t "${IMAGE_TAG}" "${DOCKER_FILE_URL}"
# Setup Systemctl to run a script to generate a random mysql
diff --git a/deployments/cfn/nested/includes/docker.yaml b/deployments/cfn/nested/includes/docker.yaml
index fc335f59a4..a6df64ed9a 100644
--- a/deployments/cfn/nested/includes/docker.yaml
+++ b/deployments/cfn/nested/includes/docker.yaml
@@ -101,7 +101,7 @@ Fn::Base64:
# Run the cloud orchestrator docker installer
IMAGE_TAG=docomoinnovations/cloud_orchestrator
CONTAINER_NAME=cloud-orchestrator
- DOCKER_FILE_URL=https://git.drupalcode.org/project/cloud/-/raw/5.x/deployments/docker/Dockerfile
+ DOCKER_FILE_URL=https://git.drupalcode.org/project/cloud/-/raw/6.x/deployments/docker/Dockerfile
sudo docker build -t $IMAGE_TAG $DOCKER_FILE_URL
sudo docker run --name $CONTAINER_NAME $LINK_DB $LINK_MEMCACHE \
@@ -110,7 +110,7 @@ Fn::Base64:
# Set up a drush command.
sudo docker exec -w $DOCKER_DIR $CONTAINER_NAME sh -c "ln -s '$DOCKER_DIR/vendor/bin/drush' /usr/local/bin/"
- # If 5.x-dev branch, enable OpenStack, VMware, and Terraform.
+ # If 6.x-dev branch, enable OpenStack, VMware, and Terraform.
# AWS and K8s are enabled by default.
VERSION_REGEX="^(3.*)"
if [[ "${CloudOrchestratorVersion}" =~ $VERSION_REGEX ]]; then
diff --git a/deployments/kubernetes/README.md b/deployments/kubernetes/README.md
index 663a782182..3ca6da1c55 100644
--- a/deployments/kubernetes/README.md
+++ b/deployments/kubernetes/README.md
@@ -9,14 +9,14 @@ command. Note that
will be set.
```
-$ kubectl apply -f https://git.drupalcode.org/project/cloud/-/raw/5.x/deployments/kubernetes/amd64/cloud_orchestrator.yml
+$ kubectl apply -f https://git.drupalcode.org/project/cloud/-/raw/6.x/deployments/kubernetes/amd64/cloud_orchestrator.yml
```
If your K8s cluster consists ARM64-based nodes, use
[`arm64/cloud_orchestrator.yml`](arm64/cloud_orchestrator.yml) instead.
```
-$ kubectl apply -f https://git.drupalcode.org/project/cloud/-/raw/5.x/deployments/kubernetes/arm64/cloud_orchestrator.yml
+$ kubectl apply -f https://git.drupalcode.org/project/cloud/-/raw/6.x/deployments/kubernetes/arm64/cloud_orchestrator.yml
```
#### Alternative procedure
@@ -27,7 +27,7 @@ access your Cloud Orchestrator, follow these commands instead.
Download the Cloud Orchestrator manifest file.
```
-$ curl -LO https://git.drupalcode.org/project/cloud/-/raw/5.x/deployments/kubernetes/amd64/cloud_orchestrator.yml
+$ curl -LO https://git.drupalcode.org/project/cloud/-/raw/6.x/deployments/kubernetes/amd64/cloud_orchestrator.yml
```
Update the following lines.
@@ -65,7 +65,7 @@ You can access your Cloud Orchestrator by opening `EXTERNAL-IP` with the prefix
### Remove Cloud Orchestrator from your K8s cluster
```
-$ kubectl delete -f https://git.drupalcode.org/project/cloud/-/raw/5.x/deployments/kubernetes/amd64/cloud_orchestrator.yml
+$ kubectl delete -f https://git.drupalcode.org/project/cloud/-/raw/6.x/deployments/kubernetes/amd64/cloud_orchestrator.yml
```
`*/cloud_orchestrator.yml` installs Cloud Orchestrator and stores MariaDB
diff --git a/deployments/kubernetes/amd64/cloud_orchestrator.yml b/deployments/kubernetes/amd64/cloud_orchestrator.yml
index 6734b8810f..0541612387 100644
--- a/deployments/kubernetes/amd64/cloud_orchestrator.yml
+++ b/deployments/kubernetes/amd64/cloud_orchestrator.yml
@@ -114,20 +114,20 @@ spec:
spec:
containers:
- name: cloud-orchestrator
- image: docomoinnovations/cloud_orchestrator:5.x-dev
+ image: docomoinnovations/cloud_orchestrator:6.x-dev
imagePullPolicy: Always
command: ["bash", "-c"]
args:
- |
export SCRIPT='/entrypoint.sh';
if ! [ -f "${SCRIPT}" ]; then
- curl -L 'https://git.drupalcode.org/project/cloud/-/raw/5.x/deployments/kubernetes/entrypoint.sh' -o "${SCRIPT}"
+ curl -L 'https://git.drupalcode.org/project/cloud/-/raw/6.x/deployments/kubernetes/entrypoint.sh' -o "${SCRIPT}"
chmod +x "${SCRIPT}"
fi;
"${SCRIPT}"
env:
- name: CLOUD_ORCHESTRATOR_VERSION
- value: 5.x-dev
+ value: 6.x-dev
- name: DRUPAL_USER
valueFrom:
secretKeyRef:
diff --git a/deployments/kubernetes/arm64/cloud_orchestrator.yml b/deployments/kubernetes/arm64/cloud_orchestrator.yml
index 1aacd24232..ff5700edbc 100644
--- a/deployments/kubernetes/arm64/cloud_orchestrator.yml
+++ b/deployments/kubernetes/arm64/cloud_orchestrator.yml
@@ -114,20 +114,20 @@ spec:
spec:
containers:
- name: cloud-orchestrator
- image: docomoinnovations/cloud_orchestrator:5.x-dev-arm64
+ image: docomoinnovations/cloud_orchestrator:6.x-dev-arm64
imagePullPolicy: Always
command: ["bash", "-c"]
args:
- |
export SCRIPT='/entrypoint.sh';
if ! [ -f "${SCRIPT}" ]; then
- curl -L 'https://git.drupalcode.org/project/cloud/-/raw/5.x/deployments/kubernetes/entrypoint.sh' -o "${SCRIPT}"
+ curl -L 'https://git.drupalcode.org/project/cloud/-/raw/6.x/deployments/kubernetes/entrypoint.sh' -o "${SCRIPT}"
chmod +x "${SCRIPT}"
fi;
"${SCRIPT}"
env:
- name: CLOUD_ORCHESTRATOR_VERSION
- value: 5.x-dev
+ value: 6.x-dev
- name: DRUPAL_USER
valueFrom:
secretKeyRef:
diff --git a/modules/cloud_budget/README.md b/modules/cloud_budget/README.md
index 08123ba33c..67fe0ad62a 100644
--- a/modules/cloud_budget/README.md
+++ b/modules/cloud_budget/README.md
@@ -10,8 +10,8 @@ INTRODUCTION
REQUIREMENTS
============
-- Drupal `9.4.x` or higher (The latest version of Drupal `9.x`)
-- Cloud `5.x` or higher
+- Drupal `9.5.x` or higher (The latest version of Drupal `9.x`)
+- Cloud `6.x` or higher
INSTALLATION
============
diff --git a/modules/cloud_budget/cloud_budget.info.yml b/modules/cloud_budget/cloud_budget.info.yml
index c3a444a838..aa73e68e7f 100644
--- a/modules/cloud_budget/cloud_budget.info.yml
+++ b/modules/cloud_budget/cloud_budget.info.yml
@@ -2,7 +2,7 @@ name: 'Cloud Budget'
type: module
description: 'Allows users to manage Cloud Budget.'
package: Cloud
-core_version_requirement: ^8.8 || ^9
+core_version_requirement: ^9.5
configure: cloud_budget.settings
dependencies:
- cloud:cloud
diff --git a/modules/cloud_cluster_worker/README.md b/modules/cloud_cluster_worker/README.md
index 4474bc7b7e..19f23fa902 100644
--- a/modules/cloud_cluster_worker/README.md
+++ b/modules/cloud_cluster_worker/README.md
@@ -10,8 +10,8 @@ INTRODUCTION
REQUIREMENTS
============
-- Drupal `9.4.x` or higher (The latest version of Drupal `9.x`)
-- Cloud `5.x` or higher
+- Drupal `9.5.x` or higher (The latest version of Drupal `9.x`)
+- Cloud `6.x` or higher
INSTALLATION
============
diff --git a/modules/cloud_dashboard/README.md b/modules/cloud_dashboard/README.md
index 893d7afba1..6ff885e986 100644
--- a/modules/cloud_dashboard/README.md
+++ b/modules/cloud_dashboard/README.md
@@ -6,8 +6,8 @@ Introduction
Requirements
============
-- Drupal `9.4.x` or higher (The latest version of Drupal `9.x`)
-- Cloud `5.x` or higher
+- Drupal `9.5.x` or higher (The latest version of Drupal `9.x`)
+- Cloud `6.x` or higher
- [Simple OAuth](
https://www.drupal.org/project/simple_oauth
) `5.0`.x module (Not `5.2.x` or higher)
diff --git a/modules/cloud_dashboard/cloud_dashboard.libraries.yml b/modules/cloud_dashboard/cloud_dashboard.libraries.yml
index c5860263c7..f5392b317e 100644
--- a/modules/cloud_dashboard/cloud_dashboard.libraries.yml
+++ b/modules/cloud_dashboard/cloud_dashboard.libraries.yml
@@ -1,5 +1,5 @@
react_app:
- version: 5.x-dev
+ version: 6.x-dev
js:
js/index.js: { minified: true }
css:
diff --git a/modules/cloud_service_providers/aws_cloud/README.md b/modules/cloud_service_providers/aws_cloud/README.md
index a463295f8a..9d0925b73e 100644
--- a/modules/cloud_service_providers/aws_cloud/README.md
+++ b/modules/cloud_service_providers/aws_cloud/README.md
@@ -10,8 +10,8 @@ INTRODUCTION
REQUIREMENTS
============
-- Drupal `9.4.x` or higher (The latest version of Drupal `9.x`)
-- Cloud `5.x` or higher
+- Drupal `9.5.x` or higher (The latest version of Drupal `9.x`)
+- Cloud `6.x` or higher
INSTALLATION
============
diff --git a/modules/cloud_service_providers/aws_cloud/aws_cloud.info.yml b/modules/cloud_service_providers/aws_cloud/aws_cloud.info.yml
index 42a1fedf67..fa7957de30 100644
--- a/modules/cloud_service_providers/aws_cloud/aws_cloud.info.yml
+++ b/modules/cloud_service_providers/aws_cloud/aws_cloud.info.yml
@@ -2,7 +2,7 @@ name: 'AWS Cloud'
type: module
description: 'Allows users to manage Amazon Web Services (AWS).'
package: Cloud service providers
-core_version_requirement: ^8.8 || ^9
+core_version_requirement: ^9.5
configure: aws_cloud.settings
dependencies:
- cloud:cloud
diff --git a/modules/cloud_service_providers/aws_cloud/aws_cloud.libraries.yml b/modules/cloud_service_providers/aws_cloud/aws_cloud.libraries.yml
index d8aa1e6619..5c955bbded 100644
--- a/modules/cloud_service_providers/aws_cloud/aws_cloud.libraries.yml
+++ b/modules/cloud_service_providers/aws_cloud/aws_cloud.libraries.yml
@@ -1,5 +1,5 @@
aws_cloud_form:
- version: 5.x-dev
+ version: 6.x-dev
js:
js/aws_cloud_form.js: {}
css:
@@ -10,7 +10,7 @@ aws_cloud_form:
- cloud/select2
aws_cloud_security_groups:
- version: 5.x-dev
+ version: 6.x-dev
js:
js/aws_cloud_security_groups.js: {}
css:
@@ -20,20 +20,20 @@ aws_cloud_security_groups:
- core/jquery
aws_cloud_auto_refresh:
- version: 5.x-dev
+ version: 6.x-dev
js:
js/aws_cloud_auto_refresh.js: {}
dependencies:
- core/jquery
aws_cloud_view_builder:
- version: 5.x-dev
+ version: 6.x-dev
css:
theme:
css/aws_cloud_view_builder.css: {}
aws_cloud_instance_type_prices:
- version: 5.x-dev
+ version: 6.x-dev
js:
js/aws_cloud_instance_type_prices.js: {}
css:
@@ -41,7 +41,7 @@ aws_cloud_instance_type_prices:
css/aws_cloud_instance_type_prices.css: {}
aws_cloud_image_import:
- version: 5.x-dev
+ version: 6.x-dev
js:
js/aws_cloud_image_import.js: {}
css:
@@ -52,7 +52,7 @@ aws_cloud_image_import:
- cloud/select2
aws_cloud_instance_monitor:
- version: 5.x-dev
+ version: 6.x-dev
js:
js/aws_cloud_instance_monitor.js: {}
dependencies:
@@ -61,7 +61,7 @@ aws_cloud_instance_monitor:
aws_cloud_instance_monitor_horizon_chart:
- version: 5.x-dev
+ version: 6.x-dev
js:
js/aws_cloud_instance_monitor_horizon_chart.js: {}
dependencies:
diff --git a/modules/cloud_service_providers/cloud_cluster/README.md b/modules/cloud_service_providers/cloud_cluster/README.md
index d86c0d6193..6e2ce382ae 100644
--- a/modules/cloud_service_providers/cloud_cluster/README.md
+++ b/modules/cloud_service_providers/cloud_cluster/README.md
@@ -10,8 +10,8 @@ INTRODUCTION
REQUIREMENTS
============
-- Drupal `9.4.x` or higher (The latest version of Drupal `9.x`)
-- Cloud `5.x` or higher
+- Drupal `9.5.x` or higher (The latest version of Drupal `9.x`)
+- Cloud `6.x` or higher
INSTALLATION
============
diff --git a/modules/cloud_service_providers/cloud_cluster/cloud_cluster.libraries.yml b/modules/cloud_service_providers/cloud_cluster/cloud_cluster.libraries.yml
index a6d7be5ecc..45ea810e8d 100644
--- a/modules/cloud_service_providers/cloud_cluster/cloud_cluster.libraries.yml
+++ b/modules/cloud_service_providers/cloud_cluster/cloud_cluster.libraries.yml
@@ -1,5 +1,5 @@
cloud_cluster_launch_template_form:
- version: 5.x-dev
+ version: 6.x-dev
js:
js/launch_template_form.js: {}
css:
diff --git a/modules/cloud_service_providers/cloud_cluster/templates/k8s/cloud_orchestrator.yml b/modules/cloud_service_providers/cloud_cluster/templates/k8s/cloud_orchestrator.yml
index df4ef85d62..da5a46d480 100644
--- a/modules/cloud_service_providers/cloud_cluster/templates/k8s/cloud_orchestrator.yml
+++ b/modules/cloud_service_providers/cloud_cluster/templates/k8s/cloud_orchestrator.yml
@@ -86,20 +86,20 @@ spec:
spec:
containers:
- name: cloud-orchestrator
- image: docomoinnovations/cloud_orchestrator:5.x-dev{{ cpu_architecture == 'arm64' ? '-arm64' : '' }}
+ image: docomoinnovations/cloud_orchestrator:6.x-dev{{ cpu_architecture == 'arm64' ? '-arm64' : '' }}
imagePullPolicy: Always
command: ["bash", "-c"]
args:
- |
export SCRIPT='/entrypoint.sh';
if ! [ -f "${SCRIPT}" ]; then
- curl -L 'https://git.drupalcode.org/project/cloud/-/raw/5.x/deployments/kubernetes/entrypoint.sh' -o "${SCRIPT}"
+ curl -L 'https://git.drupalcode.org/project/cloud/-/raw/6.x/deployments/kubernetes/entrypoint.sh' -o "${SCRIPT}"
chmod +x "${SCRIPT}"
fi;
"${SCRIPT}"
env:
- name: CLOUD_ORCHESTRATOR_VERSION
- value: 5.x-dev
+ value: 6.x-dev
- name: DRUPAL_USER
valueFrom:
secretKeyRef:
diff --git a/modules/cloud_service_providers/docker/README.md b/modules/cloud_service_providers/docker/README.md
index 257726e4db..82007559c4 100644
--- a/modules/cloud_service_providers/docker/README.md
+++ b/modules/cloud_service_providers/docker/README.md
@@ -11,8 +11,8 @@ INTRODUCTION
REQUIREMENTS
============
-- Drupal `9.4.x` or higher (The latest version of Drupal `9.x`)
-- Cloud `5.x` or higher
+- Drupal `9.5.x` or higher (The latest version of Drupal `9.x`)
+- Cloud `6.x` or higher
INSTALLATION
============
diff --git a/modules/cloud_service_providers/docker/docker.info.yml b/modules/cloud_service_providers/docker/docker.info.yml
index 25a249bb52..e3224cb665 100644
--- a/modules/cloud_service_providers/docker/docker.info.yml
+++ b/modules/cloud_service_providers/docker/docker.info.yml
@@ -2,7 +2,7 @@ name: 'Docker'
type: module
description: 'Allows users to manage Docker configuration.'
package: Cloud service providers
-core_version_requirement: ^8.8 || ^9
+core_version_requirement: ^9.5
configure: docker.settings
dependencies:
- cloud:cloud
diff --git a/modules/cloud_service_providers/k8s/README.md b/modules/cloud_service_providers/k8s/README.md
index a949cd1a60..b37e44f43d 100644
--- a/modules/cloud_service_providers/k8s/README.md
+++ b/modules/cloud_service_providers/k8s/README.md
@@ -10,8 +10,8 @@ INTRODUCTION
REQUIREMENTS
============
-- Drupal `9.4.x` or higher (The latest version of Drupal `9.x`)
-- Cloud `5.x` or higher
+- Drupal `9.5.x` or higher (The latest version of Drupal `9.x`)
+- Cloud `6.x` or higher
INSTALLATION
============
diff --git a/modules/cloud_service_providers/k8s/k8s.info.yml b/modules/cloud_service_providers/k8s/k8s.info.yml
index 0368b66819..16a6e3d900 100644
--- a/modules/cloud_service_providers/k8s/k8s.info.yml
+++ b/modules/cloud_service_providers/k8s/k8s.info.yml
@@ -2,7 +2,7 @@ name: 'K8s'
type: module
description: 'Allows users to manage Kubernetes (K8s).'
package: Cloud service providers
-core_version_requirement: ^8.8 || ^9
+core_version_requirement: ^9.5
configure: k8s.settings
dependencies:
- cloud:cloud
diff --git a/modules/cloud_service_providers/k8s/k8s.libraries.yml b/modules/cloud_service_providers/k8s/k8s.libraries.yml
index 4e6ffe289b..7bc5c52aec 100644
--- a/modules/cloud_service_providers/k8s/k8s.libraries.yml
+++ b/modules/cloud_service_providers/k8s/k8s.libraries.yml
@@ -8,7 +8,7 @@ moment:
https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.24.0/moment.min.js: { type: external, minified: true }
k8s_entity_metrics:
- version: 5.x-dev
+ version: 6.x-dev
js:
js/k8s_entity_metrics.js: {}
dependencies:
@@ -18,7 +18,7 @@ k8s_entity_metrics:
# K8s node heatmap
k8s_node_heatmap:
- version: 5.x-dev
+ version: 6.x-dev
js:
js/k8s_node_heatmap.js: {}
dependencies:
@@ -26,7 +26,7 @@ k8s_node_heatmap:
- cloud/d3
k8s_node_allocated_resources:
- version: 5.x-dev
+ version: 6.x-dev
js:
js/k8s_node_allocated_resources.js: {}
dependencies:
@@ -34,7 +34,7 @@ k8s_node_allocated_resources:
- cloud/d3
k8s_namespace_costs_chart:
- version: 5.x-dev
+ version: 6.x-dev
js:
js/k8s_namespace_costs_chart.js: {}
dependencies:
@@ -44,7 +44,7 @@ k8s_namespace_costs_chart:
- cloud/chartjs
k8s_namespace_costs_horizon_chart:
- version: 5.x-dev
+ version: 6.x-dev
js:
js/k8s_namespace_costs_horizon_chart.js: {}
dependencies:
@@ -52,14 +52,14 @@ k8s_namespace_costs_horizon_chart:
- cloud/d3-horizon-chart
k8s_cost_block:
- version: 5.x-dev
+ version: 6.x-dev
js:
js/k8s_cost_block.js: {}
dependencies:
- core/jquery
k8s_project_costs_chart:
- version: 5.x-dev
+ version: 6.x-dev
js:
js/k8s_project_costs_chart.js: {}
dependencies:
@@ -69,7 +69,7 @@ k8s_project_costs_chart:
- cloud/chartjs
k8s_project_costs_horizon_chart:
- version: 5.x-dev
+ version: 6.x-dev
js:
js/k8s_project_costs_horizon_chart.js: {}
dependencies:
@@ -77,19 +77,19 @@ k8s_project_costs_horizon_chart:
- cloud/d3-horizon-chart
k8s_all_resources:
- version: 5.x-dev
+ version: 6.x-dev
js:
js/k8s_all_resources.js: {}
dependencies:
- core/jquery
k8s_refresh_resource_trigger:
- version: 5.x-dev
+ version: 6.x-dev
js:
js/k8s_refresh_resource_trigger.js: {}
k8s_node_allocated_resources_chart:
- version: 5.x-dev
+ version: 6.x-dev
js:
js/k8s_node_allocated_resources_chart.js: {}
dependencies:
@@ -99,7 +99,7 @@ k8s_node_allocated_resources_chart:
- cloud/chartjs
k8s_node_allocated_resources_horizon_chart:
- version: 5.x-dev
+ version: 6.x-dev
js:
js/k8s_node_allocated_resources_horizon_chart.js: {}
dependencies:
@@ -107,28 +107,28 @@ k8s_node_allocated_resources_horizon_chart:
- cloud/d3
k8s_launch_template_vertical_tab:
- version: 5.x-dev
+ version: 6.x-dev
js:
js/k8s_launch_template_vertical_tab.js: {}
dependencies:
- core/jquery
k8s_launch_template_source_type:
- version: 5.x-dev
+ version: 6.x-dev
js:
js/k8s_launch_template_source_type.js: {}
dependencies:
- core/jquery
k8s_launch_template_form:
- version: 5.x-dev
+ version: 6.x-dev
js:
js/k8s_launch_template_form.js: {}
dependencies:
- core/jquery
k8s_launch_template_radios:
- version: 5.x-dev
+ version: 6.x-dev
css:
theme:
css/k8s_launch_template_radios.css: {}
diff --git a/modules/cloud_service_providers/k8s/tests/src/Behat/features/templates/params/k8s_common.yml b/modules/cloud_service_providers/k8s/tests/src/Behat/features/templates/params/k8s_common.yml
index 7b6fb79dad..9ba6425d51 100644
--- a/modules/cloud_service_providers/k8s/tests/src/Behat/features/templates/params/k8s_common.yml
+++ b/modules/cloud_service_providers/k8s/tests/src/Behat/features/templates/params/k8s_common.yml
@@ -90,7 +90,7 @@ cloud_service_provider_name:
launch_git_branch_or_tag:
main
launch_git_branch_or_tag_edit:
- 5.x
+ 6.x
launch_git_credentials_user:
# Using public, so no value is needed.
launch_git_credentials_user_edit:
diff --git a/modules/cloud_service_providers/openstack/README.md b/modules/cloud_service_providers/openstack/README.md
index 3eff368a5e..f5e554f3b9 100644
--- a/modules/cloud_service_providers/openstack/README.md
+++ b/modules/cloud_service_providers/openstack/README.md
@@ -10,8 +10,8 @@ INTRODUCTION
REQUIREMENTS
============
-- Drupal `9.4.x` or higher (The latest version of Drupal `9.x`)
-- Cloud `5.x` or higher
+- Drupal `9.5.x` or higher (The latest version of Drupal `9.x`)
+- Cloud `6.x` or higher
INSTALLATION
============
diff --git a/modules/cloud_service_providers/openstack/openstack.info.yml b/modules/cloud_service_providers/openstack/openstack.info.yml
index f36d6d081e..3aedfa8dcf 100644
--- a/modules/cloud_service_providers/openstack/openstack.info.yml
+++ b/modules/cloud_service_providers/openstack/openstack.info.yml
@@ -2,7 +2,7 @@ name: 'OpenStack'
type: module
description: 'Allows users to manage OpenStack.'
package: Cloud service providers
-core_version_requirement: ^8.8 || ^9
+core_version_requirement: ^9.5
configure: openstack.settings
dependencies:
- cloud:aws_cloud
diff --git a/modules/cloud_service_providers/openstack/openstack.libraries.yml b/modules/cloud_service_providers/openstack/openstack.libraries.yml
index 1470ba2ac8..d2a840b00e 100644
--- a/modules/cloud_service_providers/openstack/openstack.libraries.yml
+++ b/modules/cloud_service_providers/openstack/openstack.libraries.yml
@@ -1,5 +1,5 @@
openstack_form:
- version: 5.x-dev
+ version: 6.x-dev
js:
js/openstack_form.js: {}
dependencies:
diff --git a/modules/cloud_service_providers/terraform/README.md b/modules/cloud_service_providers/terraform/README.md
index 7f25cd3dc7..ef9f2f6f52 100644
--- a/modules/cloud_service_providers/terraform/README.md
+++ b/modules/cloud_service_providers/terraform/README.md
@@ -10,8 +10,8 @@ INTRODUCTION
REQUIREMENTS
============
-- Drupal `9.4.x` or higher (The latest version of Drupal `9.x`)
-- Cloud `5.x` or higher
+- Drupal `9.5.x` or higher (The latest version of Drupal `9.x`)
+- Cloud `6.x` or higher
INSTALLATION
============
diff --git a/modules/cloud_service_providers/terraform/terraform.info.yml b/modules/cloud_service_providers/terraform/terraform.info.yml
index 371745d984..371f7ac66f 100644
--- a/modules/cloud_service_providers/terraform/terraform.info.yml
+++ b/modules/cloud_service_providers/terraform/terraform.info.yml
@@ -2,7 +2,7 @@ name: 'Terraform Cloud'
type: module
description: 'Allows users to manage and run Terraform Cloud.'
package: Cloud service providers
-core_version_requirement: ^8.8 || ^9
+core_version_requirement: ^9.5
configure: terraform.settings
dependencies:
- cloud:cloud
diff --git a/modules/cloud_service_providers/terraform/terraform.libraries.yml b/modules/cloud_service_providers/terraform/terraform.libraries.yml
index 46f787fdc5..1c36fed8ca 100644
--- a/modules/cloud_service_providers/terraform/terraform.libraries.yml
+++ b/modules/cloud_service_providers/terraform/terraform.libraries.yml
@@ -1,5 +1,5 @@
terraform_run:
- version: 5.x-dev
+ version: 6.x-dev
js:
js/terraform_run.js: {}
dependencies:
diff --git a/modules/cloud_service_providers/vmware/README.md b/modules/cloud_service_providers/vmware/README.md
index 59a68694e4..8293cd7d4b 100644
--- a/modules/cloud_service_providers/vmware/README.md
+++ b/modules/cloud_service_providers/vmware/README.md
@@ -10,8 +10,8 @@ INTRODUCTION
REQUIREMENTS
============
-- Drupal `9.4.x` or higher (The latest version of Drupal `9.x`)
-- Cloud `5.x` or higher
+- Drupal `9.5.x` or higher (The latest version of Drupal `9.x`)
+- Cloud `6.x` or higher
INSTALLATION
============
diff --git a/modules/cloud_service_providers/vmware/vmware.info.yml b/modules/cloud_service_providers/vmware/vmware.info.yml
index 81bab8c0d4..44e828e65d 100644
--- a/modules/cloud_service_providers/vmware/vmware.info.yml
+++ b/modules/cloud_service_providers/vmware/vmware.info.yml
@@ -2,7 +2,7 @@ name: 'VMware'
type: module
description: 'Allows users to manage and run VMware.'
package: Cloud service providers
-core_version_requirement: ^8.8 || ^9
+core_version_requirement: ^9.5
configure: vmware.settings
dependencies:
- cloud:cloud
diff --git a/modules/gapps/README.md b/modules/gapps/README.md
index c78dbe9f51..ee99fe709b 100644
--- a/modules/gapps/README.md
+++ b/modules/gapps/README.md
@@ -9,8 +9,8 @@ INTRODUCTION
REQUIREMENTS
============
-- Drupal `9.4.x` or higher (The latest version of Drupal `9.x`)
-- Cloud `5.x` or higher
+- Drupal `9.5.x` or higher (The latest version of Drupal `9.x`)
+- Cloud `6.x` or higher
INSTALLATION
============
diff --git a/modules/gapps/gapps.info.yml b/modules/gapps/gapps.info.yml
index 333f3af09a..73f8cb17e2 100644
--- a/modules/gapps/gapps.info.yml
+++ b/modules/gapps/gapps.info.yml
@@ -2,7 +2,7 @@ name: 'Google Applications'
type: module
description: 'Allows users to manage Google application services.'
package: Cloud
-core_version_requirement: ^8.8 || ^9
+core_version_requirement: ^9.5
configure: gapps.settings
dependencies:
- cloud:cloud
diff --git a/modules/tools/k8s_to_s3/README.md b/modules/tools/k8s_to_s3/README.md
index 5fdc04cad9..f1b6237943 100644
--- a/modules/tools/k8s_to_s3/README.md
+++ b/modules/tools/k8s_to_s3/README.md
@@ -11,8 +11,8 @@ INTRODUCTION
REQUIREMENTS
============
-- Drupal `9.4.x` or higher (The latest version of Drupal `9.x`)
-- Cloud `5.x` or higher
+- Drupal `9.5.x` or higher (The latest version of Drupal `9.x`)
+- Cloud `6.x` or higher
INSTALLATION
============
diff --git a/modules/tools/k8s_to_s3/k8s_to_s3.info.yml b/modules/tools/k8s_to_s3/k8s_to_s3.info.yml
index 9d165a9636..17c04a9f08 100644
--- a/modules/tools/k8s_to_s3/k8s_to_s3.info.yml
+++ b/modules/tools/k8s_to_s3/k8s_to_s3.info.yml
@@ -2,7 +2,7 @@ name: 'K8s to S3'
type: module
description: 'Transfer definitions of K8s resources to Amazon S3 bucket.'
package: Cloud
-core_version_requirement: ^8.8 || ^9
+core_version_requirement: ^9.5
configure: k8s_to_s3.settings
dependencies:
- cloud:aws_cloud
diff --git a/modules/tools/s3_to_k8s/README.md b/modules/tools/s3_to_k8s/README.md
index 03c6a1a30a..cdbf5e554c 100644
--- a/modules/tools/s3_to_k8s/README.md
+++ b/modules/tools/s3_to_k8s/README.md
@@ -11,8 +11,8 @@ INTRODUCTION
REQUIREMENTS
============
-- Drupal `9.4.x` or higher (The latest version of Drupal `9.x`)
-- Cloud `5.x` or higher
+- Drupal `9.5.x` or higher (The latest version of Drupal `9.x`)
+- Cloud `6.x` or higher
INSTALLATION
============
diff --git a/modules/tools/s3_to_k8s/s3_to_k8s.info.yml b/modules/tools/s3_to_k8s/s3_to_k8s.info.yml
index cb5251d3a5..8368e6069a 100644
--- a/modules/tools/s3_to_k8s/s3_to_k8s.info.yml
+++ b/modules/tools/s3_to_k8s/s3_to_k8s.info.yml
@@ -2,7 +2,7 @@ name: 'S3 to K8s'
type: module
description: 'Import definitions of K8s resources from Amazon S3 bucket.'
package: Cloud
-core_version_requirement: ^8.8 || ^9
+core_version_requirement: ^9.5
configure: s3_to_k8s.settings
dependencies:
- cloud:aws_cloud
diff --git a/src/Service/CloudServiceInterface.php b/src/Service/CloudServiceInterface.php
index 56f2f791b0..440218988f 100644
--- a/src/Service/CloudServiceInterface.php
+++ b/src/Service/CloudServiceInterface.php
@@ -16,7 +16,7 @@ interface CloudServiceInterface {
/**
* The version signature string.
*/
- public const VERSION = '5.x-dev';
+ public const VERSION = '6.x-dev';
/**
* Get the version number of the module.
--
GitLab