From fcfc0ac6889c00af410a758a6b8a4a1188076f6e Mon Sep 17 00:00:00 2001
From: xiaowei <403828237@qq.com>
Date: Sat, 15 Jan 2022 18:36:37 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20ci=E6=96=87=E4=BB=B6=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .dockerignore                                 |  6 +++++
 .gitignore                                    |  1 +
 main.go => app/services/sales-api/main.go     |  0
 makefile                                      | 23 ++++++++++---------
 .../{Dockerfile => dockerfile.sales-api}      | 12 +++++-----
 .../base-sales.yaml}                          | 14 +++++------
 .../kustomization.yaml                        |  2 +-
 .../kind-sales-patch.yaml}                    | 12 +++++-----
 zarf/k8s/kind/sales-pod/kustomization.yaml    | 10 ++++++++
 zarf/k8s/kind/service-pod/kustomization.yaml  |  6 -----
 10 files changed, 49 insertions(+), 37 deletions(-)
 create mode 100644 .dockerignore
 rename main.go => app/services/sales-api/main.go (100%)
 rename zarf/docker/{Dockerfile => dockerfile.sales-api} (60%)
 rename zarf/k8s/base/{service-pod/base-service.yaml => sales-pod/base-sales.yaml} (60%)
 rename zarf/k8s/base/{service-pod => sales-pod}/kustomization.yaml (76%)
 rename zarf/k8s/kind/{service-pod/kind-servicepatch.yaml => sales-pod/kind-sales-patch.yaml} (68%)
 create mode 100644 zarf/k8s/kind/sales-pod/kustomization.yaml
 delete mode 100644 zarf/k8s/kind/service-pod/kustomization.yaml

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..27b083a
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,6 @@
+.git/
+makefile
+readme.md
+zarf/docker
+zarf/k8s
+.dockerignore
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 485dee6..2fc2d79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .idea
+app/services/sales-api/sales-api
\ No newline at end of file
diff --git a/main.go b/app/services/sales-api/main.go
similarity index 100%
rename from main.go
rename to app/services/sales-api/main.go
diff --git a/makefile b/makefile
index 356679e..7e2f0f9 100644
--- a/makefile
+++ b/makefile
@@ -9,14 +9,14 @@ build:
 # =========================================================
 # Building containers
 
-VERSION :=1.0
+VERSION :=1.1
 
-all: service
+all: sales-api
 
-service:
+sales-api:
 	docker build \
-    -f zarf/docker/Dockerfile \
-    -t service-amd64:$(VERSION) \
+    -f zarf/docker/dockerfile.sales-api \
+    -t sales-api-amd64:$(VERSION) \
     --build-arg BUILD_REF=$(VERSION) \
     --build-arg BUILD_DATA=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
     .
@@ -31,7 +31,7 @@ kind-up:
 		--image kindest/node:v1.21.1 \
 		--name $(KIND_CLUSTER) \
 		--config zarf/k8s/kind/kind-config.yaml
-	kubectl config set-context --current --namespace service-system
+	kubectl config set-context --current --namespace sales-system
 
 kind-down:
 	kind delete cluster --name $(KIND_CLUSTER)
@@ -42,16 +42,17 @@ kind-status:
 	kubectl get pods -o wide
 
 kind-load:
-	kind load docker-image service-amd64:$(VERSION) --name $(KIND_CLUSTER)
+	cd zarf/k8s/kind/sales-pod; kustomize edit set image sales-api-image=sales-api-amd64:$(VERSION)
+	kind load docker-image sales-api-amd64:$(VERSION) --name $(KIND_CLUSTER)
 
 kind-apply:
-	kustomize build zarf/k8s/kind/service-pod|kubectl apply -f -
+	kustomize build zarf/k8s/kind/sales-pod|kubectl apply -f -
 
 kind-logs:
-	kubectl logs -f -l app=service --all-containers=true
+	kubectl logs -f -l app=sales --all-containers=true
 
 kind-restart:
-	kubectl rollout restart deployment service-pod
+	kubectl rollout restart deployment sales-pod
 
 kind-update: all kind-load kind-restart
 
@@ -60,7 +61,7 @@ kind-update-apply: all kind-load kind-apply
 kind-describe:
 	kubectl describe node
 	kubectl describe svc
-	kubectl describe deployment service-pod
+	kubectl describe deployment sales-pod
 
 # =========================================================
 # Modules support
diff --git a/zarf/docker/Dockerfile b/zarf/docker/dockerfile.sales-api
similarity index 60%
rename from zarf/docker/Dockerfile
rename to zarf/docker/dockerfile.sales-api
index 52557d4..f9f81ac 100644
--- a/zarf/docker/Dockerfile
+++ b/zarf/docker/dockerfile.sales-api
@@ -8,7 +8,7 @@ ARG BUILD_REF
 COPY . /service
 
 # Build the service binary
