Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[bugfix] resolve duplicated cluster wide resources name problem #2274

Merged
merged 2 commits into from
Dec 19, 2023
Merged

[bugfix] resolve duplicated cluster wide resources name problem #2274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0be80b
[bugfix] resolve duplicated cluster wide resources name problem
kpango Dec 19, 2023
b8b7701
update schemas
kpango Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/vald/templates/agent/networkpolicy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: agent-allow
name: {{ $agent.name }}-allow
spec:
podSelector:
matchLabels:
Expand Down
2 changes: 1 addition & 1 deletion charts/vald/templates/agent/readreplica/networkpolicy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: agent-readreplica-allow
name: {{ $readreplica.component_name }}-allow
spec:
podSelector:
matchLabels:
Expand Down
2 changes: 1 addition & 1 deletion charts/vald/templates/discoverer/clusterrole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: discoverer
name: {{ $discoverer.clusterRole.name }}
labels:
app.kubernetes.io/name: {{ include "vald.name" . }}
helm.sh/chart: {{ include "vald.chart" . }}
Expand Down
2 changes: 1 addition & 1 deletion charts/vald/templates/discoverer/networkpolicy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: discoverer-allow
name: {{ $discoverer.name }}-allow
spec:
podSelector:
matchLabels:
Expand Down
2 changes: 1 addition & 1 deletion charts/vald/templates/gateway/filter/networkpolicy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: filter-allow
name: {{ $filter.name }}-allow
spec:
podSelector:
matchLabels:
Expand Down
2 changes: 1 addition & 1 deletion charts/vald/templates/gateway/lb/networkpolicy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: lb-allow
name: {{ $lb.name }}-allow
spec:
podSelector:
matchLabels:
Expand Down
2 changes: 1 addition & 1 deletion charts/vald/templates/manager/index/networkpolicy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: index-allow
name: {{ $index.name }}-allow
spec:
podSelector:
matchLabels:
Expand Down
3 changes: 3 additions & 0 deletions k8s/discoverer/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,9 @@ data:
node_metrics:
labels: {}
fields: {}
service:
labels: {}
fields: {}
net:
dialer:
dual_stack_enabled: false
Expand Down
2 changes: 1 addition & 1 deletion k8s/discoverer/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spec:
app.kubernetes.io/instance: release-name
app.kubernetes.io/component: discoverer
annotations:
checksum/configmap: 6eee25d7cd882f4ac6e09711a13d8f8fd13953a90157a8fe97ecc5ac2007a846
checksum/configmap: 4b9b2c59eb8cfa9fb3e0c24320d784743aa088b1ddf34aeffb16f183045293b3
profefe.com/enable: "true"
profefe.com/port: "6060"
profefe.com/service: vald-discoverer
Expand Down
9 changes: 9 additions & 0 deletions k8s/operator/helm/crds/valdrelease.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2803,6 +2803,15 @@ spec:
labels:
type: object
x-kubernetes-preserve-unknown-fields: true
service:
type: object
properties:
fields:
type: object
x-kubernetes-preserve-unknown-fields: true
labels:
type: object
x-kubernetes-preserve-unknown-fields: true
enabled:
type: boolean
env:
Expand Down
Loading