refactor(sites): rename octopus.k8s.vxm.cz -> ant.k8s.vxm.cz
This commit is contained in:
parent
68f5f51afa
commit
058ab23349
32 changed files with 62 additions and 63 deletions
|
|
@ -10,7 +10,7 @@ trigger:
|
|||
only:
|
||||
changes:
|
||||
- .gitlab-ci.yml
|
||||
- sites/octopus.k8s.vxm.cz/**
|
||||
- sites/ant.k8s.vxm.cz/**
|
||||
trigger:
|
||||
include: sites/octopus.k8s.vxm.cz/.gitlab-ci.yml
|
||||
include: sites/ant.k8s.vxm.cz/.gitlab-ci.yml
|
||||
strategy: depend
|
||||
|
|
|
|||
|
|
@ -5,25 +5,24 @@ build:
|
|||
stage: build
|
||||
image: sikalabs/ci-node
|
||||
variables:
|
||||
IMAGE: $CI_REGISTRY_IMAGE/octopus.k8s.vxm.cz
|
||||
IMAGE: $CI_REGISTRY_IMAGE/ant.k8s.vxm.cz
|
||||
IMAGE_TAG: $CI_COMMIT_SHORT_SHA
|
||||
before_script:
|
||||
- docker info
|
||||
- echo $CI_REGISTRY_PASSWORD | docker login --username $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
|
||||
script:
|
||||
- cd sites/octopus.k8s.vxm.cz
|
||||
- cd sites/ant.k8s.vxm.cz
|
||||
- yarn install --frozen-lockfile
|
||||
- yarn build
|
||||
- docker build --tag $IMAGE:$IMAGE_TAG --file ./build/Containerfile .
|
||||
- docker push $IMAGE:$IMAGE_TAG
|
||||
|
||||
# deploy:
|
||||
# stage: deploy
|
||||
# image: sikalabs/ci
|
||||
# environment:
|
||||
# name: production
|
||||
# url: https://octopus.k8s.vxm.cz
|
||||
# url: https://ant.k8s.vxm.cz
|
||||
# script:
|
||||
# - cd sites/octopus.k8s.vxm.cz
|
||||
# - mkdir -p _deploy/octopus.k8s.vxm.cz
|
||||
# - helm template octopus.k8s.vxm.cz ./deploy/chart/octopus.k8s.vxm.cz --set image.repository=$IMAGE --set image.tag=$IMAGE_TAG > ./_deploy/octopus.k8s.vxm.cz/generated.yml
|
||||
# - cd sites/ant.k8s.vxm.cz
|
||||
# - mkdir -p _deploy/ant.k8s.vxm.cz
|
||||
# - helm template ant.k8s.vxm.cz ./deploy/chart/ant.k8s.vxm.cz --set image.repository=$IMAGE --set image.tag=$IMAGE_TAG > ./_deploy/ant.k8s.vxm.cz/generated.yml
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
"items": [
|
||||
{
|
||||
"name": "Argo CD",
|
||||
"url": "https://argo-cd.octopus.k8s.vxm.cz"
|
||||
"url": "https://argo-cd.ant.k8s.vxm.cz"
|
||||
},
|
||||
{
|
||||
"name": "GitLab (MaresHQ / GitOps)",
|
||||
|
|
@ -17,15 +17,15 @@
|
|||
"items": [
|
||||
{
|
||||
"name": "Prometheus",
|
||||
"url": "https://octopus.k8s.vxm.cz/prometheus"
|
||||
"url": "https://ant.k8s.vxm.cz/prometheus"
|
||||
},
|
||||
{
|
||||
"name": "Alert Manager",
|
||||
"url": "https://octopus.k8s.vxm.cz/alertmanager"
|
||||
"url": "https://ant.k8s.vxm.cz/alertmanager"
|
||||
},
|
||||
{
|
||||
"name": "Grafana",
|
||||
"url": "https://octopus.k8s.vxm.cz/grafana"
|
||||
"url": "https://ant.k8s.vxm.cz/grafana"
|
||||
}
|
||||
]
|
||||
},
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
"items": [
|
||||
{
|
||||
"name": "Longhorn Dashboard",
|
||||
"url": "https://octopus.k8s.vxm.cz/longhorn"
|
||||
"url": "https://ant.k8s.vxm.cz/longhorn"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
apiVersion: v2
|
||||
name: ant.k8s.vxm.cz
|
||||
description: A Helm chart for ant.k8s.vxm.cz
|
||||
type: application
|
||||
version: 1.0.0
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
{{/*
|
||||
Expand the name of the chart.
|
||||
*/}}
|
||||
{{- define "octopus.k8s.vxm.cz.name" -}}
|
||||
{{- define "ant.k8s.vxm.cz.name" -}}
|
||||
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
|
||||
{{- end }}
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ Create a default fully qualified app name.
|
|||
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
|
||||
If release name contains chart name it will be used as a full name.
|
||||
*/}}
|
||||
{{- define "octopus.k8s.vxm.cz.fullname" -}}
|
||||
{{- define "ant.k8s.vxm.cz.fullname" -}}
|
||||
{{- if .Values.fullnameOverride }}
|
||||
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
|
||||
{{- else }}
|
||||
|
|
@ -26,16 +26,16 @@ If release name contains chart name it will be used as a full name.
|
|||
{{/*
|
||||
Create chart name and version as used by the chart label.
|
||||
*/}}
|
||||
{{- define "octopus.k8s.vxm.cz.chart" -}}
|
||||
{{- define "ant.k8s.vxm.cz.chart" -}}
|
||||
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
|
||||
{{- end }}
|
||||
|
||||
{{/*
|
||||
Common labels
|
||||
*/}}
|
||||
{{- define "octopus.k8s.vxm.cz.labels" -}}
|
||||
helm.sh/chart: {{ include "octopus.k8s.vxm.cz.chart" . }}
|
||||
{{ include "octopus.k8s.vxm.cz.selectorLabels" . }}
|
||||
{{- define "ant.k8s.vxm.cz.labels" -}}
|
||||
helm.sh/chart: {{ include "ant.k8s.vxm.cz.chart" . }}
|
||||
{{ include "ant.k8s.vxm.cz.selectorLabels" . }}
|
||||
{{- if .Chart.AppVersion }}
|
||||
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
|
||||
{{- end }}
|
||||
|
|
@ -45,7 +45,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
|
|||
{{/*
|
||||
Selector labels
|
||||
*/}}
|
||||
{{- define "octopus.k8s.vxm.cz.selectorLabels" -}}
|
||||
app.kubernetes.io/name: {{ include "octopus.k8s.vxm.cz.name" . }}
|
||||
{{- define "ant.k8s.vxm.cz.selectorLabels" -}}
|
||||
app.kubernetes.io/name: {{ include "ant.k8s.vxm.cz.name" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
{{- end }}
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: {{ include "octopus.k8s.vxm.cz.fullname" . }}
|
||||
name: {{ include "ant.k8s.vxm.cz.fullname" . }}
|
||||
labels:
|
||||
{{- include "octopus.k8s.vxm.cz.labels" . | nindent 4 }}
|
||||
{{- include "ant.k8s.vxm.cz.labels" . | nindent 4 }}
|
||||
spec:
|
||||
replicas: {{ .Values.replicaCount }}
|
||||
selector:
|
||||
matchLabels:
|
||||
{{- include "octopus.k8s.vxm.cz.selectorLabels" . | nindent 6 }}
|
||||
{{- include "ant.k8s.vxm.cz.selectorLabels" . | nindent 6 }}
|
||||
template:
|
||||
metadata:
|
||||
{{- with .Values.podAnnotations }}
|
||||
|
|
@ -16,7 +16,7 @@ spec:
|
|||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
labels:
|
||||
{{- include "octopus.k8s.vxm.cz.selectorLabels" . | nindent 8 }}
|
||||
{{- include "ant.k8s.vxm.cz.selectorLabels" . | nindent 8 }}
|
||||
spec:
|
||||
{{- with .Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{{- if .Values.ingress.enabled -}}
|
||||
{{- $fullName := include "octopus.k8s.vxm.cz.fullname" . -}}
|
||||
{{- $fullName := include "ant.k8s.vxm.cz.fullname" . -}}
|
||||
{{- $svcPort := .Values.service.port -}}
|
||||
{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
|
||||
{{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
|
||||
|
|
@ -17,7 +17,7 @@ kind: Ingress
|
|||
metadata:
|
||||
name: {{ $fullName }}
|
||||
labels:
|
||||
{{- include "octopus.k8s.vxm.cz.labels" . | nindent 4 }}
|
||||
{{- include "ant.k8s.vxm.cz.labels" . | nindent 4 }}
|
||||
{{- with .Values.ingress.annotations }}
|
||||
annotations:
|
||||
{{- toYaml . | nindent 4 }}
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: { { include "ant.k8s.vxm.cz.fullname" . } }
|
||||
labels: { { - include "ant.k8s.vxm.cz.labels" . | nindent 4 } }
|
||||
spec:
|
||||
type: { { .Values.service.type } }
|
||||
ports:
|
||||
- port: { { .Values.service.port } }
|
||||
targetPort: http
|
||||
protocol: TCP
|
||||
name: http
|
||||
selector:
|
||||
{ { - include "ant.k8s.vxm.cz.selectorLabels" . | nindent 4 } }
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
# Default values for octopus.k8s.vxm.cz.
|
||||
# Default values for ant.k8s.vxm.cz.
|
||||
# This is a YAML-formatted file.
|
||||
# Declare variables to be passed into your templates.
|
||||
|
||||
|
|
@ -7,15 +7,16 @@ replicaCount: 1
|
|||
image:
|
||||
repository: nginx
|
||||
pullPolicy: IfNotPresent
|
||||
tag: ""
|
||||
tag: ''
|
||||
|
||||
imagePullSecrets: []
|
||||
nameOverride: ""
|
||||
fullnameOverride: ""
|
||||
nameOverride: ''
|
||||
fullnameOverride: ''
|
||||
|
||||
podAnnotations: {}
|
||||
|
||||
podSecurityContext: {}
|
||||
podSecurityContext:
|
||||
{}
|
||||
# fsGroup: 2000
|
||||
|
||||
securityContext:
|
||||
|
|
@ -35,17 +36,17 @@ ingress:
|
|||
className: nginx
|
||||
annotations:
|
||||
cert-manager.io/cluster-issuer: letsencrypt-prod
|
||||
nginx.ingress.kubernetes.io/auth-url: "https://$host/oauth2/auth"
|
||||
nginx.ingress.kubernetes.io/auth-signin: "https://$host/oauth2/start?rd=$escaped_request_uri"
|
||||
nginx.ingress.kubernetes.io/auth-url: 'https://$host/oauth2/auth'
|
||||
nginx.ingress.kubernetes.io/auth-signin: 'https://$host/oauth2/start?rd=$escaped_request_uri'
|
||||
hosts:
|
||||
- host: octopus.k8s.vxm.cz
|
||||
- host: ant.k8s.vxm.cz
|
||||
paths:
|
||||
- path: /
|
||||
pathType: Prefix
|
||||
tls:
|
||||
- secretName: octopus-signpost-tls
|
||||
hosts:
|
||||
- octopus.k8s.vxm.cz
|
||||
- secretName: octopus-signpost-tls
|
||||
hosts:
|
||||
- ant.k8s.vxm.cz
|
||||
|
||||
resources:
|
||||
# We usually recommend not to specify default resources and to leave this as a conscious
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"name": "octopus.k8s.vxm.cz",
|
||||
"name": "ant.k8s.vxm.cz",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"dev": "next dev",
|
||||
|
|
@ -6,15 +6,15 @@ const Home: NextPage = () => {
|
|||
return (
|
||||
<>
|
||||
<Head>
|
||||
<title>octopus.k8s.vxm.cz</title>
|
||||
<title>ant.k8s.vxm.cz</title>
|
||||
<meta
|
||||
name="description"
|
||||
content="Signpost for Octopus Kubernetes Cluster (octopus.k8s.vxm.cz)"
|
||||
content="Signpost for Octopus Kubernetes Cluster (ant.k8s.vxm.cz)"
|
||||
/>
|
||||
<link rel="icon" href="/favicon.ico" />
|
||||
</Head>
|
||||
|
||||
<h3 className="px-16 py-4 text-gray-600">octopus.k8s.vxm.cz</h3>
|
||||
<h3 className="px-16 py-4 text-gray-600">ant.k8s.vxm.cz</h3>
|
||||
<main className="px-16">
|
||||
<h1 className="font-sans font-bold text-4xl">
|
||||
Octopus Kubernetes Cluster Signpost
|
||||
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 25 KiB |
|
|
@ -1,5 +0,0 @@
|
|||
apiVersion: v2
|
||||
name: octopus.k8s.vxm.cz
|
||||
description: A Helm chart for octopus.k8s.vxm.cz
|
||||
type: application
|
||||
version: 1.0.0
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: {{ include "octopus.k8s.vxm.cz.fullname" . }}
|
||||
labels:
|
||||
{{- include "octopus.k8s.vxm.cz.labels" . | nindent 4 }}
|
||||
spec:
|
||||
type: {{ .Values.service.type }}
|
||||
ports:
|
||||
- port: {{ .Values.service.port }}
|
||||
targetPort: http
|
||||
protocol: TCP
|
||||
name: http
|
||||
selector:
|
||||
{{- include "octopus.k8s.vxm.cz.selectorLabels" . | nindent 4 }}
|
||||
Reference in a new issue