From 41a16c0b837f839e62378c7e21dce99c1b988aec Mon Sep 17 00:00:00 2001 From: viveksair Date: Fri, 25 Apr 2025 00:03:57 -0400 Subject: [PATCH 1/5] Update cassandra-statefulset.yaml --- cassandra/cassandra-statefulset.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/cassandra/cassandra-statefulset.yaml b/cassandra/cassandra-statefulset.yaml index 536fd7fb5..3acad8812 100644 --- a/cassandra/cassandra-statefulset.yaml +++ b/cassandra/cassandra-statefulset.yaml @@ -74,6 +74,18 @@ spec: - /ready-probe.sh initialDelaySeconds: 15 timeoutSeconds: 5 + periodSeconds: 10 + failureThreshold: 3 + livenessProbe: + exec: + command: + - /bin/bash + - -c + - /ready-probe.sh + initialDelaySeconds: 15 + timeoutSeconds: 5 + periodSeconds: 10 + failureThreshold: 3 # These volume mounts are persistent. They are like inline claims, # but not exactly because the names need to match exactly one of # the stateful pod volumes. From 40cc7ab08f211ec46206c2d70b789c930a26e2ff Mon Sep 17 00:00:00 2001 From: viveksair Date: Sat, 3 May 2025 10:33:03 -0400 Subject: [PATCH 2/5] refactor --- cassandra/cassandra-statefulset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cassandra/cassandra-statefulset.yaml b/cassandra/cassandra-statefulset.yaml index 3acad8812..ca5a21e32 100644 --- a/cassandra/cassandra-statefulset.yaml +++ b/cassandra/cassandra-statefulset.yaml @@ -81,7 +81,7 @@ spec: command: - /bin/bash - -c - - /ready-probe.sh + - "nodetool status" initialDelaySeconds: 15 timeoutSeconds: 5 periodSeconds: 10 From 9428c220aaa795e26b43c94dbd7155ddd4212560 Mon Sep 17 00:00:00 2001 From: viveksair Date: Tue, 6 May 2025 01:57:18 -0400 Subject: [PATCH 3/5] refactor dockerfile --- guestbook/php-redis/Dockerfile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/guestbook/php-redis/Dockerfile b/guestbook/php-redis/Dockerfile index 16df47ca9..c7a2cc49b 100644 --- a/guestbook/php-redis/Dockerfile +++ b/guestbook/php-redis/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM php:5-apache +FROM docker.io/library/php:5-apache RUN pear channel-discover pear.nrk.io RUN pear install nrk/Predis @@ -21,9 +21,10 @@ RUN pear install nrk/Predis # /proc/self/fd/{1,2} are Unix sockets and apache will not be able to open() # them. Use "cat" to write directly to the already opened fds without opening # them again. -RUN sed -i 's#ErrorLog /proc/self/fd/2#ErrorLog "|$/bin/cat 1>\&2"#' /etc/apache2/apache2.conf -RUN sed -i 's#CustomLog /proc/self/fd/1 combined#CustomLog "|/bin/cat" combined#' /etc/apache2/apache2.conf +RUN sed -i \ + -e 's#ErrorLog /proc/self/fd/2#ErrorLog "|/bin/cat 1>&2"#' \ + -e 's#CustomLog /proc/self/fd/1 combined#CustomLog "|/bin/cat" combined#' \ + /etc/apache2/apache2.conf -ADD guestbook.php /var/www/html/guestbook.php -ADD controllers.js /var/www/html/controllers.js -ADD index.html /var/www/html/index.html +# Copy application files +COPY guestbook.php controllers.js index.html /var/www/html/ From 82b76897c2d466316e46942bed32121c98db6a35 Mon Sep 17 00:00:00 2001 From: rvs1729 Date: Tue, 6 May 2025 01:59:16 -0400 Subject: [PATCH 4/5] Update cassandra-statefulset.yaml --- cassandra/cassandra-statefulset.yaml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/cassandra/cassandra-statefulset.yaml b/cassandra/cassandra-statefulset.yaml index ca5a21e32..392a4de44 100644 --- a/cassandra/cassandra-statefulset.yaml +++ b/cassandra/cassandra-statefulset.yaml @@ -73,19 +73,7 @@ spec: - -c - /ready-probe.sh initialDelaySeconds: 15 - timeoutSeconds: 5 - periodSeconds: 10 - failureThreshold: 3 - livenessProbe: - exec: - command: - - /bin/bash - - -c - - "nodetool status" - initialDelaySeconds: 15 - timeoutSeconds: 5 - periodSeconds: 10 - failureThreshold: 3 + timeoutSeconds: 5 # These volume mounts are persistent. They are like inline claims, # but not exactly because the names need to match exactly one of # the stateful pod volumes. From 3b81357a877fea02ef87f386ffe5483ea8a3c6d1 Mon Sep 17 00:00:00 2001 From: rvs1729 Date: Tue, 6 May 2025 01:59:47 -0400 Subject: [PATCH 5/5] Update cassandra-statefulset.yaml --- cassandra/cassandra-statefulset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cassandra/cassandra-statefulset.yaml b/cassandra/cassandra-statefulset.yaml index 392a4de44..536fd7fb5 100644 --- a/cassandra/cassandra-statefulset.yaml +++ b/cassandra/cassandra-statefulset.yaml @@ -73,7 +73,7 @@ spec: - -c - /ready-probe.sh initialDelaySeconds: 15 - timeoutSeconds: 5 + timeoutSeconds: 5 # These volume mounts are persistent. They are like inline claims, # but not exactly because the names need to match exactly one of # the stateful pod volumes.