增加k8s部署配置 && 升级依赖

deploy/k8s/configmap.yaml

@@ -0,0 +1,119 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: web-nginx-config
+  namespace: djangoblog
+data:
+  nginx.conf: |
+    user  nginx;
+    worker_processes  auto;
+    error_log  /var/log/nginx/error.log notice;
+    pid        /var/run/nginx.pid;
+
+    events {
+        worker_connections  1024;
+        multi_accept on;
+        use epoll;
+    }
+
+    http {
+        include /etc/nginx/mime.types;
+        default_type  application/octet-stream;
+
+        log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                          '$status $body_bytes_sent "$http_referer" '
+                          '"$http_user_agent" "$http_x_forwarded_for"';
+
+        access_log  /var/log/nginx/access.log  main;
+
+        sendfile        on;
+        keepalive_timeout  65;
+        gzip on;
+        gzip_disable "msie6";
+
+        gzip_vary on;
+        gzip_proxied any;
+        gzip_comp_level 8;
+        gzip_buffers 16 8k;
+        gzip_http_version 1.1;
+        gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
+
+        # Include server configurations
+        include /etc/nginx/conf.d/*.conf;
+    }
+  djangoblog.conf: |
+    server {
+        server_name lylinux.net;
+        root /code/djangoblog/collectedstatic/;
+        listen 80;
+        keepalive_timeout 70;
+        location /static/ {
+            expires max;
+            alias /code/djangoblog/collectedstatic/;
+        }
+
+        location ~* (robots\.txt|ads\.txt|favicon\.ico|favion\.ico|crossdomain\.xml|google93fd32dbd906620a\.html|BingSiteAuth\.xml|baidu_verify_Ijeny6KrmS\.html)$ {
+        root             /resource/djangopub;
+        expires          1d;
+        access_log off;
+        error_log off;
+        }
+
+        location / {
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header Host $http_host;
+            proxy_set_header X-NginX-Proxy true;
+            proxy_redirect off;
+            if (!-f $request_filename) {
+                proxy_pass http://djangoblog:8000;
+                break;
+            }
+        }
+    }
+    server {
+      server_name www.lylinux.net;
+      listen 80;
+      return 301 https://lylinux.net$request_uri;
+    }
+  resource.lylinux.net.conf: |
+    server {
+        index index.html index.htm;
+        server_name resource.lylinux.net;
+        root /resource/;
+
+        location /djangoblog/ {
+            alias /code/djangoblog/collectedstatic/;
+        }
+
+        access_log off;
+        error_log off;
+        include lylinux/resource.conf;
+    }
+  lylinux.resource.conf: |
+    expires max;
+    access_log        off;
+    log_not_found     off;
+    add_header Pragma public;
+    add_header Cache-Control "public";
+    add_header "Access-Control-Allow-Origin" "*";
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: djangoblog-env
+  namespace: djangoblog
+data:
+  DJANGO_MYSQL_DATABASE: djangoblog
+  DJANGO_MYSQL_USER: db_user
+  DJANGO_MYSQL_PASSWORD: db_password
+  DJANGO_MYSQL_HOST: db_host
+  DJANGO_MYSQL_PORT: db_port
+  DJANGO_REDIS_URL: "redis:6379"
+  DJANGO_DEBUG: "False"
+  MYSQL_ROOT_PASSWORD: DjAnGoBlOg!2!Q@W#E
+  MYSQL_DATABASE: djangoblog
+  MYSQL_PASSWORD: DjAnGoBlOg!2!Q@W#E
+  DJANGO_SECRET_KEY: xxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+

deploy/k8s/deployment.yaml

@@ -0,0 +1,274 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: djangoblog
+  namespace: djangoblog
+  labels:
+    app: djangoblog
+spec:
+  replicas: 3
+  selector:
+    matchLabels:
+      app: djangoblog
+  template:
+    metadata:
+      labels:
+        app: djangoblog
+    spec:
+      containers:
+      - name: djangoblog
+        image: liangliangyy/djangoblog:latest
+        imagePullPolicy: Always
+        ports:
+        - containerPort: 8000
+        envFrom:
+        - configMapRef:
+            name: djangoblog-env
+        readinessProbe:
+          httpGet:
+            path: /
+            port: 8000
+          initialDelaySeconds: 10
+          periodSeconds: 30
+        livenessProbe:
+          httpGet:
+            path: /
+            port: 8000
+          initialDelaySeconds: 10
+          periodSeconds: 30
+        resources:
+          requests:
+            cpu: 10m
+            memory: 100Mi
+          limits:
+            cpu: "2"
+            memory: 2Gi
+        volumeMounts:
+        - name: djangoblog
+          mountPath: /code/djangoblog/collectedstatic
+        - name: resource
+          mountPath: /resource
+      volumes:
+      - name: djangoblog
+        persistentVolumeClaim:
+          claimName: djangoblog-pvc
+      - name: resource
+        persistentVolumeClaim:
+          claimName: resource-pvc
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: redis
+  namespace: djangoblog
+  labels:
+    app: redis
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: redis
+  template:
+    metadata:
+      labels:
+        app: redis
+    spec:
+      containers:
+      - name: redis
+        image: redis:latest
+        imagePullPolicy: IfNotPresent
+        ports:
+        - containerPort: 6379
+        resources:
+          requests:
+            cpu: 10m
+            memory: 100Mi
+          limits:
+            cpu: 200m
+            memory: 2Gi
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: db
+  namespace: djangoblog
+  labels:
+    app: db
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: db
+  template:
+    metadata:
+      labels:
+        app: db
+    spec:
+      containers:
+      - name: db
+        image: mysql:latest
+        imagePullPolicy: IfNotPresent
+        ports:
+        - containerPort: 3306
+        envFrom:
+        - configMapRef:
+            name: djangoblog-env
+        readinessProbe:
+          exec:
+            command:
+            - mysqladmin
+            - ping
+            - "-h"
+            - "127.0.0.1"
+            - "-u"
+            - "root"
+            - "-p$MYSQL_ROOT_PASSWORD"
+          initialDelaySeconds: 10
+          periodSeconds: 10
+        livenessProbe:
+          exec:
+            command:
+            - mysqladmin
+            - ping
+            - "-h"
+            - "127.0.0.1"
+            - "-u"
+            - "root"
+            - "-p$MYSQL_ROOT_PASSWORD"
+          initialDelaySeconds: 10
+          periodSeconds: 10
+        resources:
+          requests:
+            cpu: 10m
+            memory: 100Mi
+          limits:
+            cpu: "2"
+            memory: 2Gi
+        volumeMounts:
+        - name: db-data
+          mountPath: /var/lib/mysql
+      volumes:
+      - name: db-data
+        persistentVolumeClaim:
+          claimName: db-pvc
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: nginx
+  namespace: djangoblog
+  labels:
+    app: nginx
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: nginx
+  template:
+    metadata:
+      labels:
+        app: nginx
+    spec:
+      containers:
+      - name: nginx
+        image: nginx:latest
+        imagePullPolicy: IfNotPresent
+        ports:
+        - containerPort: 80
+        resources:
+          requests:
+            cpu: 10m
+            memory: 100Mi
+          limits:
+            cpu: "2"
+            memory: 2Gi
+        volumeMounts:
+        - name: nginx-config
+          mountPath: /etc/nginx/nginx.conf
+          subPath: nginx.conf
+        - name: nginx-config
+          mountPath: /etc/nginx/conf.d/default.conf
+          subPath: djangoblog.conf
+        - name: nginx-config
+          mountPath: /etc/nginx/conf.d/resource.lylinux.net.conf
+          subPath: resource.lylinux.net.conf
+        - name: nginx-config
+          mountPath: /etc/nginx/lylinux/resource.conf
+          subPath: lylinux.resource.conf
+        - name: djangoblog-pvc
+          mountPath: /code/djangoblog/collectedstatic
+        - name: resource-pvc
+          mountPath: /resource
+      volumes:
+      - name: nginx-config
+        configMap:
+          name: web-nginx-config
+      - name: djangoblog-pvc
+        persistentVolumeClaim:
+          claimName: djangoblog-pvc
+      - name: resource-pvc
+        persistentVolumeClaim:
+          claimName: resource-pvc
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: elasticsearch
+  namespace: djangoblog
+  labels:
+    app: elasticsearch
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: elasticsearch
+  template:
+    metadata:
+      labels:
+        app: elasticsearch
+    spec:
+      containers:
+      - name: elasticsearch
+        image: liangliangyy/elasticsearch-analysis-ik:8.6.1
+        imagePullPolicy: IfNotPresent
+        env:
+        - name: discovery.type
+          value: single-node
+        - name: ES_JAVA_OPTS
+          value: "-Xms256m -Xmx256m"
+        - name: xpack.security.enabled
+          value: "false"
+        - name: xpack.monitoring.templates.enabled
+          value: "false"
+        ports:
+        - containerPort: 9200
+        resources:
+          requests:
+            cpu: 10m
+            memory: 100Mi
+          limits:
+            cpu: "2"
+            memory: 2Gi
+        readinessProbe:
+          httpGet:
+            path: /
+            port: 9200
+          initialDelaySeconds: 15
+          periodSeconds: 30
+        livenessProbe:
+          httpGet:
+            path: /
+            port: 9200
+          initialDelaySeconds: 15
+          periodSeconds: 30
+        volumeMounts:
+        - name: elasticsearch-data
+          mountPath: /usr/share/elasticsearch/data/
+      volumes:
+        - name: elasticsearch-data
+          persistentVolumeClaim:
+            claimName: elasticsearch-pvc