CadolesKube
/
symfony-kube-skeletor
Template
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean(structure): using MYAPPLICATION instead of app

This commit is contained in:
Philippe Caseiro 2023-06-15 11:21:56 +02:00
parent 1508d44120
commit 34df7a153a
17 changed files with 53 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main.mk
View File

@ -36,7 +36,6 @@ define release_image
docker push $(IMAGE_REPO)/$1:$(IMAGE_VERSION)-$(DAY_SUFFIX_TAG)
endef
#list:
build: ${IMAGES_DIR}/*
@for name in $(basename $(notdir $^)); do \
@ -74,4 +73,8 @@ tools/bin/bash_unit:
mkdir -p tools/bin
cd tools/bin && bash <(curl -s https://raw.githubusercontent.com/pgrange/bash_unit/master/install.sh)
up:
skaffold dev -p dev --default-repo ${IMAGE_REPO}
##include recipes/*.mk

0
misc/images/app-kube/Dockerfile → misc/images/MYAPPLICATION-kube/Dockerfile
View File

0
misc/images/app-standalone/Dockerfile → misc/images/MYAPPLICATION-standalone/Dockerfile
View File

2
misc/k8s/kind/kind-cluster.yaml
View File

@ -1,6 +1,6 @@
kind: Cluster
apiVersion: kind.x-k8s.io/v1alpha4
name: mse-dev
name: dev-cluster
networking:
podSubnet: "10.110.0.0/16"
serviceSubnet: "10.115.0.0/16"

0
misc/k8s/kustomization/base/components/app-cnpg/configurations/cnpg-cluster.yaml → misc/k8s/kustomization/base/components/MYAPPLICATION-cnpg/configurations/cnpg-cluster.yaml
View File

12
misc/k8s/kustomization/base/components/app-cnpg/kustomization.yaml → misc/k8s/kustomization/base/components/MYAPPLICATION-cnpg/kustomization.yaml
View File

@ -8,24 +8,24 @@ configurations:
- ./configurations/cnpg-cluster.yaml
resources:
- ./resources/app-cnpg-cluster.yaml
- ./resources/MYAPPLICATION-cnpg-cluster.yaml
secretgenerator:
- name: app-postgres-admin
- name: MYAPPLICATION-postgres-admin
type: secret
literals:
- username=postgres
- password=notsosecret
- name: app-postgres-user
- name: MYAPPLICATION-postgres-user
type: Secret
literals:
- username=app
- username=MYAPPLICATION
- password=NotSoSecretButThisIsBad
vars:
- name: APP_DATABASE_SERVICE_NAME
- name: MYAPPLICATION_DATABASE_SERVICE_NAME
objref:
name: app-postgres
name: MYAPPLICATION-postgres
kind: Cluster
apiVersion: postgresql.cnpg.io/v1
fieldref:

10
misc/k8s/kustomization/base/components/app-cnpg/resources/app-cnpg-cluster.yaml → misc/k8s/kustomization/base/components/MYAPPLICATION-cnpg/resources/MYAPPLICATION-cnpg-cluster.yaml
View File

@ -1,17 +1,17 @@
apiVersion: postgresql.cnpg.io/v1
kind: Cluster
metadata:
name: app-postgres
name: MYAPPLICATION-postgres
spec:
instances: 3
primaryUpdateStrategy: unsupervised
superuserSecret:
name: app-postgres-admin
name: MYAPPLICATION-postgres-admin
bootstrap:
initdb:
database: app
owner: app
database: MYAPPLICATION
owner: MYAPPLICATION
secret:
name: app-postgres-user
name: MYAPPLICATION-postgres-user
storage:
size: 20Gi

6
misc/k8s/kustomization/base/kustomization.yaml
View File

@ -1,10 +1,10 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namePrefix: app-
namePrefix: MYAPPLICATION-
components:
- components/app-cnpg
- components/MYAPPLICATION-cnpg
resources:
- resources/app-kube
- resources/MYAPPLICATION-kube

6
misc/k8s/kustomization/base/resources/MYAPPLICATION-kube/kustomization.yaml Normal file
View File

@ -0,0 +1,6 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ./resources/MYAPPLICATION-service.yaml
- ./resources/MYAPPLICATION-deployment.yaml

28
misc/k8s/kustomization/base/resources/app-kube/resources/app-deployment.yaml → misc/k8s/kustomization/base/resources/MYAPPLICATION-kube/resources/MYAPPLICATION-deployment.yaml
View File

@ -2,26 +2,26 @@ apiVersion: apps/v1
kind: Deployment
metadata:
labels:
io.kompose.service: app
name: app
io.kompose.service: MYAPPLICATION
name: MYAPPLICATION
spec:
replicas: 3
selector:
matchLabels:
io.kompose.service: app
io.kompose.service: MYAPPLICATION
strategy:
type: Recreate
template:
metadata:
labels:
io.kompose.service: app
io.kompose.service: MYAPPLICATION
spec:
restartPolicy: Always
containers:
- image: reg.cadoles.com/cadoles/app-kube
- image: reg.cadoles.com/cadoles/MYAPPLICATION-kube
imagePullPolicy: Always
name: app-php-fpm
name: MYAPPLICATION-php-fpm
args: ["/usr/sbin/php-fpm81", "-F", "-e"]
resources: {}
env:
@ -33,22 +33,22 @@ spec:
value: 128m
- name: PHP_FPM_LOG_LEVEL
value: warning
- name: APP_DATABASE_SERVICE_NAME
value: $(APP_DATABASE_SERVICE_NAME)-rw
- image: reg.cadoles.com/cadoles/app-kube
- name: MYAPPLICATION_DATABASE_SERVICE_NAME
value: $(MYAPPLICATION_DATABASE_SERVICE_NAME)-rw
- image: reg.cadoles.com/cadoles/MYAPPLICATION-kube
imagePullPolicy: Always
name: app-nginx
name: MYAPPLICATION-nginx
args: ["/usr/sbin/nginx"]
env:
- name: NGINX_APP_UPSTREAM_BACKEND_SERVER
- name: NGINX_MYAPPLICATION_UPSTREAM_BACKEND_SERVER
value: 127.0.0.1:9000
- name: NGINX_APP_ROOT
- name: NGINX_MYAPPLICATION_ROOT
value: "/public"
- name: NGINX_APP_PHP_INDEX
- name: NGINX_MYAPPLICATION_PHP_INDEX
value: "/index.php"
- name: NGINX_ERROR_LOG_LEVEL
value: "warn"
- name: NGINX_APP_PHP_NON_FILE_PATTERN
- name: NGINX_MYAPPLICATION_PHP_NON_FILE_PATTERN
value: "^/index\\.php(/|$)"
ports:
- containerPort: 8080

8
misc/k8s/kustomization/base/resources/app-kube/resources/app-service.yaml → misc/k8s/kustomization/base/resources/MYAPPLICATION-kube/resources/MYAPPLICATION-service.yaml
View File

@ -2,13 +2,13 @@ apiVersion: v1
kind: Service
metadata:
labels:
io.kompose.service: app
name: app
io.kompose.service: MYAPPLICATION
name: MYAPPLICATION
spec:
type: ClusterIP
ports:
- name: app-http
- name: MYAPPLICATION-http
port: 80
targetPort: 8080
selector:
io.kompose.service: app
io.kompose.service: MYAPPLICATION

6
misc/k8s/kustomization/base/resources/app-kube/kustomization.yaml
View File

@ -1,6 +0,0 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ./resources/app-service.yaml
- ./resources/app-deployment.yaml

4
misc/k8s/kustomization/overlays/dev/kustomization.yaml
View File

@ -1,6 +1,6 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: app-dev
namespace: MYAPPLICATION-dev
resources:
- ../../base
@ -8,7 +8,7 @@ resources:
- resources/ingress.yaml
patches:
- path: patches/update-replicas-for-app.yaml
- path: patches/MYAPPLICATION-update-replicas.yaml
- path: patches/add-registry-pull-secret.yaml
target:
kind: Deployment

4
misc/k8s/kustomization/overlays/dev/patches/update-replicas-for-app.yaml → misc/k8s/kustomization/overlays/dev/patches/MYAPPLICATION-update-replicas.yaml
View File

@ -2,7 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
labels:
io.kompose.service: app
name: app
io.kompose.service: MYAPPLICATION
name: MYAPPLICATION
spec:
replicas: 1

6
misc/k8s/kustomization/overlays/dev/resources/ingress.yaml
View File

@ -1,7 +1,7 @@
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: app
name: MYAPPLICATION
annotations:
nginx.ingress.kubernetes.io/proxy-body-size: "138m"
nginx.ingress.kubernetes.io/enable-cors: "true" #cf 01
@ -9,13 +9,13 @@ metadata:
spec:
ingressClassName: nginx
rules:
- host: app.dev.local
- host: MYAPPLICATION.dev.local
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: app
name: MYAPPLICATION
port:
number: 8080

2
misc/k8s/kustomization/overlays/dev/resources/namespace.yaml
View File

@ -1,4 +1,4 @@
apiVersion: v1
kind: Namespace
metadata:
name: app-dev
name: MYAPPLICATION-dev

4
skaffold.yaml
View File

@ -29,7 +29,7 @@ build:
sha256: {}
artifacts:
- image: reg.cadoles.com/cadoles/app-kube
- image: reg.cadoles.com/cadoles/MYAPPLICATION-kube
context: .
sync:
infer:
@ -41,7 +41,7 @@ build:
- composer.json
- composer.lock
kaniko:
dockerfile: misc/images/app-kube/Dockerfile
dockerfile: misc/images/MYAPPLICATION-kube/Dockerfile
cache: {}
deploy: