Skip to content

Commit 4127efb

Browse files
jeesmonjeesmon
committed
Support for replicating EnvoyFilter resource
1 parent c372a6a commit 4127efb

File tree

7 files changed

+274
-23
lines changed

7 files changed

+274
-23
lines changed

‎deploy/helm-chart/kubernetes-replicator/values.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ serviceAccount:
2222
create: true
2323
annotations: {}
2424
name:
25-
privileges: []
25+
privileges:
26+
- apiGroups: ["networking.istio.io"]
27+
resources: ["envoyfilters"]
2628
automountServiceAccountToken: true
27-
# - apiGroups: [""]
28-
# resources: ["configmaps"]
2929
podSecurityContext: {}
3030
# fsGroup: 2000
3131

‎deploy/rbac.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ rules:
1818
- apiGroups: ["rbac.authorization.k8s.io"]
1919
resources: ["roles", "rolebindings"]
2020
verbs: ["get", "watch", "list", "create", "update", "patch", "delete"]
21+
- apiGroups: ["networking.istio.io"]
22+
resources: ["envoyfilters"]
23+
verbs: ["get", "watch", "list", "create", "update", "patch", "delete"]
2124
---
2225
apiVersion: rbac.authorization.k8s.io/v1
2326
kind: ClusterRoleBinding

‎go.mod‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ require (
77
github.com/pkg/errors v0.9.1
88
github.com/sirupsen/logrus v1.9.3
99
github.com/stretchr/testify v1.8.4
10+
istio.io/client-go v1.19.0
1011
k8s.io/api v0.28.1
1112
k8s.io/apimachinery v0.28.1
1213
k8s.io/client-go v0.28.1
@@ -35,21 +36,24 @@ require (
3536
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3637
github.com/pmezard/go-difflib v1.0.0 // indirect
3738
github.com/spf13/pflag v1.0.5 // indirect
38-
golang.org/x/net v0.13.0 // indirect
39+
golang.org/x/net v0.14.0 // indirect
3940
golang.org/x/oauth2 v0.8.0 // indirect
40-
golang.org/x/sys v0.10.0 // indirect
41-
golang.org/x/term v0.10.0 // indirect
42-
golang.org/x/text v0.11.0 // indirect
41+
golang.org/x/sys v0.11.0 // indirect
42+
golang.org/x/term v0.11.0 // indirect
43+
golang.org/x/text v0.12.0 // indirect
4344
golang.org/x/time v0.3.0 // indirect
4445
google.golang.org/appengine v1.6.7 // indirect
45-
google.golang.org/protobuf v1.30.0 // indirect
46+
google.golang.org/genproto v0.0.0-20230815205213-6bfd019c3878 // indirect
47+
google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect
48+
google.golang.org/protobuf v1.31.0 // indirect
4649
gopkg.in/inf.v0 v0.9.1 // indirect
4750
gopkg.in/yaml.v2 v2.4.0 // indirect
4851
gopkg.in/yaml.v3 v3.0.1 // indirect
52+
istio.io/api v1.19.0-beta.1.0.20230821193953-6d232ba686ad // indirect
4953
k8s.io/klog/v2 v2.100.1 // indirect
5054
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
5155
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
5256
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
53-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
57+
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
5458
sigs.k8s.io/yaml v1.3.0 // indirect
5559
)

‎go.sum‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR
9191
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
9292
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
9393
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
94-
golang.org/x/net v0.13.0 h1:Nvo8UFsZ8X3BhAC9699Z1j7XQ3rsZnUUm7jfBEk1ueY=
95-
golang.org/x/net v0.13.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
94+
golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
95+
golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
9696
golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8=
9797
golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE=
9898
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -102,15 +102,15 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
102102
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
103103
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
104104
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
105-
golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
106-
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
107-
golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c=
108-
golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
105+
golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
106+
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
107+
golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0=
108+
golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU=
109109
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
110110
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
111111
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
112-
golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
113-
golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
112+
golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
113+
golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
114114
golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
115115
golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
116116
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -124,10 +124,14 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
124124
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
125125
google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
126126
google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
127+
google.golang.org/genproto v0.0.0-20230815205213-6bfd019c3878 h1:Iveh6tGCJkHAjJgEqUQYGDGgbwmhjoAOz8kO/ajxefY=
128+
google.golang.org/genproto v0.0.0-20230815205213-6bfd019c3878/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4=
129+
google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 h1:nIgk/EEq3/YlnmVVXVnm14rC2oxgs1o0ong4sD/rd44=
130+
google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5/go.mod h1:5DZzOUPCLYL3mNkQ0ms0F3EuUNZ7py1Bqeq6sxzI7/Q=
127131
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
128132
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
129-
google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
130-
google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
133+
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
134+
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
131135
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
132136
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
133137
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -139,6 +143,10 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
139143
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
140144
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
141145
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
146+
istio.io/api v1.19.0-beta.1.0.20230821193953-6d232ba686ad h1:4Hf6TxxeM1pi2mqoWU0nR4lezZXs9lCdLrgFdBH+moQ=
147+
istio.io/api v1.19.0-beta.1.0.20230821193953-6d232ba686ad/go.mod h1:KstZe4bKbXouALUJ5PqpjNEhu5nj90HrDFitZfpNhlU=
148+
istio.io/client-go v1.19.0 h1:vdiwlg+cocs7J2aVlkYz3ebjpBpRAorfZUOzqjE2Z+U=
149+
istio.io/client-go v1.19.0/go.mod h1:zG9fwlp6qSvxlErRgc8X46CLC3Ga91cGR5ADUqEAQYU=
142150
k8s.io/api v0.28.1 h1:i+0O8k2NPBCPYaMB+uCkseEbawEt/eFaiRqUx8aB108=
143151
k8s.io/api v0.28.1/go.mod h1:uBYwID+66wiL28Kn2tBjBYQdEU0Xk0z5qF8bIBqk/Dg=
144152
k8s.io/apimachinery v0.28.1 h1:EJD40og3GizBSV3mkIoXQBsws32okPOy+MkRyzh6nPY=
@@ -153,7 +161,7 @@ k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrC
153161
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
154162
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
155163
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
156-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
157-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
164+
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 h1:UZbZAZfX0wV2zr7YZorDz6GXROfDFj6LvqCRm4VUVKk=
165+
sigs.k8s.io/structured-merge-diff/v4 v4.3.0/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
158166
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
159167
sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=

‎main.go‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ import (
88

99
"github.com/mittwald/kubernetes-replicator/replicate/common"
1010
"github.com/mittwald/kubernetes-replicator/replicate/configmap"
11+
"github.com/mittwald/kubernetes-replicator/replicate/envoyfilter"
1112
"github.com/mittwald/kubernetes-replicator/replicate/role"
1213
"github.com/mittwald/kubernetes-replicator/replicate/rolebinding"
1314
"github.com/mittwald/kubernetes-replicator/replicate/secret"
1415
"github.com/mittwald/kubernetes-replicator/replicate/serviceaccount"
16+
"istio.io/client-go/pkg/clientset/versioned"
1517

1618
log "github.com/sirupsen/logrus"
1719

@@ -80,12 +82,14 @@ func main() {
8082
}
8183

8284
client = kubernetes.NewForConfigOrDie(config)
85+
istioClient := versioned.NewForConfigOrDie(config)
8386

8487
secretRepl := secret.NewReplicator(client, f.ResyncPeriod, f.AllowAll)
8588
configMapRepl := configmap.NewReplicator(client, f.ResyncPeriod, f.AllowAll)
8689
roleRepl := role.NewReplicator(client, f.ResyncPeriod, f.AllowAll)
8790
roleBindingRepl := rolebinding.NewReplicator(client, f.ResyncPeriod, f.AllowAll)
8891
serviceAccountRepl := serviceaccount.NewReplicator(client, f.ResyncPeriod, f.AllowAll)
92+
envoyFilterRepl := envoyfilter.NewReplicator(client, f.ResyncPeriod, f.AllowAll, istioClient)
8993

9094
go secretRepl.Run()
9195

@@ -97,8 +101,10 @@ func main() {
97101

98102
go serviceAccountRepl.Run()
99103

104+
go envoyFilterRepl.Run()
105+
100106
h := liveness.Handler{
101-
Replicators: []common.Replicator{secretRepl, configMapRepl, roleRepl, roleBindingRepl, serviceAccountRepl},
107+
Replicators: []common.Replicator{secretRepl, configMapRepl, roleRepl, roleBindingRepl, serviceAccountRepl, envoyFilterRepl},
102108
}
103109

104110
log.Infof("starting liveness monitor at %s", f.StatusAddr)

‎replicate/common/generic-replicator.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@ package common
33
import (
44
"context"
55
"fmt"
6-
"k8s.io/apimachinery/pkg/labels"
76
"reflect"
87
"regexp"
98
"strconv"
109
"strings"
1110
"time"
1211

12+
"istio.io/client-go/pkg/clientset/versioned"
13+
"k8s.io/apimachinery/pkg/labels"
14+
1315
"github.com/hashicorp/go-multierror"
1416
"github.com/pkg/errors"
1517
log "github.com/sirupsen/logrus"
@@ -24,6 +26,7 @@ import (
2426
type ReplicatorConfig struct {
2527
Kind string
2628
Client kubernetes.Interface
29+
IstioClient versioned.Interface
2730
ResyncPeriod time.Duration
2831
AllowAll bool
2932
ListFunc cache.ListFunc

0 commit comments

Comments
 (0)