-WORKDIR /service
+WORKDIR /service/app/services/sales-api
 RUN go build -ldflags "-X main.build=${BUILD_REF}"
 
 
@@ -17,13 +17,13 @@ RUN go build -ldflags "-X main.build=${BUILD_REF}"
 FROM alpine:3.14
 ARG BUILD_DATE
 ARG BUILD_REF
-COPY --from=build_sales-api /service/service /service/service
+COPY --from=build_sales-api /service/app/services/sales-api/sales-api /service/sales-api
 WORKDIR /service
-CMD ["./service"]
+CMD ["./sales-api"]
 
 LABEL org.opencontainers.image.created="${BUILD_DATE}" \
-      org.opencontainers.image.title="service" \
-      org.opencontainers.image.author="xiaoweihong" \
-      org.opencontainers.image.source="git.hongxiaowei.com/xiaowei/service" \
+      org.opencontainers.image.title="sales-api" \
+      org.opencontainers.image.author="Xiaoweihong" \
+      org.opencontainers.image.source="https://git.hongxiaowei.com/xiaowei/service/app/sales-api" \
       org.opencontainers.image.revision="${BUILD_REF}" \
       org.opencontainers.image.vendor="Xiao Wei"
diff --git a/zarf/k8s/base/service-pod/base-service.yaml b/zarf/k8s/base/sales-pod/base-sales.yaml
similarity index 60%
rename from zarf/k8s/base/service-pod/base-service.yaml
rename to zarf/k8s/base/sales-pod/base-sales.yaml
index 996d5e9..acdeeef 100644
--- a/zarf/k8s/base/service-pod/base-service.yaml
+++ b/zarf/k8s/base/sales-pod/base-sales.yaml
@@ -1,26 +1,26 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: service-system
+  name: sales-system
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: service-pod
-  namespace: service-system
+  name: sales-pod
+  namespace: sales-system
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: service
+      app: sales
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        app: service
+        app: sales
     spec:
       hostNetwork: true
       containers:
-        - name: service-api
-          image: service-amd64:1.0
\ No newline at end of file
+        - name: sales-api
+          image: sales-api-image
\ No newline at end of file
diff --git a/zarf/k8s/base/service-pod/kustomization.yaml b/zarf/k8s/base/sales-pod/kustomization.yaml
similarity index 76%
rename from zarf/k8s/base/service-pod/kustomization.yaml
rename to zarf/k8s/base/sales-pod/kustomization.yaml
index 0145e09..a034e5b 100644
--- a/zarf/k8s/base/service-pod/kustomization.yaml
+++ b/zarf/k8s/base/sales-pod/kustomization.yaml
@@ -1,4 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ./base-service.yaml
\ No newline at end of file
+  - ./base-sales.yaml
\ No newline at end of file
diff --git a/zarf/k8s/kind/service-pod/kind-servicepatch.yaml b/zarf/k8s/kind/sales-pod/kind-sales-patch.yaml
similarity index 68%
rename from zarf/k8s/kind/service-pod/kind-servicepatch.yaml
rename to zarf/k8s/kind/sales-pod/kind-sales-patch.yaml
index e4d152b..343b44b 100644
--- a/zarf/k8s/kind/service-pod/kind-servicepatch.yaml
+++ b/zarf/k8s/kind/sales-pod/kind-sales-patch.yaml
@@ -1,23 +1,23 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: service-pod
-  namespace: service-system
+  name: sales-pod
+  namespace: sales-system
 spec:
   replicas: 1
   strategy:
     type: Recreate
   selector:
     matchLabels:
-      app: service
+      app: sales
   template:
     metadata:
       labels:
-        app: service
+        app: sales
     spec:
       containers:
-        # service container configuration
-        - name: service-api
+        # sales container configuration
+        - name: sales-api
           resources:
             limits:
               cpu: "1000m" # Up to 2 full cores
diff --git a/zarf/k8s/kind/sales-pod/kustomization.yaml b/zarf/k8s/kind/sales-pod/kustomization.yaml
new file mode 100644
index 0000000..0ee1d36
--- /dev/null
+++ b/zarf/k8s/kind/sales-pod/kustomization.yaml
@@ -0,0 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../../base/sales-pod/
+patchesStrategicMerge:
+- kind-sales-patch.yaml
+images:
+- name: sales-api-image
+  newName: sales-api-amd64
+  newTag: "1.1"
diff --git a/zarf/k8s/kind/service-pod/kustomization.yaml b/zarf/k8s/kind/service-pod/kustomization.yaml
deleted file mode 100644
index cfd573b..0000000
--- a/zarf/k8s/kind/service-pod/kustomization.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - ../../base/service-pod/
-patchesStrategicMerge:
-  - kind-servicepatch.yaml
\ No newline at end of file