Merge branch 'master' into export-app

RNAcentral · Oct 15, 2024 · b82026b · b82026b
2 parents 0682b60 + 7f47cf0
commit b82026b
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 0 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -49,3 +49,4 @@ deploy_image:
 #        - rnacentral/*
     - if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
       when: manual
+
diff --git a/Dockerfile-CI-CD b/Dockerfile-CI-CD
@@ -0,0 +1,22 @@
+# Build container with kubectl and helm to be used by GitLab CI/CD
+
+ARG BUILDPLATFORM
+FROM ${BUILDPLATFORM}alpine:3.20
+
+ARG TARGETOS
+ARG TARGETARCH
+
+# Use kubectl version v1.23.8 and helm version v3.16.1
+RUN apk -U upgrade \
+    && apk add --no-cache ca-certificates bash git openssh curl gettext jq \
+    && wget -q https://dl.k8s.io/release/v1.23.8/bin/${TARGETOS}/${TARGETARCH}/kubectl -O /usr/local/bin/kubectl \
+    && wget -q https://get.helm.sh/helm-v3.16.1-${TARGETOS}-${TARGETARCH}.tar.gz -O - | tar -xzO ${TARGETOS}-${TARGETARCH}/helm > /usr/local/bin/helm \
+    && chmod +x /usr/local/bin/helm /usr/local/bin/kubectl \
+    && mkdir /config \
+    && chmod g+rwx /config /root \
+    && kubectl version --client \
+    && helm version
+
+WORKDIR /config
+
+CMD bash
diff --git a/kubernetes/helm/templates/memcached.yaml b/kubernetes/helm/templates/memcached.yaml
@@ -25,6 +25,8 @@ spec:
     metadata:
       labels:
         app: memcached
+      annotations:
+        roll-update-timestamp: {{ now | quote }}
     spec:
       containers:
         - image: memcached:1.6.7-alpine

diff --git a/kubernetes/sitemaps-pvc.yaml b/kubernetes/sitemaps-pvc.yaml
@@ -5,6 +5,7 @@ metadata:
     pvc: sitemaps
   name: sitemaps
 spec:
+  storageClassName: standard-nfs-production
   accessModes:
   - ReadWriteMany
   resources:

diff --git a/kubernetes/static-volume-pvc.yaml b/kubernetes/static-volume-pvc.yaml
@@ -5,6 +5,7 @@ metadata:
     pvc: static-volume
   name: static-volume
 spec:
+  storageClassName: standard-nfs-production
   accessModes:
   - ReadWriteMany
   resources:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -49,3 +49,4 @@ deploy_image:
		# - rnacentral/*
		- if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
		when: manual