Skip to content

Commit

Permalink
fix: convertkusionprobetov1probe
Browse files Browse the repository at this point in the history
  • Loading branch information
Liuxingyu1111111 committed Jun 5, 2024
1 parent ed07c4e commit 8057870
Show file tree
Hide file tree
Showing 3 changed files with 113 additions and 10 deletions.
103 changes: 103 additions & 0 deletions pkg/modules/generators/workload/service_generator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,54 @@ spec:
name: default-dev-foo-nginx-0
name: default-dev-foo-nginx-0
status: {}
`
deployWithProbe := `apiVersion: apps/v1
kind: Deployment
metadata:
creationTimestamp: null
labels:
app.kubernetes.io/name: foo
app.kubernetes.io/part-of: default
service-workload-type: Deployment
name: default-dev-foo
namespace: default
spec:
replicas: 4
selector:
matchLabels:
app.kubernetes.io/name: foo
app.kubernetes.io/part-of: default
strategy: {}
template:
metadata:
creationTimestamp: null
labels:
app.kubernetes.io/name: foo
app.kubernetes.io/part-of: default
service-workload-type: Deployment
spec:
containers:
- image: nginx:v1
lifecycle:
postStart:
exec:
command:
- /bin/true
name: nginx
readinessProbe:
tcpSocket:
host: localhost
port: 8888
resources: {}
volumeMounts:
- mountPath: /tmp
name: default-dev-foo-nginx-0
volumes:
- configMap:
defaultMode: 511
name: default-dev-foo-nginx-0
name: default-dev-foo-nginx-0
status: {}
`
r2 := new(int32)
*r2 = 2
Expand Down Expand Up @@ -263,6 +311,61 @@ status: {}
wantErr: false,
want: []string{cm, deploy, deploySvc},
},
{
name: "DeploymentWithProbe",
fields: fields{
project: "default",
stack: "dev",
appName: "foo",
service: &v1.Service{
Base: v1.Base{
Containers: map[string]v1.Container{
"nginx": {
Image: "nginx:v1",
Files: map[string]v1.FileSpec{
"/tmp/example.txt": {
Content: "some file contents",
Mode: "0777",
},
},
ReadinessProbe: &v1.Probe{ProbeHandler: &v1.ProbeHandler{
TypeWrapper: v1.TypeWrapper{Type: v1.TypeTCP},
ExecAction: nil,
HTTPGetAction: nil,
TCPSocketAction: &v1.TCPSocketAction{URL: "localhost:8888"},
}},
Lifecycle: &v1.Lifecycle{
PostStart: &v1.LifecycleHandler{
TypeWrapper: v1.TypeWrapper{Type: v1.TypeExec},
ExecAction: &v1.ExecAction{Command: []string{
"/bin/true",
}},
HTTPGetAction: nil,
},
},
},
},
},
Ports: []v1.Port{
{
Port: 80,
Protocol: "TCP",
},
},
},
serviceConfig: v1.GenericConfig{
"replicas": 4,
"labels": v1.GenericConfig{
"service-workload-type": "Deployment",
},
},
},
args: args{
spec: &v1.Spec{},
},
wantErr: false,
want: []string{cm, deployWithProbe, deploySvc},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
Expand Down
10 changes: 5 additions & 5 deletions pkg/modules/generators/workload/workload_generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -253,15 +253,15 @@ func convertKusionProbeToV1Probe(p *v1.Probe) (*corev1.Probe, error) {
}
probeHandler := p.ProbeHandler
switch probeHandler.Type {
case "Http":
case v1.TypeHTTP:
action, err := httpGetAction(probeHandler.HTTPGetAction.URL, probeHandler.Headers)
if err != nil {
return nil, err
}
result.HTTPGet = action
case "Exec":
case v1.TypeExec:
result.Exec = &corev1.ExecAction{Command: probeHandler.Command}
case "Tcp":
case v1.TypeTCP:
action, err := tcpSocketAction(probeHandler.TCPSocketAction.URL)
if err != nil {
return nil, err
Expand Down Expand Up @@ -294,13 +294,13 @@ func convertKusionLifecycleToV1Lifecycle(l *v1.Lifecycle) (*corev1.Lifecycle, er
func lifecycleHandler(in *v1.LifecycleHandler) (*corev1.LifecycleHandler, error) {
result := &corev1.LifecycleHandler{}
switch in.Type {
case "Http":
case v1.TypeHTTP:
action, err := httpGetAction(in.HTTPGetAction.URL, in.Headers)
if err != nil {
return nil, err
}
result.HTTPGet = action
case "Exec":
case v1.TypeExec:
result.Exec = &corev1.ExecAction{Command: in.Command}
}
return result, nil
Expand Down
10 changes: 5 additions & 5 deletions pkg/modules/generators/workload/workload_generator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ func TestToOrderedContainers(t *testing.T) {
LivenessProbe: &v1.Probe{
ProbeHandler: &v1.ProbeHandler{
TypeWrapper: v1.TypeWrapper{
Type: "Exec",
Type: v1.TypeExec,
},
ExecAction: &v1.ExecAction{
Command: []string{"/bin/sh", "-c", "echo live"},
Expand All @@ -285,7 +285,7 @@ func TestToOrderedContainers(t *testing.T) {
ReadinessProbe: &v1.Probe{
ProbeHandler: &v1.ProbeHandler{
TypeWrapper: v1.TypeWrapper{
Type: "Http",
Type: v1.TypeHTTP,
},
HTTPGetAction: &v1.HTTPGetAction{
URL: "http://localhost:8080/readiness",
Expand All @@ -299,7 +299,7 @@ func TestToOrderedContainers(t *testing.T) {
StartupProbe: &v1.Probe{
ProbeHandler: &v1.ProbeHandler{
TypeWrapper: v1.TypeWrapper{
Type: "Tcp",
Type: v1.TypeTCP,
},
TCPSocketAction: &v1.TCPSocketAction{
URL: "10.0.0.1:8888",
Expand Down Expand Up @@ -354,15 +354,15 @@ func TestToOrderedContainers(t *testing.T) {
Lifecycle: &v1.Lifecycle{
PreStop: &v1.LifecycleHandler{
TypeWrapper: v1.TypeWrapper{
Type: "Exec",
Type: v1.TypeExec,
},
ExecAction: &v1.ExecAction{
Command: []string{"/bin/sh", "-c", "echo live"},
},
},
PostStart: &v1.LifecycleHandler{
TypeWrapper: v1.TypeWrapper{
Type: "Http",
Type: v1.TypeHTTP,
},
HTTPGetAction: &v1.HTTPGetAction{
URL: "http://localhost:8080/readiness",
Expand Down

0 comments on commit 8057870

Please sign in to comment.