From af9e5384ee8f8d6b593600ad46f4c56f659fc8ad Mon Sep 17 00:00:00 2001 From: ducoterra Date: Sat, 16 May 2020 12:38:09 -0400 Subject: [PATCH] add gitlab-ci --- .gitlab-ci.yml | 38 ++++++++++++++++++++++++++++ helm/.helmignore | 23 +++++++++++++++++ helm/Chart.yaml | 23 +++++++++++++++++ {k8s => helm/templates}/deploy.yaml | 16 ++++++------ {k8s/pvc => helm/templates}/pvc.yaml | 4 +-- helm/templates/service.yaml | 12 +++++++++ helm/values.yaml | 2 ++ k8s/service.yaml | 12 --------- server/server.properties | 2 +- 9 files changed, 109 insertions(+), 23 deletions(-) create mode 100644 .gitlab-ci.yml create mode 100644 helm/.helmignore create mode 100644 helm/Chart.yaml rename {k8s => helm/templates}/deploy.yaml (71%) rename {k8s/pvc => helm/templates}/pvc.yaml (76%) create mode 100644 helm/templates/service.yaml create mode 100644 helm/values.yaml delete mode 100644 k8s/service.yaml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..2335a16 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,38 @@ +variables: + CI_PROJECT_NAME: "pubcraft" + CI_PROJECT_DIR: "." + CI_REGISTRY_IMAGE: hub.ducoterra.net/ducoterra/pubcraft + +stages: + - build + - test + - deploy + +build: + only: + variables: + - $CI_COMMIT_TAG + stage: build + image: + name: gcr.io/kaniko-project/executor:debug + entrypoint: [""] + script: + - echo $DEPLOY + - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG + +deploy_to_prod: + variables: + DEPLOY: prod + stage: deploy + only: + variables: + - $CI_COMMIT_TAG + image: + name: debian:10 + entrypoint: [""] + script: + - apt -qq update >> /dev/null && apt -qq install -y curl >> /dev/null + - curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl + - chmod +x /usr/local/bin/kubectl + - curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash + - helm template $CI_PROJECT_NAME --set tag=1.1.1 ./helm | kubectl apply -f - \ No newline at end of file diff --git a/helm/.helmignore b/helm/.helmignore new file mode 100644 index 0000000..0e8a0eb --- /dev/null +++ b/helm/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/helm/Chart.yaml b/helm/Chart.yaml new file mode 100644 index 0000000..52c1320 --- /dev/null +++ b/helm/Chart.yaml @@ -0,0 +1,23 @@ +apiVersion: v2 +name: charts +description: A Helm chart for Kubernetes + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +# Versions are expected to follow Semantic Versioning (https://semver.org/) +version: 0.1.0 + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. Versions are not expected to +# follow Semantic Versioning. They should reflect the version the application is using. +appVersion: 1.16.0 diff --git a/k8s/deploy.yaml b/helm/templates/deploy.yaml similarity index 71% rename from k8s/deploy.yaml rename to helm/templates/deploy.yaml index ed73137..0ecf55a 100644 --- a/k8s/deploy.yaml +++ b/helm/templates/deploy.yaml @@ -1,19 +1,19 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: pubcraft + name: {{ .Release.Name }} spec: selector: matchLabels: - app: pubcraft + app: {{ .Release.Name }} template: metadata: labels: - app: pubcraft + app: {{ .Release.Name }} spec: containers: - - name: pubcraft - image: hub.ducoterra.net/ducoterra/pubcraft:1.15.2_3 + - name: {{ .Release.Name }} + image: {{ .Values.image }} ports: - containerPort: 25565 volumeMounts: @@ -23,7 +23,7 @@ spec: stdin: true env: - name: MAX_RAM - value: "8" + value: "4" - name: MIN_RAM value: "1" - name: THREADS @@ -33,9 +33,9 @@ spec: memory: "2Gi" cpu: 250m limits: - memory: "8Gi" + memory: "4Gi" cpu: "4" volumes: - name: data persistentVolumeClaim: - claimName: pubcraft + claimName: {{ .Release.Name }} diff --git a/k8s/pvc/pvc.yaml b/helm/templates/pvc.yaml similarity index 76% rename from k8s/pvc/pvc.yaml rename to helm/templates/pvc.yaml index 014ef74..a745357 100644 --- a/k8s/pvc/pvc.yaml +++ b/helm/templates/pvc.yaml @@ -1,11 +1,11 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: pubcraft + name: {{ .Release.Name }} spec: storageClassName: nfs-encrypted accessModes: - ReadWriteMany resources: requests: - storage: 16Gi \ No newline at end of file + storage: 32Gi \ No newline at end of file diff --git a/helm/templates/service.yaml b/helm/templates/service.yaml new file mode 100644 index 0000000..eade03e --- /dev/null +++ b/helm/templates/service.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ .Release.Name }} +spec: + selector: + app: {{ .Release.Name }} + ports: + - port: {{ .Values.port }} + targetPort: 25565 + name: {{ .Release.Name }} + type: LoadBalancer \ No newline at end of file diff --git a/helm/values.yaml b/helm/values.yaml new file mode 100644 index 0000000..878f8ce --- /dev/null +++ b/helm/values.yaml @@ -0,0 +1,2 @@ +image: hub.ducoterra.net/ducoterra/minecraft:1.15.2_1 +port: 20100 \ No newline at end of file diff --git a/k8s/service.yaml b/k8s/service.yaml deleted file mode 100644 index aa58695..0000000 --- a/k8s/service.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: pubcraft -spec: - selector: - app: pubcraft - ports: - - port: 20100 - targetPort: 25565 - name: pubcraft - type: LoadBalancer \ No newline at end of file diff --git a/server/server.properties b/server/server.properties index ebc29e4..3d559cc 100644 --- a/server/server.properties +++ b/server/server.properties @@ -25,7 +25,7 @@ server-ip= spawn-npcs=true allow-flight=true level-name=world -view-distance=32 +view-distance=20 resource-pack= spawn-animals=true white-list=true