base/app-resign/app-resign-deployment.yaml

@@ -1,23 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: app-resign-api
-  labels:
-    app: app-resign-api
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: app-resign-api
-  template:
-    metadata:
-      labels:
-        app: app-resign-api
-    spec:
-      containers:
-        - name: app-resign-api
-          image: juyou.tencentcloudcr.com/juyoutech/app-resign:latest
-          ports:
-            - containerPort: 3000
-      imagePullSecrets:
-        - name: juyou-docker-tcr-secret

base/app-resign/app-resign-role.yaml

@@ -1,14 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: app-resign-role
-rules:
-  - apiGroups: ["batch"]
-    resources: ["jobs"]
-    verbs: ["list", "create", "delete", "get", "watch"]
-  - apiGroups: [""]
-    resources: ["pods"]
-    verbs: ["list", "get", "watch"]
-  - apiGroups: [""]
-    resources: ["pods/log"]
-    verbs: ["get"]

base/app-resign/app-resign-service.yaml

@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: app-resign-api-service
-spec:
-  ports:
-    - port: 80
-      targetPort: 3000
-      name: app-resign-api
-  selector:
-    app: app-resign-api

base/app-resign/kustomization.yaml

@@ -1,6 +0,0 @@
-resources:
-  - app-resign-service-account.yaml
-  - app-resign-role.yaml
-  - app-resign-role-binding.yaml
-  - app-resign-deployment.yaml
-  - app-resign-service.yaml

base/download/app-resign-role.yaml

@@ -0,0 +1,8 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: app-resign-role
+rules:
+  - apiGroups: [ "batch", "extensions", "apps" ]
+    resources: [ "jobs", "deployments", "pods", "pods/log" ]
+    verbs: [ "create", "get", "list", "watch", "create", "delete", "update", "patch" ]

base/download/download-api-deployment.yaml

@@ -12,6 +12,7 @@ spec:
       labels:
         app: download-api
     spec:
+      serviceAccountName: app-resign-service-account
       containers:
         - name: download-api
           image: juyou.tencentcloudcr.com/juyoutech/download_api:latest

base/download/kustomization.yaml

@@ -3,3 +3,6 @@ resources:
   - download-api-service.yaml
   - download-deployment.yaml
   - download-service.yaml
+  - app-resign-service-account.yaml
+  - app-resign-role.yaml
+  - app-resign-role-binding.yaml

gp2505/kustomization.yaml

@@ -14,7 +14,6 @@ resources:
   - ../base/tls
   - ../base/basic-auth
   - ../base/haproxy
-  - ../base/app-resign
   - ingress.yaml
 
 configMapGenerator:

gp2505/patch/app-resign-deployment_patch.yaml

@@ -1,22 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: app-resign-api
-spec:
-  replicas: 3
-  template:
-    spec:
-      containers:
-        - name: app-resign-api
-          image: juyou.tencentcloudcr.com/juyoutech/app-resign:latest
-          imagePullPolicy: Always
-          envFrom:
-            - configMapRef:
-                name: mysql-configmap
-            - configMapRef:
-                name: redis-configmap
-            - configMapRef:
-                name: storage-configmap
-          env:
-            - name: TZ
-              value: "Asia/Shanghai"

test.bat

@@ -1 +1 @@
-kubectl apply --dry-run=client -k gp2505
+kubectl apply --dry-run=client -k gp2504