update operator to support Istio 1.20

Signed-off-by: zufardhiyaulhaq <zufardhiyaulhaq@gmail.com>
zufardhiyaulhaq · Nov 19, 2023 · c4ef169 · c4ef169
1 parent ce5fdfa
commit c4ef169
Show file tree

Hide file tree

Showing 31 changed files with 143 additions and 140 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -77,8 +77,8 @@ jobs:
       strategy:
         fail-fast: false
         matrix:
-          kubernetes: ["v1.25"]
-          istio: ["1.14.6","1.15.6", "1.16.3", "1.17.1"]
+          kubernetes: ["v1.26"]
+          istio: ["1.17.8","1.18.5", "1.19.4", "1.20.0"]
       steps:
         - name: Checkout
           uses: actions/checkout@v2
@@ -132,8 +132,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes: ["v1.25"]
-        istio: ["1.14.6","1.15.6", "1.16.3", "1.17.1"]
+        kubernetes: ["v1.26"]
+        istio: ["1.17.8","1.18.5", "1.19.4", "1.20.0"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -187,8 +187,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes: ["v1.25"]
-        istio: ["1.14.6","1.15.6", "1.16.3", "1.17.1"]
+        kubernetes: ["v1.26"]
+        istio: ["1.17.8","1.18.5", "1.19.4", "1.20.0"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -242,8 +242,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes: ["v1.25"]
-        istio: ["1.14.6","1.15.6", "1.16.3", "1.17.1"]
+        kubernetes: ["v1.26"]
+        istio: ["1.17.8","1.18.5", "1.19.4", "1.20.0"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -297,8 +297,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes: ["v1.25"]
-        istio: ["1.14.6","1.15.6", "1.16.3", "1.17.1"]
+        kubernetes: ["v1.26"]
+        istio: ["1.17.8","1.18.5", "1.19.4", "1.20.0"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -352,8 +352,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes: ["v1.25"]
-        istio: ["1.14.6","1.15.6", "1.16.3", "1.17.1"]
+        kubernetes: ["v1.26"]
+        istio: ["1.17.8","1.18.5", "1.19.4", "1.20.0"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -407,8 +407,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes: ["v1.25"]
-        istio: ["1.14.6","1.15.6", "1.16.3", "1.17.1"]
+        kubernetes: ["v1.26"]
+        istio: ["1.17.8","1.18.5", "1.19.4", "1.20.0"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -462,8 +462,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes: ["v1.25"]
-        istio: ["1.14.6","1.15.6", "1.16.3", "1.17.1"]
+        kubernetes: ["v1.26"]
+        istio: ["1.17.8","1.18.5", "1.19.4", "1.20.0"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -517,8 +517,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes: ["v1.25"]
-        istio: ["1.14.6","1.15.6", "1.16.3", "1.17.1"]
+        kubernetes: ["v1.26"]
+        istio: ["1.17.8","1.18.5", "1.19.4", "1.20.0"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -572,8 +572,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes: ["v1.25"]
-        istio: ["1.14.6","1.15.6", "1.16.3", "1.17.1"]
+        kubernetes: ["v1.26"]
+        istio: ["1.17.8","1.18.5", "1.19.4", "1.20.0"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2

diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
@@ -63,8 +63,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes: ["v1.25"]
-        istio: ["1.14.6","1.15.6", "1.16.3", "1.17.1"]
+        kubernetes: ["v1.26"]
+        istio: ["1.17.8","1.18.5", "1.19.4", "1.20.0"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -118,8 +118,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes: ["v1.25"]
-        istio: ["1.14.6","1.15.6", "1.16.3", "1.17.1"]
+        kubernetes: ["v1.26"]
+        istio: ["1.17.8","1.18.5", "1.19.4", "1.20.0"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -173,8 +173,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes: ["v1.25"]
-        istio: ["1.14.6","1.15.6", "1.16.3", "1.17.1"]
+        kubernetes: ["v1.26"]
+        istio: ["1.17.8","1.18.5", "1.19.4", "1.20.0"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -228,8 +228,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes: ["v1.25"]
-        istio: ["1.14.6","1.15.6", "1.16.3", "1.17.1"]
+        kubernetes: ["v1.26"]
+        istio: ["1.17.8","1.18.5", "1.19.4", "1.20.0"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -283,8 +283,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes: ["v1.25"]
-        istio: ["1.14.6","1.15.6", "1.16.3", "1.17.1"]
+        kubernetes: ["v1.26"]
+        istio: ["1.17.8","1.18.5", "1.19.4", "1.20.0"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -338,8 +338,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes: ["v1.25"]
-        istio: ["1.14.6","1.15.6", "1.16.3", "1.17.1"]
+        kubernetes: ["v1.26"]
+        istio: ["1.17.8","1.18.5", "1.19.4", "1.20.0"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -393,8 +393,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes: ["v1.25"]
-        istio: ["1.14.6","1.15.6", "1.16.3", "1.17.1"]
+        kubernetes: ["v1.26"]
+        istio: ["1.17.8","1.18.5", "1.19.4", "1.20.0"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -448,8 +448,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes: ["v1.25"]
-        istio: ["1.14.6","1.15.6", "1.16.3", "1.17.1"]
+        kubernetes: ["v1.26"]
+        istio: ["1.17.8","1.18.5", "1.19.4", "1.20.0"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -503,8 +503,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes: ["v1.25"]
-        istio: ["1.14.6","1.15.6", "1.16.3", "1.17.1"]
+        kubernetes: ["v1.26"]
+        istio: ["1.17.8","1.18.5", "1.19.4", "1.20.0"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -558,8 +558,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes: ["v1.25"]
-        istio: ["1.14.6","1.15.6", "1.16.3", "1.17.1"]
+        kubernetes: ["v1.26"]
+        istio: ["1.17.8","1.18.5", "1.19.4", "1.20.0"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2

diff --git a/Dockerfile b/Dockerfile
@@ -10,13 +10,13 @@ COPY go.sum go.sum
 RUN go mod download
 
 # Copy the go source
-COPY main.go main.go
+COPY cmd/ cmd/
 COPY api/ api/
-COPY controllers/ controllers/
+COPY internal/controller/ internal/controller/
 COPY pkg/ pkg/
 
 # Build
-RUN CGO_ENABLED=0 GOOS=linux go build -a -o manager main.go
+RUN CGO_ENABLED=0 GOOS=linux go build -a -o manager ./cmd/main.go
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details

diff --git a/Makefile b/Makefile
@@ -49,7 +49,7 @@ endif
 # Image URL to use all building/pushing image targets
 IMG ?= controller:latest
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.24
+ENVTEST_K8S_VERSION = 1.26
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -109,12 +109,12 @@ test: manifests generate fmt vet envtest ## Run tests.
 ##@ Build
 
 .PHONY: build
-build: generate fmt vet ## Build manager binary.
-	go build -o bin/manager main.go
+build: manifests generate fmt vet ## Build manager binary.
+	go build -o bin/manager ./cmd/main.go
 
 .PHONY: run
 run: manifests generate fmt vet ## Run a controller from your host.
-	go run ./main.go
+	go run ./cmd/main.go
 
 .PHONY: docker-build
 docker-build: test ## Build docker image with the manager.
@@ -189,7 +189,8 @@ $(KUSTOMIZE): $(LOCALBIN)
 .PHONY: controller-gen
 controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
 $(CONTROLLER_GEN): $(LOCALBIN)
-	test -s $(LOCALBIN)/controller-gen || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
+	test -s $(LOCALBIN)/controller-gen && $(LOCALBIN)/controller-gen --version | grep -q $(CONTROLLER_TOOLS_VERSION) || \
+  GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
 
 .PHONY: envtest
 envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.

diff --git a/README.md b/README.md
@@ -101,20 +101,21 @@ public-gateway.method.grault-route_grault-route: unit=HOUR requests_per_unit=60
 | extraLabels | object | `{}` |  |
 | operator.image | string | `"zufardhiyaulhaq/istio-ratelimit-operator"` |  |
 | operator.replica | int | `1` |  |
-| operator.tag | string | `"v2.11.1"` |  |
+| operator.tag | string | `"v2.12.0"` |  |
 | resources.limits.cpu | string | `"512m"` |  |
 | resources.limits.memory | string | `"512Mi"` |  |
 | resources.requests.cpu | string | `"256m"` |  |
 | resources.requests.memory | string | `"256Mi"` |  |
 | serviceAccount.imagePullSecrets | list | `[]` |  |
-| settings.ratelimitservice.image | string | `"envoyproxy/ratelimit:4c088856"` |  |
-| settings.statsdExporter.image | string | `"prom/statsd-exporter:v0.23.1"` |  |
+| settings.ratelimitservice.image | string | `"envoyproxy/ratelimit:5e1be594"` |  |
+| settings.statsdExporter.image | string | `"prom/statsd-exporter:v0.25.0"` |  |
 
 ## Supported Releases
 
 | Operator Version | Istio Version |
 |-----|------|
-| 2.10.0 | <= 1.17.x |
+| 2.12.0 | <= 1.20.x |
+| 2.11.2 | <= 1.17.x |
 | 2.9.0 | <= 1.16.x |
 | 2.8.0 | <= 1.15.x |
 | 2.5.1 | <= 1.13.x |
diff --git a/charts/istio-ratelimit-operator/README.md b/charts/istio-ratelimit-operator/README.md
@@ -101,20 +101,21 @@ public-gateway.method.grault-route_grault-route: unit=HOUR requests_per_unit=60
 | extraLabels | object | `{}` |  |
 | operator.image | string | `"zufardhiyaulhaq/istio-ratelimit-operator"` |  |
 | operator.replica | int | `1` |  |
-| operator.tag | string | `"v2.11.1"` |  |
+| operator.tag | string | `"v2.12.0"` |  |
 | resources.limits.cpu | string | `"512m"` |  |
 | resources.limits.memory | string | `"512Mi"` |  |
 | resources.requests.cpu | string | `"256m"` |  |
 | resources.requests.memory | string | `"256Mi"` |  |
 | serviceAccount.imagePullSecrets | list | `[]` |  |
-| settings.ratelimitservice.image | string | `"envoyproxy/ratelimit:4c088856"` |  |
-| settings.statsdExporter.image | string | `"prom/statsd-exporter:v0.23.1"` |  |
+| settings.ratelimitservice.image | string | `"envoyproxy/ratelimit:5e1be594"` |  |
+| settings.statsdExporter.image | string | `"prom/statsd-exporter:v0.25.0"` |  |
 
 ## Supported Releases
 
 | Operator Version | Istio Version |
 |-----|------|
-| 2.10.0 | <= 1.17.x |
+| 2.12.0 | <= 1.20.x |
+| 2.11.2 | <= 1.17.x |
 | 2.9.0 | <= 1.16.x |
 | 2.8.0 | <= 1.15.x |
 | 2.5.1 | <= 1.13.x |
diff --git a/charts/istio-ratelimit-operator/README.md.gotmpl b/charts/istio-ratelimit-operator/README.md.gotmpl
@@ -103,7 +103,8 @@ public-gateway.method.grault-route_grault-route: unit=HOUR requests_per_unit=60
 
 | Operator Version | Istio Version |
 |-----|------|
-| 2.10.0 | <= 1.17.x |
+| 2.12.0 | <= 1.20.x |
+| 2.11.2 | <= 1.17.x |
 | 2.9.0 | <= 1.16.x |
 | 2.8.0 | <= 1.15.x |
 | 2.5.1 | <= 1.13.x |
diff --git a/charts/istio-ratelimit-operator/values.yaml b/charts/istio-ratelimit-operator/values.yaml
@@ -2,7 +2,7 @@ operator:
   # image of istio-ratelimit-operator
   image: "zufardhiyaulhaq/istio-ratelimit-operator"
   # tag of istio-ratelimit-operator image
-  tag: "v2.11.1"
+  tag: "v2.12.0"
   # number of replica for deployment
   replica: 1
 
@@ -16,9 +16,9 @@ resources:
 
 settings:
   ratelimitservice:
-    image: envoyproxy/ratelimit:4c088856
+    image: envoyproxy/ratelimit:5e1be594
   statsdExporter:
-    image: prom/statsd-exporter:v0.23.1
+    image: prom/statsd-exporter:v0.25.0
 
 serviceAccount:
   imagePullSecrets: []