init-app

@@ -1,142 +0,0 @@
-#!/bin/sh
-
-#
-# Initialize a new symfony app
-#
-
-DOCKERFILES_ROOT="misc/images"
-KUSTOMIZE_DIR="misc/k8s/kustomization"
-SKELL_GIT_URL="https://forge.cadoles.com/CadolesKube/symfony-kube-skeletor.git"
-
-run_form() {
-  local conf_dest="${1}"
-
-  echo "Welcome !"
-  echo
-  read -p "What is your application name (myapp) ? " appName
-  local appName=${appName:-myapp} 
-
-  read -p "Where do you want to start your versions ? (0.0.1) : " initVersion
-  local initVersion=${initVersion:-0.0.1}
-
-  read -p "List your standard git branches (stable staging dev) : " initBranches
-  local initBranches=${initBranches:-"stable staging dev"}
-  local branches=""
-  for br in ${initBranches}; do
-    branches="${branches}\"${br}\", "
-  done
-
-  read -p "Docker registry address (reg.cadoles.com) : " dockerRegistry
-  local dockerRegistry=${dockerRegistry:-reg.cadoles.com}
-   
-  cat <<__EOF__ > ${conf_dest}
-{ 
-  "app": {
-    "name": "${appName}",
-    "init_version": "${initVersion}",
-    "branches": [ ${branches::-2} ]
-  },
-  "registry": {
-    "address": "${dockerRegistry}"
-  }
-}
-__EOF__
-}
-
-create_docker_secret() {
-  local conf="${1}"
-  local registry=$(jq -cr ".registry.address" ${conf})
-
-  docker login ${registry}
-  mkdir -p ${KUSTOMIZE_DIR}/base/secrets/dockerconfig
-  mkdir -p ${KUSTOMIZE_DIR}/overlays/dev/secrets/dockerconfig
-  
-  docker --config ${KUSTOMIZE_DIR}/base/secrets/dockerconfig login ${registry}
-  mv ${KUSTOMIZE_DIR}/base/secrets/dockerconfig/config.json ${KUSTOMIZE_DIR}/base/secrets/dockerconfig/.dockerconfigjson
-  cp ${KUSTOMIZE_DIR}/base/secrets/dockerconfig/.dockerconfigjson ${KUSTOMIZE_DIR}/overlays/dev/secrets/dockerconfig/.dockerconfigjson
-}
-
-init_app() {
-  local conf="${1}"
-  local appDest="${2}/${appName}"
-
-  jq empty ${conf}
-  if [ ${?} -ne 0 ]; then
-    echo "Invalid application configuration ${conf}"
-    return 3
-  fi
-
-  if [ ! -d ${appDest} ]; then
-    mkdir -p ${appDest}
-  else
-    echo "Error ${appDest} allready exists"
-    return 2
-  fi
-
-  git clone --branch "feat/automation" ${SKELL_GIT_URL} ${appDest}
-
-  cd ${appDest}
-  rm -rf .git
-
-  echo "Setting Dockerfiles"
-  dirs=$(find ${DOCKERFILES_ROOT}/* -type d -name 'MYAPPLICATION-*')
-  for d in ${dirs}; do
-      mv ${d} $(echo ${d} | sed "s/MYAPPLICATION/${appName}/g")
-  done
-  echo "Setting Kustomization directories"
-  dirs=$(find ${KUSTOMIZE_DIR}/* -type d -name 'MYAPPLICATION-*')
-  for d in ${dirs}; do
-      mv ${d} $(echo ${d} | sed "s/MYAPPLICATION/${appName}/g")
-  done
-
-  echo "Setting Kustomization files"
-  dirs=$(find ${KUSTOMIZE_DIR}/* -type f -name 'MYAPPLICATION-*')
-  for d in ${dirs}; do
-      mv ${d} $(echo ${d} | sed "s/MYAPPLICATION/${appName}/g")
-  done
-  
-  grep -rl "MYAPPLICATION" ${KUSTOMIZE_DIR} | xargs sed -i "s/MYAPPLICATION/${appName}/g"
-
-  echo "Setting Skaffold configuration"
-  sed -i "s/MYAPPLICATION/${appName}/g" ${appDest}/skaffold.yaml
-
-  echo "Setting docker registry secrets"
-  create_docker_secret ${conf}
-
-  cd -
-}
-
-main() {
-  local cleanup="0"
-  if [ -n "${1}" ]; then
-    app_conf="$(pwd)/${1}"
-  else
-    cleanup="1"
-    app_conf=$(mktemp)
-    run_form "${app_conf}"
-    cat ${app_conf}
-  fi
-
-  local appName=$(jq -cr ".app.name" ${app_conf})
-  appName=${appName,,}
-  local appDest=${2:-"/tmp/${appName}"}
-
-  init_app ${app_conf} ${appDest}
-
-  if [ "${cleanup}" -eq 1 ]; then
-    rm -rf ${app_conf}
-  fi
-}
-
-CONFIG=""
-DEST="/tmp"
-
-while getopts "c:d:" option
-do
-  case $option in 
-    c) CONFIG=${OPTARG} ;;
-    d) DEST=${OPTARG} ;;
-  esac
-done
-
-main "${CONFIG}" "${DEST}"

main.mk

@@ -36,6 +36,7 @@ define release_image
 	docker push $(IMAGE_REPO)/$1:$(IMAGE_VERSION)-$(DAY_SUFFIX_TAG)
 endef
 	
+
 #list:
 build: ${IMAGES_DIR}/*
 	@for name in $(basename $(notdir $^)); do \
@@ -73,8 +74,4 @@ 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

misc/k8s/kind/kind-cluster.yaml

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

misc/k8s/kustomization/base/components/app-cnpg/kustomization.yaml

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

misc/k8s/kustomization/base/components/app-cnpg/resources/app-cnpg-cluster.yaml

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

misc/k8s/kustomization/base/kustomization.yaml

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

misc/k8s/kustomization/base/resources/MYAPPLICATION-kube/kustomization.yaml

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

misc/k8s/kustomization/base/resources/app-kube/kustomization.yaml

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

misc/k8s/kustomization/base/resources/app-kube/resources/app-deployment.yaml

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

misc/k8s/kustomization/base/resources/app-kube/resources/app-service.yaml

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

misc/k8s/kustomization/overlays/dev/kustomization.yaml

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

misc/k8s/kustomization/overlays/dev/patches/update-replicas-for-app.yaml

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

misc/k8s/kustomization/overlays/dev/resources/ingress.yaml

@@ -1,7 +1,7 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: MYAPPLICATION
+  name: app
   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: MYAPPLICATION.dev.local
+  - host: app.dev.local
     http:
       paths:
       - path: /
         pathType: Prefix
         backend:
           service:
-            name: MYAPPLICATION
+            name: app
             port:
               number: 8080

misc/k8s/kustomization/overlays/dev/resources/namespace.yaml

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

skaffold.yaml

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