Skip to content

Commit

Permalink
Merge pull request #51 from avasquez614/master
Browse files Browse the repository at this point in the history
Upgraded config to 4.0.4
  • Loading branch information
Alfonso Vásquez Drexler authored Jun 5, 2023
2 parents 4dc5dd0 + 003e003 commit 765dbc9
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
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.0.3`
- `minikube image pull craftercms/delivery_tomcat:4.0.3`
- `minikube image pull craftercms/authoring_tomcat:4.0.4`
- `minikube image pull craftercms/delivery_tomcat:4.0.4`
- `minikube image pull docker.elastic.co/elasticsearch/elasticsearch:7.17.1`

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.
Expand Down
8 changes: 4 additions & 4 deletions authoring/cluster/authoring-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.3E
image: craftercms/authoring_tomcat:4.0.4E
volumeMounts:
- name: mnt
mountPath: /mnt
Expand Down Expand Up @@ -177,7 +177,7 @@ spec:
memory: 2.5Gi
# Tomcat container
- name: tomcat
image: craftercms/authoring_tomcat:4.0.3E
image: craftercms/authoring_tomcat:4.0.4E
startupProbe:
httpGet:
path: /api/1/monitoring/status.json?token=defaultManagementToken
Expand Down Expand Up @@ -270,7 +270,7 @@ spec:
memory: 5Gi
# Deployer container
- name: deployer
image: craftercms/deployer:4.0.3E
image: craftercms/deployer:4.0.4E
imagePullPolicy: "Always"
startupProbe:
httpGet:
Expand Down Expand Up @@ -312,7 +312,7 @@ spec:
memory: 2.5Gi
# Git HTTPS server container
- name: git-https-server
image: craftercms/git_https_server:4.0.3E
image: craftercms/git_https_server:4.0.4E
imagePullPolicy: "Always"
ports:
- containerPort: 443
Expand Down
8 changes: 4 additions & 4 deletions authoring/simple/authoring-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ spec:
memory: 2.5Gi
# Tomcat container
- name: tomcat
image: craftercms/authoring_tomcat:4.0.3
image: craftercms/authoring_tomcat:4.0.4
imagePullPolicy: "Always"
startupProbe:
httpGet:
Expand Down Expand Up @@ -162,7 +162,7 @@ spec:
memory: 5Gi
# Deployer container
- name: deployer
image: craftercms/deployer:4.0.3
image: craftercms/deployer:4.0.4
startupProbe:
httpGet:
path: /api/1/monitoring/status?token=defaultManagementToken
Expand Down Expand Up @@ -208,7 +208,7 @@ spec:
# # Git SSH server container
# # Uncomment if using Git SSH
# - name: git-ssh-server
# image: craftercms/git_ssh_server:4.0.3
# image: craftercms/git_ssh_server:4.0.4
# imagePullPolicy: "Always"
# ports:
# - containerPort: 22
Expand All @@ -221,7 +221,7 @@ spec:
# Git HTTPS server container
# Uncomment if using Git HTTPS
- name: git-https-server
image: craftercms/git_https_server:4.0.3
image: craftercms/git_https_server:4.0.4
imagePullPolicy: "Always"
ports:
- containerPort: 443
Expand Down
6 changes: 3 additions & 3 deletions delivery/simple/delivery-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ spec:
# # Uncomment if using the Git SSH server in Authoring
# initContainers:
# - name: ssh-keys-copier
# image: craftercms/delivery_tomcat:4.0.3
# image: craftercms/delivery_tomcat:4.0.4
# volumeMounts:
# - name: ssh-keys
# mountPath: /.ssh
Expand Down Expand Up @@ -126,7 +126,7 @@ spec:
memory: 2.5Gi
# Tomcat container
- name: tomcat
image: craftercms/delivery_tomcat:4.0.3
image: craftercms/delivery_tomcat:4.0.4
startupProbe:
httpGet:
path: /api/1/monitoring/status.json?token=defaultManagementToken
Expand Down Expand Up @@ -167,7 +167,7 @@ spec:
memory: 4Gi
# Deployer container
- name: deployer
image: craftercms/deployer:4.0.3
image: craftercms/deployer:4.0.4
startupProbe:
httpGet:
path: /api/1/monitoring/status?token=defaultManagementToken
Expand Down

0 comments on commit 765dbc9

Please sign in to comment.