Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into dependabot/go_modules…
Browse files Browse the repository at this point in the history
…/tests/github.com/docker/docker-25.0.6incompatible
  • Loading branch information
amitlicht committed Oct 22, 2024
2 parents f367ded + 772ea14 commit 0fd89ec
Show file tree
Hide file tree
Showing 22 changed files with 232 additions and 425 deletions.
14 changes: 11 additions & 3 deletions .github/workflows/e2e-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ jobs:
helm install otterize ./otterize-kubernetes -n otterize-system --wait --create-namespace $OPERATOR_FLAGS $TELEMETRY_FLAG
test-postgresql-integration:
permissions:
id-token: write
contents: read
checks: write
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand All @@ -123,7 +127,7 @@ jobs:
- name: Setup go
uses: actions/setup-go@v5
with:
go-version: 1.22.1
go-version: 1.23.1
cache-dependency-path: tests/go.sum

- name: Install go-junit-report
Expand Down Expand Up @@ -196,6 +200,10 @@ jobs:
if: always() && github.event.pull_request.user.login != 'dependabot[bot]'

test-mysql-integration:
permissions:
id-token: write
contents: read
checks: write
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand All @@ -214,7 +222,7 @@ jobs:
- name: Setup go
uses: actions/setup-go@v5
with:
go-version: 1.22.1
go-version: 1.23.1
cache-dependency-path: tests/go.sum

- name: Install go-junit-report
Expand Down Expand Up @@ -332,7 +340,7 @@ jobs:
- name: Setup go
uses: actions/setup-go@v5
with:
go-version: 1.22.1
go-version: 1.23.1
cache-dependency-path: tests/go.sum

- name: Install go-junit-report
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Setup go
uses: actions/setup-go@v5
with:
go-version: 1.22.1
go-version: 1.23.1
cache-dependency-path: tests/go.sum

- name: go vet
Expand All @@ -42,7 +42,7 @@ jobs:
uses: golangci/golangci-lint-action@v3
with:
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
version: v1.55.2
version: v1.61.0

