From bb66bedeea067f569a3d42cd746aaf6a0ca6e5ae Mon Sep 17 00:00:00 2001 From: Stefan Bussemaker Date: Wed, 20 Dec 2023 14:14:47 +0100 Subject: [PATCH] cleanup old files - move fuseki-docker to fuseki repository - move helm charts to helm-charts repository - move kustomize files to helm repository (archive folder) --- charts/Chart.yaml | 13 -- charts/README.md | 52 -------- charts/templates/deployment.yaml | 58 --------- charts/templates/ingress.yaml | 23 ---- charts/templates/service.yaml | 13 -- charts/values.localhost.yaml | 6 - charts/values.yaml | 11 -- fuseki-docker/Dockerfile | 135 -------------------- fuseki-docker/README.md | 27 ---- fuseki-docker/download.sh | 147 ---------------------- fuseki-docker/entrypoint.sh | 5 - fuseki-docker/log4j2.properties | 73 ----------- kustomize/base/deployment.yaml | 43 ------- kustomize/base/ingress.yaml | 23 ---- kustomize/base/kustomization.yaml | 16 --- kustomize/base/namespace.yaml | 4 - kustomize/base/pvc.yaml | 17 --- kustomize/base/service.yaml | 13 -- kustomize/overlays/dev/kustomization.yaml | 26 ---- 19 files changed, 705 deletions(-) delete mode 100644 charts/Chart.yaml delete mode 100644 charts/README.md delete mode 100644 charts/templates/deployment.yaml delete mode 100644 charts/templates/ingress.yaml delete mode 100644 charts/templates/service.yaml delete mode 100644 charts/values.localhost.yaml delete mode 100644 charts/values.yaml delete mode 100644 fuseki-docker/Dockerfile delete mode 100644 fuseki-docker/README.md delete mode 100644 fuseki-docker/download.sh delete mode 100644 fuseki-docker/entrypoint.sh delete mode 100644 fuseki-docker/log4j2.properties delete mode 100644 kustomize/base/deployment.yaml delete mode 100644 kustomize/base/ingress.yaml delete mode 100644 kustomize/base/kustomization.yaml delete mode 100644 kustomize/base/namespace.yaml delete mode 100644 kustomize/base/pvc.yaml delete mode 100644 kustomize/base/service.yaml delete mode 100644 kustomize/overlays/dev/kustomization.yaml diff --git a/charts/Chart.yaml b/charts/Chart.yaml deleted file mode 100644 index 4860301..0000000 --- a/charts/Chart.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v2 -appVersion: 0.0.1 -description: Helm charts for the Fuseki deployment of Lock-Unlock -home: https://labs.kadaster.nl/cases/lockunlock -keywords: - - lock-unlock - - digilab - - kadaster-labs -name: lock-unlock-fuseki -sources: - - https://github.com/kadaster-labs/lock-unlock-testdata-fuseki -type: application -version: 0.0.1 \ No newline at end of file diff --git a/charts/README.md b/charts/README.md deleted file mode 100644 index d7b3e70..0000000 --- a/charts/README.md +++ /dev/null @@ -1,52 +0,0 @@ -# Deploy using Helm Charts - -## Test on a local Docker Desktop Kubernetes environment: -For IngressController (to access the Fuseki endpoint in the browser), install something like [ingress-nginx](https://kubernetes.github.io/ingress-nginx/). -```bash -helm upgrade --install ingress-nginx ingress-nginx \ - --repo https://kubernetes.github.io/ingress-nginx \ - --namespace ingress-nginx --create-namespace -``` - -The next step assumes you've built the fuseki-docker and lock-unlock-dataloader images, as a reminder: -```bash -docker build --build-arg JENA_VERSION=4.10.0 -t lock-unlock-testdata/fuseki:4.10.0 ./fuseki-docker/ -docker build -t lock-unlock-dataloader:latest ./lock-unlock-dataloader -``` - -Then, the deployment can be done using the following command: -```bash -helm install fuseki charts/ --values charts/values.localhost.yaml --namespace lock-unlock --create-namespace -``` - -You should now be able to access the dataset at http://fuseki.127.0.0.1.nip.io/ - -## Deploying multiple dataset -You might do something like: -```bash -helm install fuseki-anbi charts/ \ - --namespace lock-unlock-anbi --create-namespace \ - --set fuseki.image=lock-unlock-testdata/fuseki \ - --set ingress.host=anbi.127.0.0.1.nip.io \ - --set fuseki.dataset.file_url="https://raw.githubusercontent.com/kadaster-labs/lock-unlock-testdata/main/testdata-anbi/lock-unlock-anbi.ttl.gz" - -helm install fuseki-brk charts/ \ - --namespace lock-unlock-brk --create-namespace \ - --set fuseki.image=lock-unlock-testdata/fuseki \ - --set ingress.host=brk.127.0.0.1.nip.io \ - --set fuseki.dataset.file_url="https://raw.githubusercontent.com/kadaster-labs/lock-unlock-testdata/main/testdata-brk/lock-unlock-brk.ttl.gz" - -helm install fuseki-brp charts/ \ - --namespace lock-unlock-brp --create-namespace \ - --set fuseki.image=lock-unlock-testdata/fuseki \ - --set ingress.host=brp.127.0.0.1.nip.io \ - --set fuseki.dataset.file_url="https://raw.githubusercontent.com/kadaster-labs/lock-unlock-testdata/main/testdata-brp/lock-unlock-brp.ttl.gz" - -helm install fuseki-nhr charts/ \ - --namespace lock-unlock-nhr --create-namespace \ - --set fuseki.image=lock-unlock-testdata/fuseki \ - --set ingress.host=nhr.127.0.0.1.nip.io \ - --set fuseki.dataset.file_url="https://raw.githubusercontent.com/kadaster-labs/lock-unlock-testdata/main/testdata-nhr/lock-unlock-nhr.ttl.gz" -``` - -You can then access http://.127.0.0.1.nip.io/ diff --git a/charts/templates/deployment.yaml b/charts/templates/deployment.yaml deleted file mode 100644 index b679e7a..0000000 --- a/charts/templates/deployment.yaml +++ /dev/null @@ -1,58 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: fuseki -spec: - selector: - matchLabels: - app: fuseki - replicas: 1 - template: - metadata: - labels: - app: fuseki - spec: - initContainers: - - name: prep-tdb2 - image: "lock-unlock-dataloader:latest" - imagePullPolicy: Never - args: - - ./prep_tdb2.sh - env: - - name: FILE_URL - value: "{{ .Values.fuseki.dataset.file_url }}" - volumeMounts: - - name: database - mountPath: /database - containers: - - name: fuseki-server - image: "{{ .Values.fuseki.image }}:{{ .Values.fuseki.tag }}" - args: [ "--tdb2", "--loc", "/database", "/db" ] - ports: - - containerPort: 3030 - name: http - volumeMounts: - - name: logs - mountPath: /logs - - name: database - mountPath: /database - volumes: - - name: database - emptyDir: {} - - name: logs - emptyDir: {} -# resources: -# requests: -# cpu: 10m -# memory: 10Mi -# limits: -# cpu: 20m -# memory: 20Mi -# livenessProbe: -# httpGet: -# path: /?liveness -# port: http -# readinessProbe: -# httpGet: -# path: /?readiness -# port: http diff --git a/charts/templates/ingress.yaml b/charts/templates/ingress.yaml deleted file mode 100644 index 92ffb1e..0000000 --- a/charts/templates/ingress.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: fuseki - # annotations: - # cert-manager.io/cluster-issuer: letsencrypt-prod -spec: - ingressClassName: nginx - rules: - - host: "{{ .Values.ingress.host }}" - http: - paths: - - path: / - pathType: ImplementationSpecific - backend: - service: - name: fuseki - port: - number: 80 - # tls: - # - hosts: - # - set-in-overlay - # secretName: lock-unlock-fuseki-tls diff --git a/charts/templates/service.yaml b/charts/templates/service.yaml deleted file mode 100644 index 230c57b..0000000 --- a/charts/templates/service.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: fuseki - labels: - run: fuseki -spec: - ports: - - port: 80 - protocol: TCP - targetPort: 3030 - selector: - app: fuseki \ No newline at end of file diff --git a/charts/values.localhost.yaml b/charts/values.localhost.yaml deleted file mode 100644 index bab1308..0000000 --- a/charts/values.localhost.yaml +++ /dev/null @@ -1,6 +0,0 @@ - -fuseki: - image: lock-unlock-testdata/fuseki - -ingress: - host: fuseki.127.0.0.1.nip.io \ No newline at end of file diff --git a/charts/values.yaml b/charts/values.yaml deleted file mode 100644 index c7b9135..0000000 --- a/charts/values.yaml +++ /dev/null @@ -1,11 +0,0 @@ - -fuseki: - image: ghcr.io/lock-unlock-testdata/fuseki - tag: 4.10.0 - - dataset: - file_url: https://raw.githubusercontent.com/kadaster-labs/lock-unlock-testdata/main/testdata-brk/lock-unlock-brk.ttl.gz - -ingress: - host: tbd - # host: fuseki.127.0.0.1.nip.io \ No newline at end of file diff --git a/fuseki-docker/Dockerfile b/fuseki-docker/Dockerfile deleted file mode 100644 index b93b41d..0000000 --- a/fuseki-docker/Dockerfile +++ /dev/null @@ -1,135 +0,0 @@ -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. - -## Apache Jena Fuseki server Dockerfile. - -## This Dockefile builds a reduced footprint container. - -ARG JAVA_VERSION=17 - -ARG ALPINE_VERSION=3.17.1 -ARG JENA_VERSION="" - -# Internal, passed between stages. -ARG FUSEKI_DIR=/fuseki -ARG FUSEKI_JAR=jena-fuseki-fulljar-${JENA_VERSION}.jar -ARG FUSEKI_WEBAPP_WAR=jena-fuseki-war-${JENA_VERSION}.war -ARG JAVA_MINIMAL=/opt/java-minimal - -## ---- Stage: Download and build java. -FROM eclipse-temurin:${JAVA_VERSION}-alpine AS base - -ARG JAVA_MINIMAL -ARG JENA_VERSION -ARG FUSEKI_DIR -ARG FUSEKI_JAR -ARG FUSEKI_WEBAPP_WAR -ARG REPO=https://repo1.maven.org/maven2 -ARG JAR_URL=${REPO}/org/apache/jena/jena-fuseki-fulljar/${JENA_VERSION}/${FUSEKI_JAR} -ARG WAR_URL=${REPO}/org/apache/jena/jena-fuseki-war/${JENA_VERSION}/${FUSEKI_WEBAPP_WAR} - -RUN [ "${JENA_VERSION}" != "" ] || { echo -e '\n**** Set JENA_VERSION ****\n' ; exit 1 ; } -RUN echo && echo "==== Docker build for Apache Jena Fuseki ${JENA_VERSION} ====" && echo - -# Alpine: For objcopy used in jlink -RUN apk add --no-cache curl binutils - -## -- Fuseki installed and runs in /fuseki. -WORKDIR $FUSEKI_DIR - -## -- Download the jar file. -COPY download.sh . -RUN chmod a+x download.sh - -# Download, with check of the SHA1 checksum. -RUN ./download.sh --chksum sha1 "$JAR_URL" -RUN ./download.sh --chksum sha1 "$WAR_URL" - -## unpack war to webapp -RUN mkdir webapp -RUN mv ${FUSEKI_WEBAPP_WAR} webapp/${FUSEKI_WEBAPP_WAR} -WORKDIR ${FUSEKI_DIR}/webapp -RUN jar xf ${FUSEKI_WEBAPP_WAR} -WORKDIR $FUSEKI_DIR - -## -- Alternatives to download : copy already downloaded. -## COPY ${FUSEKI_JAR} . - -## Use Docker ADD - does not retry, does not check checksum, and may run every build. -## ADD "$JAR_URL" - -## -- Make reduced Java JDK - -ARG JDEPS_EXTRA="jdk.crypto.cryptoki,jdk.crypto.ec" -RUN \ - JDEPS="$(jdeps --multi-release base --print-module-deps --ignore-missing-deps ${FUSEKI_JAR})" && \ - jlink \ - --compress 2 --strip-debug --no-header-files --no-man-pages \ - --output "${JAVA_MINIMAL}" \ - --add-modules "${JDEPS},${JDEPS_EXTRA}" - -ADD entrypoint.sh . -ADD log4j2.properties . - -## ---- Stage: Build runtime -FROM alpine:${ALPINE_VERSION} - -## Import ARGs -ARG JENA_VERSION -ARG JAVA_MINIMAL -ARG FUSEKI_DIR -ARG FUSEKI_JAR - -COPY --from=base /opt/java-minimal /opt/java-minimal -COPY --from=base /fuseki /fuseki - -WORKDIR $FUSEKI_DIR - -ARG LOGS=${FUSEKI_DIR}/logs -ARG DATA=${FUSEKI_DIR}/databases - -ARG JENA_USER=fuseki -ARG JENA_GROUP=$JENA_USER -ARG JENA_GID=1000 -ARG JENA_UID=1000 - -# Run as this user -# -H : no home directory -# -D : no password -RUN addgroup -g "${JENA_GID}" "${JENA_GROUP}" && \ - adduser "${JENA_USER}" -G "${JENA_GROUP}" -s /bin/ash -u "${JENA_UID}" -H -D - -RUN mkdir --parents "${FUSEKI_DIR}" && \ - chown -R $JENA_USER ${FUSEKI_DIR} - -USER $JENA_USER - -RUN \ - mkdir -p $LOGS && \ - mkdir -p $DATA && \ - chmod a+x entrypoint.sh - -## Default environment variables. -ENV \ - JAVA_HOME=${JAVA_MINIMAL} \ - JAVA_OPTIONS="-Xmx2048m -Xms2048m" \ - JENA_VERSION=${JENA_VERSION} \ - FUSEKI_JAR="${FUSEKI_JAR}" \ - FUSEKI_DIR="${FUSEKI_DIR}" - -EXPOSE 3030 - -ENTRYPOINT ["./entrypoint.sh" ] -CMD [] \ No newline at end of file diff --git a/fuseki-docker/README.md b/fuseki-docker/README.md deleted file mode 100644 index 53cf411..0000000 --- a/fuseki-docker/README.md +++ /dev/null @@ -1,27 +0,0 @@ -# Fuseki Docker - -This is a straight replica of the [Fuseki -Dockerfile](https://github.com/apache/jena/blob/main/jena-fuseki2/jena-fuseki-docker/Dockerfile) of -the [Fuseki2 Docker package](https://jena.apache.org/documentation/fuseki2/fuseki-docker.html). It -is replicated 'cause it is not published publically. In this repo there's a GitHub Actions pipeline -that builds it automatically and pushes it (from `main` branch only) to the [GitHub Container -Registry](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry) - -Differences with the original `Dockerfile`: - -- using `jena-fuseki-fulljar` instead of `jena-fuseki-server` so the UI will be available as well -- adding `jena-fuseki-war` (webapp) for the UI parts - -## Usage - -Use the published image by: - -```bash -$ docker pull ghcr.io/lock-unlock-testdata/fuseki:4.10.0 -``` - -Local build: - -```bash -$ docker build --build-arg JENA_VERSION=4.10.0 -t lock-unlock-testdata/fuseki:4.10.0 ./fuseki-docker -``` diff --git a/fuseki-docker/download.sh b/fuseki-docker/download.sh deleted file mode 100644 index c44c814..0000000 --- a/fuseki-docker/download.sh +++ /dev/null @@ -1,147 +0,0 @@ -#!/bin/sh - -## Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0 -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# This is an ash/dash script (it uses "local"), not a bash script. -# It can run in an Alpine image during a docker build. -# -# The advantage over using docker ADD is that it checks -# whether download file is already present and does not -# download each time. -# -# Shell script to download URL and check the checksum - -USAGE="Usage: $(basename "$0") --chksum [sha1|sha512] URL" - -if [ $# -eq 0 ] -then - echo "$USAGE" 2>&1 - exit 1 -fi - -CHKSUM_TYPE='unset' - -while [ $# -gt 0 ] ; do - case "$1" in - --chksum|-chksum|-sha|--sha) - if [ $# -lt 2 ] - then - echo "$USAGE" 1>&2 - exit 1 - fi - CHKSUM_TYPE=$2 - shift - shift - ;; - -h|--help) - echo "$USAGE" 1>&2 - exit 0 - ;; - -*) - echo "$USAGE" 1>&2 - exit 1 - ;; - *) - if [ $# -ne 1 ] - then - echo "$USAGE" 1>&2 - exit 1 - fi - URL="$1" - shift - ;; - esac -done - -case "${CHKSUM_TYPE}" in - unset) - echo "$USAGE" 1>&2 - exit 1 - ;; - sha*|md5) ;; - *) - echo "Bad checksum type: '$CHKSUM_TYPE' (must start 'sha' or be 'md5')" 2>&1 - exit 1 - ;; -esac - -## ---- Script starts ---- - -ARTIFACT_URL="${URL}" -ARTIFACT_NAME="$(basename "$ARTIFACT_URL")" - -# -------- Checksum details - -CHKSUM_EXT=".${CHKSUM_TYPE}" -CHKSUM_URL="${ARTIFACT_URL}${CHKSUM_EXT}" -CHKSUM_FILE="${ARTIFACT_NAME}${CHKSUM_EXT}" -CHKSUMPROG="${CHKSUM_TYPE}sum" -# -------- - -CURL_FETCH_OPTS="-s -S --fail --location --max-redirs 3" -if false -then - echo "ARTIFACT_URL=$ARTIFACT_URL" - echo "CHKSUM_URL=$CHKSUM_URL" -fi - -download() { # URL - local URL="$1" - local FN="$(basename "$URL")" - if [ ! -e "$FN" ] - then - echo "Fetching $URL" - curl $CURL_FETCH_OPTS "$URL" --output "$FN" \ - || { echo "Bad download of $FN" 2>&1 ; return 1 ; } - else - echo "$FN already present" - fi - return 0 -} - -checkChksum() { # Filename checksum - local FN="$1" - local CHKSUM="$2" - if [ ! -e "$FN" ] - then - echo "No such file: '$FN'" 2>&1 - exit 1 - fi - # NB Two spaces required for busybox - echo "$CHKSUM $FN" | ${CHKSUMPROG} -c > /dev/null -} - -download "$ARTIFACT_URL" || exit 1 - -if [ -z "$CHKSUM" ] -then - # Checksum not previously set. - # Extract from file, copes with variations in content (filename or not) - download "$CHKSUM_URL" || exit 1 - CHKSUM="$(cut -d' ' -f1 "$CHKSUM_FILE")" -fi - -checkChksum "${ARTIFACT_NAME}" "$CHKSUM" -if [ $? = 0 ] -then - echo "Good download: $ARTIFACT_NAME" -else - echo "BAD download !!!! $ARTIFACT_NAME" - echo "To retry: delete downloaded files and try again" - exit 1 -fi \ No newline at end of file diff --git a/fuseki-docker/entrypoint.sh b/fuseki-docker/entrypoint.sh deleted file mode 100644 index 0873d53..0000000 --- a/fuseki-docker/entrypoint.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -## Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0 - -## env | sort -exec "$JAVA_HOME/bin/java" $JAVA_OPTIONS -jar "${FUSEKI_DIR}/${FUSEKI_JAR}" "$@" \ No newline at end of file diff --git a/fuseki-docker/log4j2.properties b/fuseki-docker/log4j2.properties deleted file mode 100644 index 4b68202..0000000 --- a/fuseki-docker/log4j2.properties +++ /dev/null @@ -1,73 +0,0 @@ -## Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0 -status = error -name = PropertiesConfig - -## filters = threshold -## filter.threshold.type = ThresholdFilter -## filter.threshold.level = ALL - -appender.console.type = Console -appender.console.name = OUT -appender.console.target = SYSTEM_OUT -appender.console.layout.type = PatternLayout -## appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-15c{1} :: %m%n -## Include date. -appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-15c{1} :: %m%n - -## To a file. -## appender.file.type = File -## appender.file.name = FILE -## appender.file.fileName=/fuseki/logs/log.fuseki -## appender.file.layout.type=PatternLayout -## appender.file.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-15c{1} :: %m%n - -rootLogger.level = INFO -rootLogger.appenderRef.stdout.ref = OUT - -logger.jena.name = org.apache.jena -logger.jena.level = INFO - -logger.arq-exec.name = org.apache.jena.arq.exec -logger.arq-exec.level = INFO - -logger.arq-info.name = org.apache.jena.arq.info -logger.arq-info.level = INFO - -logger.riot.name = org.apache.jena.riot -logger.riot.level = INFO - -logger.fuseki.name = org.apache.jena.fuseki -logger.fuseki.level = INFO - -logger.fuseki-fuseki.name = org.apache.jena.fuseki.Fuseki -logger.fuseki-fuseki.level = INFO - -logger.fuseki-server.name = org.apache.jena.fuseki.Server -logger.fuseki-server.level = INFO - -logger.fuseki-admin.name = org.apache.jena.fuseki.Admin -logger.fuseki-admin.level = INFO - -logger.jetty.name = org.eclipse.jetty -logger.jetty.level = WARN - -# May be useful to turn up to DEBUG if debugging HTTP communication issues -logger.apache-http.name = org.apache.http -logger.apache-http.level = WARN - -logger.shiro.name = org.apache.shiro -logger.shiro.level = WARN -# Hide bug in Shiro 1.5.x -logger.shiro-realm.name = org.apache.shiro.realm.text.IniRealm -logger.shiro-realm.level = ERROR - -# This goes out in NCSA format -appender.plain.type = Console -appender.plain.name = PLAIN -appender.plain.layout.type = PatternLayout -appender.plain.layout.pattern = %m%n - -logger.request-log.name = org.apache.jena.fuseki.Request -logger.request-log.additivity = false -logger.request-log.level = OFF -logger.request-log.appenderRef.plain.ref = PLAIN \ No newline at end of file diff --git a/kustomize/base/deployment.yaml b/kustomize/base/deployment.yaml deleted file mode 100644 index da7a435..0000000 --- a/kustomize/base/deployment.yaml +++ /dev/null @@ -1,43 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: fuseki-dpl -spec: - selector: - matchLabels: - app: fuseki-dpl - replicas: 1 - template: - metadata: - labels: - app: fuseki-dpl - spec: - containers: - - name: fuseki-dpl - image: ghcr.io/lock-unlock-testdata/fuseki:4.9.0 - args: [ "--tdb2", "--update", "--loc", "/databases/", "/ds" ] - ports: - - containerPort: 3030 - name: http - volumeMounts: - - name: fuseki-db-vol - mountPath: /logs - - name: fuseki-db-vol - mountPath: /databases - volumes: - - name: fuseki-db-vol -# resources: -# requests: -# cpu: 10m -# memory: 10Mi -# limits: -# cpu: 20m -# memory: 20Mi -# livenessProbe: -# httpGet: -# path: /?liveness -# port: http -# readinessProbe: -# httpGet: -# path: /?readiness -# port: http diff --git a/kustomize/base/ingress.yaml b/kustomize/base/ingress.yaml deleted file mode 100644 index ce7a027..0000000 --- a/kustomize/base/ingress.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: ingress - # annotations: - # cert-manager.io/cluster-issuer: letsencrypt-prod -spec: - ingressClassName: nginx - rules: - - host: set-in-overlay - http: - paths: - - path: / - pathType: ImplementationSpecific - backend: - service: - name: fuseki-svc - port: - number: 80 - # tls: - # - hosts: - # - set-in-overlay - # secretName: lock-unlock-fuseki-tls diff --git a/kustomize/base/kustomization.yaml b/kustomize/base/kustomization.yaml deleted file mode 100644 index 56a23bd..0000000 --- a/kustomize/base/kustomization.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namePrefix: lock-unlock- -namespace: lock-unlock - -# commonLabels: -# app: lock-unlock-fuseki - - -resources: - - namespace.yaml - - pvc.yaml - - deployment.yaml - - ingress.yaml - - service.yaml diff --git a/kustomize/base/namespace.yaml b/kustomize/base/namespace.yaml deleted file mode 100644 index 6fbaee6..0000000 --- a/kustomize/base/namespace.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: lock-unlock diff --git a/kustomize/base/pvc.yaml b/kustomize/base/pvc.yaml deleted file mode 100644 index 016f0ac..0000000 --- a/kustomize/base/pvc.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: fuseki-db-vol -spec: - accessModes: - - ReadWriteOnce - volumeMode: Filesystem - resources: - requests: - storage: 8Gi - # storageClassName: slow - selector: - matchLabels: - release: "stable" - # matchExpressions: - # - {key: environment, operator: In, values: [dev]} \ No newline at end of file diff --git a/kustomize/base/service.yaml b/kustomize/base/service.yaml deleted file mode 100644 index 73147f5..0000000 --- a/kustomize/base/service.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: fuseki-svc - labels: - run: fuseki-svc -spec: - ports: - - port: 80 - protocol: TCP - targetPort: 3030 - selector: - app: fuseki-dpl \ No newline at end of file diff --git a/kustomize/overlays/dev/kustomization.yaml b/kustomize/overlays/dev/kustomization.yaml deleted file mode 100644 index 2c79e23..0000000 --- a/kustomize/overlays/dev/kustomization.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../../base - -images: -- name: ghcr.io/lock-unlock-testdata/fuseki:4.9.0 - newName: lock-unlock-testdata/fuseki - -patches: - - target: - kind: Ingress - name: ingress - patch: | - - op: replace - path: /spec/rules/0/host - value: fuseki.127.0.0.1.nip.io - # - target: - # kind: Ingress - # name: ingress - # patch: | - # - op: add - # path: /spec - # value: - # ingressClassName: nginx