diff --git a/README.md b/README.md index 24275ea..e7122d3 100644 --- a/README.md +++ b/README.md @@ -5,12 +5,12 @@ 1. Install kubectl 2. Have a Kubernetes cluster available. For testing the Simple Authoring and Simple Delivery you can used any cluster. If using `minikube`, please run the following commands, to avoid `context deadline exceeded` errors: -- `minikube image pull craftercms/authoring_tomcat:4.1.8` -- `minikube image pull craftercms/authoring_tomcat:4.1.8E` -- `minikube image pull craftercms/delivery_tomcat:4.1.8` -- `minikube image pull craftercms/delivery_tomcat:4.1.8E` -- `minikube image pull craftercms/deployer:4.1.8` -- `minikube image pull craftercms/deployer:4.1.8E` +- `minikube image pull craftercms/authoring_tomcat:4.2.0` +- `minikube image pull craftercms/authoring_tomcat:4.2.0E` +- `minikube image pull craftercms/delivery_tomcat:4.2.0` +- `minikube image pull craftercms/delivery_tomcat:4.2.0E` +- `minikube image pull craftercms/deployer:4.2.0` +- `minikube image pull craftercms/deployer:4.2.0E` - `minikube image pull opensearchproject/opensearch:2.15.0` For the Authoring cluster example, you will need and AWS EKS cluster with the AWS Load Balancer Controller installed: https://docs.aws.amazon.com/eks/latest/userguide/aws-load-balancer-controller.html. diff --git a/authoring/cluster/authoring-deployment.yaml b/authoring/cluster/authoring-deployment.yaml index 12a7bb6..06689e0 100644 --- a/authoring/cluster/authoring-deployment.yaml +++ b/authoring/cluster/authoring-deployment.yaml @@ -138,7 +138,7 @@ spec: initContainers: # Modifies the crafter-setenv.sh to use the pod ordinal index + offset for the CRAFTER_DB_CLUSTER_SERVER_ID instead of an autogenerated number based on the IP - name: crafter-setenv-fixer - image: craftercms/authoring_tomcat:4.1.8E + image: craftercms/authoring_tomcat:4.2.0E volumeMounts: - name: mnt mountPath: /mnt @@ -180,7 +180,7 @@ spec: memory: 2.5Gi # Tomcat container - name: tomcat - image: craftercms/authoring_tomcat:4.1.8E + image: craftercms/authoring_tomcat:4.2.0E startupProbe: httpGet: path: /api/1/monitoring/status.json?token=defaultManagementToken @@ -273,7 +273,7 @@ spec: memory: 5Gi # Deployer container - name: deployer - image: craftercms/deployer:4.1.8E + image: craftercms/deployer:4.2.0E imagePullPolicy: "Always" startupProbe: httpGet: @@ -315,7 +315,7 @@ spec: memory: 2.5Gi # Git HTTPS server container - name: git-https-server - image: craftercms/git_https_server:4.1.8E + image: craftercms/git_https_server:4.2.0E imagePullPolicy: "Always" ports: - containerPort: 443 diff --git a/authoring/simple/authoring-deployment.yaml b/authoring/simple/authoring-deployment.yaml index fb3f880..3e78006 100644 --- a/authoring/simple/authoring-deployment.yaml +++ b/authoring/simple/authoring-deployment.yaml @@ -123,7 +123,7 @@ spec: memory: 2.5Gi # Tomcat container - name: tomcat - image: craftercms/authoring_tomcat:4.1.8 + image: craftercms/authoring_tomcat:4.2.0 imagePullPolicy: "Always" startupProbe: httpGet: @@ -165,7 +165,7 @@ spec: memory: 5Gi # Deployer container - name: deployer - image: craftercms/deployer:4.1.8 + image: craftercms/deployer:4.2.0 startupProbe: httpGet: path: /api/1/monitoring/status?token=defaultManagementToken @@ -211,7 +211,7 @@ spec: # # Git SSH server container # # Uncomment if using Git SSH # - name: git-ssh-server - # image: craftercms/git_ssh_server:4.1.8 + # image: craftercms/git_ssh_server:4.2.0 # imagePullPolicy: "Always" # ports: # - containerPort: 22 @@ -224,7 +224,7 @@ spec: # Git HTTPS server container # Uncomment if using Git HTTPS - name: git-https-server - image: craftercms/git_https_server:4.1.8 + image: craftercms/git_https_server:4.2.0 imagePullPolicy: "Always" ports: - containerPort: 443 diff --git a/delivery/simple/delivery-deployment.yaml b/delivery/simple/delivery-deployment.yaml index 9645c68..6640015 100644 --- a/delivery/simple/delivery-deployment.yaml +++ b/delivery/simple/delivery-deployment.yaml @@ -79,7 +79,7 @@ spec: # # Uncomment if using the Git SSH server in Authoring # initContainers: # - name: ssh-keys-copier - # image: craftercms/delivery_tomcat:4.1.8 + # image: craftercms/delivery_tomcat:4.2.0 # volumeMounts: # - name: ssh-keys # mountPath: /.ssh @@ -129,7 +129,7 @@ spec: memory: 2.5Gi # Tomcat container - name: tomcat - image: craftercms/delivery_tomcat:4.1.8 + image: craftercms/delivery_tomcat:4.2.0 startupProbe: httpGet: path: /api/1/monitoring/status.json?token=defaultManagementToken @@ -170,7 +170,7 @@ spec: memory: 4Gi # Deployer container - name: deployer - image: craftercms/deployer:4.1.8 + image: craftercms/deployer:4.2.0 startupProbe: httpGet: path: /api/1/monitoring/status?token=defaultManagementToken