summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlejandro Colomar <alx.manpages@gmail.com>2021-07-24 21:54:16 +0200
committerAlejandro Colomar <alx.manpages@gmail.com>2021-07-25 00:20:48 +0200
commit246ec737fb1ce61acfb47e1aa7e053241c1ce780 (patch)
treec8fe73d9d632ddb491b102acac32e9e55adb4c3c
parent21d5fb43546b3b1f45efc2ca3b35b075490e4317 (diff)
Drop openshift and kubernetes support
I never really used them :) Signed-off-by: Alejandro Colomar <alx.manpages@gmail.com>
-rwxr-xr-xbin/release_stable2
-rwxr-xr-xbin/release_test2
-rw-r--r--etc/docker/orchestrator1
-rw-r--r--etc/kubernetes/manifests/010_netpol.yaml26
-rw-r--r--etc/kubernetes/manifests/020_svc.yaml23
-rw-r--r--etc/kubernetes/manifests/030_deploy.yaml84
l---------etc/openshift/manifests/010_netpol.yaml1
-rw-r--r--etc/openshift/manifests/020_svc.yaml22
-rw-r--r--etc/openshift/manifests/021_route.yaml22
l---------etc/openshift/manifests/030_deploy.yaml1
-rw-r--r--lib/www/version/port.sh15
-rw-r--r--lib/www/version/version.sh2
12 files changed, 0 insertions, 201 deletions
diff --git a/bin/release_stable b/bin/release_stable
index de0a904..1b379a3 100755
--- a/bin/release_stable
+++ b/bin/release_stable
@@ -19,14 +19,12 @@ version="$1";
_d="$(dirname "${BASH_SOURCE[0]}")";
_D="${_d}/..";
. ${_D}/lib/www/version/date.sh;
-. ${_D}/lib/www/version/port.sh;
. ${_D}/lib/www/version/stability.sh;
. ${_D}/lib/www/version/version.sh;
port="$(<${_D}/.config grep '^port' | grep 'stable' | cut -f3)";
update_date;
-update_port ${port};
update_stability "stable";
update_version "${version}";
diff --git a/bin/release_test b/bin/release_test
index e967f5c..9c825c4 100755
--- a/bin/release_test
+++ b/bin/release_test
@@ -19,14 +19,12 @@ version="$1";
_d="$(dirname "${BASH_SOURCE[0]}")";
_D="${_d}/..";
. ${_D}/lib/www/version/date.sh;
-. ${_D}/lib/www/version/port.sh;
. ${_D}/lib/www/version/stability.sh;
. ${_D}/lib/www/version/version.sh;
port="$(<${_D}/.config grep '^port' | grep 'test' | cut -f3)";
update_date;
-update_port ${port};
update_stability "test";
update_version "${version}";
diff --git a/etc/docker/orchestrator b/etc/docker/orchestrator
deleted file mode 100644
index 438f425..0000000
--- a/etc/docker/orchestrator
+++ /dev/null
@@ -1 +0,0 @@
-swarm
diff --git a/etc/kubernetes/manifests/010_netpol.yaml b/etc/kubernetes/manifests/010_netpol.yaml
deleted file mode 100644
index b322f1f..0000000
--- a/etc/kubernetes/manifests/010_netpol.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-################################################################################
-## Copyright (C) 2020 Sebastian Francisco Colomar Bauza ##
-## Copyright (C) 2020 Alejandro Colomar Andrés ##
-## SPDX-License-Identifier: GPL-2.0-only ##
-################################################################################
-
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
- labels:
- app: www-label
- name: www-netpol
-spec:
- ingress:
- -
- ports:
- -
- port: 8080
- protocol: TCP
- podSelector:
- matchLabels:
- app: www-label
- policyTypes:
- -
- Ingress
-
diff --git a/etc/kubernetes/manifests/020_svc.yaml b/etc/kubernetes/manifests/020_svc.yaml
deleted file mode 100644
index d4b0fbb..0000000
--- a/etc/kubernetes/manifests/020_svc.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-################################################################################
-## Copyright (C) 2020 Sebastian Francisco Colomar Bauza ##
-## Copyright (C) 2020 Alejandro Colomar Andrés ##
-## SPDX-License-Identifier: GPL-2.0-only ##
-################################################################################
-
-apiVersion: v1
-kind: Service
-metadata:
- labels:
- app: www-label
- name: www
-spec:
- ports:
- -
- nodePort: 31001
- port: 8080
- protocol: TCP
- targetPort: 8080
- selector:
- app: www-label
- type: NodePort
-
diff --git a/etc/kubernetes/manifests/030_deploy.yaml b/etc/kubernetes/manifests/030_deploy.yaml
deleted file mode 100644
index 53b88ca..0000000
--- a/etc/kubernetes/manifests/030_deploy.yaml
+++ /dev/null
@@ -1,84 +0,0 @@
-################################################################################
-## Copyright (C) 2020 Sebastian Francisco Colomar Bauza ##
-## Copyright (C) 2020 Alejandro Colomar Andrés ##
-## SPDX-License-Identifier: GPL-2.0-only ##
-################################################################################
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: www-deploy
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: www-label
- template:
- metadata:
- name: www-pod
- labels:
- app: www-label
- spec:
- containers:
- -
- image: "docker.io/alejandrocolomar/www:0.48-rc5"
- livenessProbe:
- httpGet:
- path: /
- port: 8080
- initialDelaySeconds: 30
- name: www-container
- ports:
- -
- containerPort: 8080
- readinessProbe:
- httpGet:
- path: /
- port: 8080
- initialDelaySeconds: 1
- resources:
- limits:
- cpu: '0.5'
-# memory: '1Gi'
- requests:
- cpu: '0.5'
-# memory: '1Gi'
- volumeMounts:
- -
- mountPath: /etc/nginx/conf.d/security-parameters.conf
- name: etc-nginx-conf-d-security-parameters-conf-www-volume
- readOnly: true
- subPath: security-parameters.conf
- -
- mountPath: /etc/nginx/conf.d/server.conf
- name: etc-nginx-conf-d-server-conf-www-volume
- readOnly: true
- subPath: server.conf
- -
- mountPath: /var/cache/nginx/
- name: var-cache-nginx-www-volume
- -
- mountPath: /var/log/nginx/
- name: var-log-nginx-www-volume
- -
- mountPath: /var/run/
- name: var-run-www-volume
- volumes:
- -
- configMap:
- name: etc-nginx-conf-d-security-parameters-conf-www-cm
- name: etc-nginx-conf-d-security-parameters-conf-www-volume
- -
- configMap:
- name: etc-nginx-conf-d-server-conf-www-cm
- name: etc-nginx-conf-d-server-conf-www-volume
- -
- emptyDir: {}
- name: var-cache-nginx-www-volume
- -
- emptyDir: {}
- name: var-log-nginx-www-volume
- -
- emptyDir: {}
- name: var-run-www-volume
-
diff --git a/etc/openshift/manifests/010_netpol.yaml b/etc/openshift/manifests/010_netpol.yaml
deleted file mode 120000
index c0b9a3a..0000000
--- a/etc/openshift/manifests/010_netpol.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../kubernetes/manifests/010_netpol.yaml \ No newline at end of file
diff --git a/etc/openshift/manifests/020_svc.yaml b/etc/openshift/manifests/020_svc.yaml
deleted file mode 100644
index da77d5f..0000000
--- a/etc/openshift/manifests/020_svc.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-################################################################################
-## Copyright (C) 2020 Sebastian Francisco Colomar Bauza ##
-## Copyright (C) 2020 Alejandro Colomar Andrés ##
-## SPDX-License-Identifier: GPL-2.0-only ##
-################################################################################
-
-apiVersion: v1
-kind: Service
-metadata:
- labels:
- app: www-label
- name: www-svc
-spec:
- ports:
- -
- port: 8080
- protocol: TCP
- targetPort: 8080
- selector:
- app: www-label
- type: ClusterIP
-
diff --git a/etc/openshift/manifests/021_route.yaml b/etc/openshift/manifests/021_route.yaml
deleted file mode 100644
index d3478f6..0000000
--- a/etc/openshift/manifests/021_route.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-################################################################################
-## Copyright (C) 2020 Sebastian Francisco Colomar Bauza ##
-## Copyright (C) 2020 Alejandro Colomar Andrés ##
-## SPDX-License-Identifier: GPL-2.0-only ##
-################################################################################
-
-apiVersion: route.openshift.io/v1
-kind: Route
-metadata:
- labels:
- app: www-label
- name: www
-spec:
- port:
- targetPort: 8080
- tls:
- insecureEdgeTerminationPolicy: Redirect
- termination: edge
- to:
- kind: Service
- name: www-svc
-
diff --git a/etc/openshift/manifests/030_deploy.yaml b/etc/openshift/manifests/030_deploy.yaml
deleted file mode 120000
index 5a3428c..0000000
--- a/etc/openshift/manifests/030_deploy.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../kubernetes/manifests/030_deploy.yaml \ No newline at end of file
diff --git a/lib/www/version/port.sh b/lib/www/version/port.sh
deleted file mode 100644
index 21611f4..0000000
--- a/lib/www/version/port.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-# Copyright (C) 2020 Alejandro Colomar Andrés
-# SPDX-License-Identifier: GPL-2.0-only
-################################################################################
-
-
-function update_port()
-{
- local port="$1";
-
- sed "/nodePort:/s/:.*/: ${port}/" \
- -i ./etc/kubernetes/manifests/020_svc.yaml;
- sed "/ports/{n;s/\".*:/\"${port}:/}" \
- -i ./etc/swarm/manifests/compose.yaml;
-}
diff --git a/lib/www/version/version.sh b/lib/www/version/version.sh
index 852154e..55a3603 100644
--- a/lib/www/version/version.sh
+++ b/lib/www/version/version.sh
@@ -20,8 +20,6 @@ function update_version()
sed "\%^lbl %s% .*% ${version}%" \
-i ${_D}/etc/docker/image;
- sed "\%${dk_repository}:%s%${dk_repo}:.*\"%${dk_repo}:${version}\"%" \
- -i ${_D}/etc/kubernetes/manifests/030_deploy.yaml;
sed "\%^version %s% .*% ${version}%" \
-i ${_D}/.config;
}