@@ -59,11 +59,11 @@ type VirtualServiceSpec struct {
59
59
}
60
60
61
61
func VirtualService (spec * VirtualServiceSpec ) * kunstructured.Unstructured {
62
- virtualServceConfig := & kunstructured.Unstructured {}
63
- virtualServceConfig .SetGroupVersionKind (virtualServiceGVK )
64
- virtualServceConfig .SetName (spec .Name )
65
- virtualServceConfig .SetNamespace (spec .Namespace )
66
- virtualServceConfig .Object ["metadata" ] = map [string ]interface {}{
62
+ virtualServiceConfig := & kunstructured.Unstructured {}
63
+ virtualServiceConfig .SetGroupVersionKind (virtualServiceGVK )
64
+ virtualServiceConfig .SetName (spec .Name )
65
+ virtualServiceConfig .SetNamespace (spec .Namespace )
66
+ virtualServiceConfig .Object ["metadata" ] = map [string ]interface {}{
67
67
"name" : spec .Name ,
68
68
"namespace" : spec .Namespace ,
69
69
"labels" : spec .Labels ,
@@ -74,7 +74,7 @@ func VirtualService(spec *VirtualServiceSpec) *kunstructured.Unstructured {
74
74
"match" : []map [string ]interface {}{
75
75
{
76
76
"uri" : map [string ]interface {}{
77
- "prefix" : urls .CannonicalizeEndpoint (spec .Path ),
77
+ "prefix" : urls .CanonicalizeEndpoint (spec .Path ),
78
78
},
79
79
},
80
80
},
@@ -90,19 +90,19 @@ func VirtualService(spec *VirtualServiceSpec) *kunstructured.Unstructured {
90
90
},
91
91
}
92
92
93
- if spec .Rewrite != nil && urls .CannonicalizeEndpoint (* spec .Rewrite ) != urls .CannonicalizeEndpoint (spec .Path ) {
93
+ if spec .Rewrite != nil && urls .CanonicalizeEndpoint (* spec .Rewrite ) != urls .CanonicalizeEndpoint (spec .Path ) {
94
94
httpSpec ["rewrite" ] = map [string ]interface {}{
95
- "uri" : urls .CannonicalizeEndpoint (* spec .Rewrite ),
95
+ "uri" : urls .CanonicalizeEndpoint (* spec .Rewrite ),
96
96
}
97
97
}
98
98
99
- virtualServceConfig .Object ["spec" ] = map [string ]interface {}{
99
+ virtualServiceConfig .Object ["spec" ] = map [string ]interface {}{
100
100
"hosts" : []string {"*" },
101
101
"gateways" : spec .Gateways ,
102
102
"http" : []map [string ]interface {}{httpSpec },
103
103
}
104
104
105
- return virtualServceConfig
105
+ return virtualServiceConfig
106
106
}
107
107
108
108
func (c * Client ) CreateVirtualService (spec * kunstructured.Unstructured ) (* kunstructured.Unstructured , error ) {
@@ -288,7 +288,7 @@ func GetVirtualServiceEndpoints(virtualService *kunstructured.Unstructured) (str
288
288
return nil , errors .New ("prefix is not a string" ) // unexpected
289
289
}
290
290
291
- endpoints .Add (urls .CannonicalizeEndpoint (prefix ))
291
+ endpoints .Add (urls .CanonicalizeEndpoint (prefix ))
292
292
}
293
293
}
294
294
0 commit comments