Skip to content

Commit aa3e594

Browse files
authored
remove kube-rbac-proxy (#803)
* remove kube-rbac-proxy * go mod tidy * make generate * fix in chart
1 parent 7a9d4f9 commit aa3e594

File tree

11 files changed

+102
-40
lines changed

11 files changed

+102
-40
lines changed

api/compute/v1alpha1/zz_generated.deepcopy.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

charts/function-mesh-operator/templates/controller-manager-deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ spec:
2626
prometheus.io/scrape: "true"
2727
prometheus.io/path: "/metrics"
2828
prometheus.io/port: "{{ .Values.controllerManager.metrics.port }}"
29-
traffic.sidecar.istio.io/excludeInboundPorts: '9443'
29+
traffic.sidecar.istio.io/excludeInboundPorts: '9443,8443'
3030
spec:
3131
{{- if .Values.controllerManager.serviceAccount }}
3232
serviceAccount: {{ .Values.controllerManager.serviceAccount }}

charts/function-mesh-operator/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ controllerManager:
6363
configFile: /etc/config/config.yaml
6464
enableLeaderElection: true
6565
metrics:
66-
port: 8080
66+
port: 8443
6767
healthProbe:
6868
port: 8000
6969
pprof:

config/default/manager_auth_proxy_patch.yaml

+5-18
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,12 @@ spec:
99
template:
1010
spec:
1111
containers:
12-
- name: kube-rbac-proxy
13-
image: docker.cloudsmith.io/streamnative/mirrors/gcr.io/kubebuilder/kube-rbac-proxy@sha256:67ecb332573384515406ebd71816781366b70adb0eb66345e5980e92603373e1
14-
args:
15-
- "--secure-listen-address=0.0.0.0:8443"
16-
- "--upstream=http://127.0.0.1:8080/"
17-
- "--logtostderr=true"
18-
- "--v=10"
19-
ports:
20-
- containerPort: 8443
21-
name: https
22-
resources:
23-
limits:
24-
cpu: 500m
25-
memory: 500Mi
26-
requests:
27-
cpu: 100m
28-
memory: 20Mi
2912
- name: manager
3013
args:
31-
- "--metrics-addr=127.0.0.1:8080"
14+
- "--metrics-addr=0.0.0.0:8443"
3215
- "--enable-leader-election"
3316
- "--namespaced-backend-config=backend-config"
17+
ports:
18+
- containerPort: 8443
19+
name: metrics
20+
protocol: TCP

config/default/manager_metrics_patch.yaml

+1-8
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,4 @@ spec:
99
annotations:
1010
prometheus.io/scrape: "true"
1111
prometheus.io/path: "/metrics"
12-
prometheus.io/port: "8080"
13-
spec:
14-
containers:
15-
- name: manager
16-
ports:
17-
- containerPort: 8080
18-
name: http-metrics
19-
protocol: TCP
12+
prometheus.io/port: "8443"

config/manager/manager.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
template:
2323
metadata:
2424
annotations:
25-
traffic.sidecar.istio.io/excludeInboundPorts: '9443'
25+
traffic.sidecar.istio.io/excludeInboundPorts: '9443,8443'
2626
labels:
2727
control-plane: controller-manager
2828
app: function-mesh-operator

config/manifests/bases/function-mesh.clusterserviceversion.yaml

+2-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
alm-examples: '[]'
66
capabilities: Full Lifecycle
77
categories: Streaming & Messaging
8-
containerImage: streamnative/function-mesh-operator:v0.0.0
8+
containerImage: docker-proxy.streamnative.io/streamnative/function-mesh-operator:v0.0.0
99
description: The Function Mesh Operator manages the Pulsar Functions and Connectors
1010
deployed on a Kubernetes cluster.
1111
operatorhub.io/ui-metadata-max-k8s-version: "1.26"
@@ -77,8 +77,6 @@ spec:
7777
name: StreamNative
7878
url: https://streamnative.io
7979
relatedImages:
80-
- image: streamnative/function-mesh-operator:v0.0.0
80+
- image: docker-proxy.streamnative.io/streamnative/function-mesh-operator:v0.0.0
8181
name: function-mesh
82-
- image: docker.cloudsmith.io/streamnative/mirrors/gcr.io/kubebuilder/kube-rbac-proxy@sha256:67ecb332573384515406ebd71816781366b70adb0eb66345e5980e92603373e1
83-
name: kube-rbac-proxy
8482
version: 0.0.0

go.mod

+23
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,21 @@ require (
2727
require (
2828
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
2929
github.com/99designs/keyring v1.2.1 // indirect
30+
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
3031
github.com/beorn7/perks v1.0.1 // indirect
32+
github.com/blang/semver/v4 v4.0.0 // indirect
33+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
3134
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3235
github.com/danieljoos/wincred v1.1.2 // indirect
3336
github.com/davecgh/go-spew v1.1.1 // indirect
3437
github.com/dvsekhvalnov/jose2go v1.6.0 // indirect
3538
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
3639
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
3740
github.com/fatih/color v1.7.0 // indirect
41+
github.com/felixge/httpsnoop v1.0.4 // indirect
3842
github.com/fsnotify/fsnotify v1.7.0 // indirect
3943
github.com/ghodss/yaml v1.0.0 // indirect
44+
github.com/go-logr/stdr v1.2.2 // indirect
4045
github.com/go-logr/zapr v1.3.0 // indirect
4146
github.com/go-openapi/jsonpointer v0.19.6 // indirect
4247
github.com/go-openapi/jsonreference v0.20.2 // indirect
@@ -46,11 +51,13 @@ require (
4651
github.com/golang-jwt/jwt v3.2.1+incompatible // indirect
4752
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
4853
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
54+
github.com/google/cel-go v0.17.8 // indirect
4955
github.com/google/gnostic-models v0.6.8 // indirect
5056
github.com/google/go-cmp v0.6.0 // indirect
5157
github.com/google/gofuzz v1.2.0 // indirect
5258
github.com/google/uuid v1.6.0 // indirect
5359
github.com/gorilla/websocket v1.5.0 // indirect
60+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
5461
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
5562
github.com/imdario/mergo v0.3.12 // indirect
5663
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -77,25 +84,41 @@ require (
7784
github.com/prometheus/procfs v0.12.0 // indirect
7885
github.com/spf13/cobra v1.7.0 // indirect
7986
github.com/spf13/pflag v1.0.5 // indirect
87+
github.com/stoewer/go-strcase v1.2.0 // indirect
88+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
89+
go.opentelemetry.io/otel v1.19.0 // indirect
90+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
91+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
92+
go.opentelemetry.io/otel/metric v1.19.0 // indirect
93+
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
94+
go.opentelemetry.io/otel/trace v1.19.0 // indirect
95+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
8096
go.uber.org/multierr v1.11.0 // indirect
8197
go.uber.org/zap v1.26.0 // indirect
8298
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
8399
golang.org/x/net v0.37.0 // indirect
84100
golang.org/x/oauth2 v0.12.0 // indirect
101+
golang.org/x/sync v0.12.0 // indirect
85102
golang.org/x/sys v0.31.0 // indirect
86103
golang.org/x/term v0.30.0 // indirect
87104
golang.org/x/text v0.23.0 // indirect
88105
golang.org/x/time v0.4.0 // indirect
89106
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
90107
google.golang.org/appengine v1.6.7 // indirect
108+
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
109+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
110+
google.golang.org/grpc v1.58.3 // indirect
91111
gopkg.in/inf.v0 v0.9.1 // indirect
92112
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
93113
gopkg.in/yaml.v2 v2.4.0 // indirect
94114
gopkg.in/yaml.v3 v3.0.1 // indirect
95115
k8s.io/apiextensions-apiserver v0.30.1 // indirect
116+
k8s.io/apiserver v0.30.1 // indirect
117+
k8s.io/component-base v0.30.1 // indirect
96118
k8s.io/klog/v2 v2.120.1 // indirect
97119
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
98120
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
121+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
99122
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
100123
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
101124
)

0 commit comments

Comments
 (0)