Skip to content

Commit

Permalink
Merge branch 'master' into update-cnp-with-proxy
Browse files Browse the repository at this point in the history
  • Loading branch information
marieroque authored Feb 14, 2024
2 parents fe5d634 + 112944b commit b5abc61
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 36 deletions.
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Add proxy port to CiliumNetworkPolicy if needed.

## [4.68.0] - 2024-02-14

### Added

- Add CNP for prometheus-meta-operator to be able to talk to the api-server in locked-down clusters.

## [4.67.3] - 2024-02-13

### Added
Expand Down Expand Up @@ -2464,7 +2470,8 @@ This release was created on release-v3.5.x branch to fix release 3.6.0 see PR#99

- First release.

[Unreleased]: https://github.com/giantswarm/prometheus-meta-operator/compare/v4.67.3...HEAD
[Unreleased]: https://github.com/giantswarm/prometheus-meta-operator/compare/v4.68.0...HEAD
[4.68.0]: https://github.com/giantswarm/prometheus-meta-operator/compare/v4.67.3...v4.68.0
[4.67.3]: https://github.com/giantswarm/prometheus-meta-operator/compare/v4.67.2...v4.67.3
[4.67.2]: https://github.com/giantswarm/prometheus-meta-operator/compare/v4.67.1...v4.67.2
[4.67.1]: https://github.com/giantswarm/prometheus-meta-operator/compare/v4.67.0...v4.67.1
Expand Down
36 changes: 36 additions & 0 deletions helm/prometheus-meta-operator/templates/cilium-network-policy.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{{- if .Values.ciliumNetworkPolicy.enabled -}}
{{- if .Capabilities.APIVersions.Has "cilium.io/v2" -}}
apiVersion: "cilium.io/v2"
kind: CiliumNetworkPolicy
metadata:
name: {{ include "resource.default.name" . }}
namespace: {{ include "resource.default.namespace" . }}
labels:
{{- include "labels.common" . | nindent 4 }}
spec:
endpointSelector:
matchLabels:
{{- include "labels.selector" . | nindent 6 }}
egress:
- toEntities:
## Needed to create anything in the MCs.
- kube-apiserver
## Needed to set remote write informations.
- cluster
## Needed to access opsgenie and create heartbeats.
- world
ingress:
- fromEntities:
- cluster
toPorts:
- ports:
- port: "8000"
protocol: "TCP"
rules:
http:
- method: "GET"
path: "/metrics"
- method: "GET"
path: "/healthz"
{{ end }}
{{ end }}

This file was deleted.

2 changes: 1 addition & 1 deletion pkg/project/project.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var (
gitSHA = "n/a"
name = "prometheus-meta-operator"
source = "https://github.com/giantswarm/prometheus-meta-operator"
version = "4.67.4-dev"
version = "4.68.1-dev"
)

func Description() string {
Expand Down

0 comments on commit b5abc61

Please sign in to comment.