# Optional: working directory, useful for monorepos
working-directory: tests
Expand Down
4 changes: 2 additions & 2 deletions credentials-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: credentials-operator
description: credentials-operator
type: application
version: 3.0.8
appVersion: v3.0.4
version: 3.0.13
appVersion: v3.0.8
home: https://github.com/otterize/credentials-operator
sources:
- https://github.com/otterize/credentials-operator
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,34 @@ spec:
targetPort: 9443
selector:
app: credentials-operator
---
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: allow-access-to-credentials-operator-webhook-and-metrics
namespace: {{ .Release.Namespace }}
labels:
{{- with .Values.global.commonLabels }}
{{- toYaml . | nindent 4 }}
{{- end }}
app.kubernetes.io/version: {{ .Chart.Version }}
annotations:
{{- with .Values.global.commonAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
app.kubernetes.io/version: {{ .Chart.Version }}
spec:
podSelector:
matchLabels:
app: intents-operator
policyTypes:
- Ingress
ingress:
- ports:
- protocol: TCP
port: 443
- protocol: TCP
port: 9443
- protocol: TCP
port: 8443
{{ end }}
4 changes: 2 additions & 2 deletions intents-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: intents-operator
description: Otterize intents operator
type: application
version: 3.0.35
appVersion: v2.0.20
version: 3.0.43
appVersion: v2.0.25
home: https://github.com/otterize/intents-operator
sources:
- https://github.com/otterize/intents-operator
45 changes: 23 additions & 22 deletions intents-operator/README.md

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,29 @@ spec:
targetPort: 2112
selector:
app: intents-operator
---
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: allow-access-to-intents-operator-metrics-server
namespace: {{ .Release.Namespace }}
labels:
{{- with .Values.global.commonLabels }}
{{- toYaml . | nindent 4 }}
{{- end }}
app.kubernetes.io/version: {{ .Chart.Version }}
annotations:
{{- with .Values.global.commonAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
app.kubernetes.io/version: {{ .Chart.Version }}
spec:
podSelector:
matchLabels:
app: intents-operator
policyTypes:
- Ingress
ingress:
- ports:
- protocol: TCP
port: 2112
6 changes: 5 additions & 1 deletion intents-operator/templates/intents-operator-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,11 @@ spec:
value: "false"
{{- end }}
{{- if eq true .Values.operator.enableEgressNetworkPolicyCreation }}
- name: OTTERIZE_EXP_ENABLE_EGRESS_NETWORK_POLICIES
- name: OTTERIZE_ENABLE_EGRESS_NETWORK_POLICIES
value: "true"
{{- end }}
{{- if eq true .Values.operator.separateNetpolsForIngressAndEgress }}
- name: OTTERIZE_SEPARATE_NETPOLS_FOR_INGRESS_AND_EGRESS
value: "true"
{{- end }}
{{- if .Values.global.aws.rolesAnywhere.enabled }}
Expand Down
28 changes: 28 additions & 0 deletions intents-operator/templates/validation-webhook-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,31 @@ spec:
targetPort: 9443
selector:
app: intents-operator
---
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: allow-access-to-intents-operator-webhook
namespace: {{ .Release.Namespace }}
labels:
{{- with .Values.global.commonLabels }}
{{- toYaml . | nindent 4 }}
{{- end }}
app.kubernetes.io/version: {{ .Chart.Version }}
annotations:
{{- with .Values.global.commonAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
app.kubernetes.io/version: {{ .Chart.Version }}
spec:
podSelector:
matchLabels:
app: intents-operator
policyTypes:
- Ingress
ingress:
- ports:
- protocol: TCP
port: 443
- protocol: TCP
port: 9443
6 changes: 6 additions & 0 deletions intents-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,13 @@ operator:
allowExternalTraffic: ifBlockedByOtterize
enableIstioPolicyCreation: true
enableDatabasePolicyCreation: true

# If set to true, the operator will create network policies for egress traffic.
enableEgressNetworkPolicyCreation: false

# If set to true, the operator will create separate network policies for ingress and egress traffic.
# (Only available with enableEgressNetworkPolicyCreation set to true)
separateNetpolsForIngressAndEgress: false
ingressControllerAWSALBExempt: false
extraEnvVars:

Expand Down
4 changes: 2 additions & 2 deletions network-mapper/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
name: network-mapper
type: application
version: 2.0.21
appVersion: v2.0.7
version: 2.0.26
appVersion: v2.0.11
home: https://github.com/otterize/network-mapper
sources:
- https://github.com/otterize/network-mapper
16 changes: 8 additions & 8 deletions network-mapper/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,14 @@ Deployed only when `aws.visibility.enabled` is set to `true`.

## Cloud parameters

| Key | Description | Default |
|------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|
| `global.otterizeCloud.credentials.clientId` | Client ID for connecting to Otterize Cloud. | `(none)` |
| `global.otterizeCloud.credentials.clientSecret` | Client secret for connecting to Otterize Cloud. | `(none)` |
| `global.otterizeCloud.credentials.secretKeyRef.secretName` | If specified, the name of a pre-created Kubernetes Secret to be used instead of creating a secret with the value of clientSecret. | `(none)` |
| `global.otterizeCloud.credentials.secretKeyRef.secretKey` | If specified, the key for the clientSecret in a pre-created Kubernetes Secret to be used instead of creating a secret with the value of clientSecret. | `(none)` |
| `global.otterizeCloud.apiAddress` | Overrides Otterize Cloud default API address. | `(none)` |
| `global.otterizeCloud.apiExtraCAPEMSecret` | The name of a secret containing a single `CA.pem` file for an extra root CA used to connect to Otterize Cloud. The secret should be placed in the same namespace as the Otterize deployment. | `(none)` |
| Key | Description | Default |
|------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|
| `global.otterizeCloud.credentials.clientId` | Client ID for connecting to Otterize Cloud. | `(none)` |
| `global.otterizeCloud.credentials.clientSecret` | Client secret for connecting to Otterize Cloud. | `(none)` |
| `global.otterizeCloud.credentials.clientSecretKeyRef.secretName` | If specified, the name of a pre-created Kubernetes Secret to be used instead of creating a secret with the value of clientSecret. | `(none)` |
| `global.otterizeCloud.credentials.clientSecretKeyRef.secretKey` | If specified, the key for the clientSecret in a pre-created Kubernetes Secret to be used instead of creating a secret with the value of clientSecret. | `(none)` |
| `global.otterizeCloud.apiAddress` | Overrides Otterize Cloud default API address. | `(none)` |
| `global.otterizeCloud.apiExtraCAPEMSecret` | The name of a secret containing a single `CA.pem` file for an extra root CA used to connect to Otterize Cloud. The secret should be placed in the same namespace as the Otterize deployment. | `(none)` |

## Global parameters

Expand Down
4 changes: 4 additions & 0 deletions network-mapper/templates/sniffer-daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,10 @@ spec:
- name: OTTERIZE_CLIENT_ID
value: "{{ .Values.global.otterizeCloud.credentials.clientId }}"
{{- end }}
{{- if eq true .Values.sniffer.useExtendedProcfsResolution }}
- name: OTTERIZE_USE_EXTENDED_PROCFS_RESOLUTION
value: "true"
{{- end }}
livenessProbe:
httpGet:
path: /healthz
Expand Down
1 change: 1 addition & 0 deletions network-mapper/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ sniffer:
# requests:
# cpu: 100m
# memory: 128Mi
useExtendedProcfsResolution: false

kafkawatcher:
enable: false # enable/disable entire installation of the kafka-watcher
Expand Down
2 changes: 1 addition & 1 deletion otterize-kubernetes/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: otterize-kubernetes
description: |
This chart contains the Otterize credentials-operator, SPIRE (server+agent), the Otterize intents operator, and the Otterize network mapper.
type: application
version: 4.0.34
version: 4.0.54
home: https://github.com/otterize/helm-charts
kubeVersion: ">=1.19.0-0"
dependencies:
Expand Down
Loading

0 comments on commit 0fd89ec

Please sign in to comment.