Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into feat-pdb
Browse files Browse the repository at this point in the history 
Signed-off-by: Peter Wilcsinszky <[email protected]>
  • Loading branch information
@pepov
pepov committed Jan 16, 2024
2 parents 07940ce + 12220f1 commit e683595
Show file tree
Hide file tree
Showing 116 changed files with 968 additions and 758 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,20 @@ jobs:
with:
go-version: '1.21'

- name: Check diff
run: make check-diff

- name: Test
run: make test

- name: Generate test coverage
run: make generate-test-coverage

- name: Test Coverage
uses: vladopajic/go-test-coverage@v2
with:
config: ./.testcoverage.yml

- name: Check diff
run: make check-diff

lint:
name: Lint
runs-on: ubuntu-latest
Expand Down
48 changes: 0 additions & 48 deletions charts/logging-operator/crds/logging.banzaicloud.io_syslogngclusteroutputs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -974,39 +974,6 @@ spec:
type: object
tls:
properties:
ca_dir:
properties:
mountFrom:
properties:
secretKeyRef:
properties:
key:
type: string
name:
type: string
optional:
type: boolean
required:
- key
type: object
type: object
value:
type: string
valueFrom:
properties:
secretKeyRef:
properties:
key:
type: string
name:
type: string
optional:
type: boolean
required:
- key
type: object
type: object
type: object
ca_file:
properties:
mountFrom:
Expand Down Expand Up @@ -1073,8 +1040,6 @@ spec:
type: object
type: object
type: object
cipher-suite:
type: string
key_file:
properties:
mountFrom:
Expand Down Expand Up @@ -1108,19 +1073,6 @@ spec:
type: object
type: object
type: object
peer_verify:
type: boolean
ssl_version:
enum:
- sslv3
- tlsv1
- tlsv1_0
- tlsv1_1
- tlsv1_2
- tlsv1_3
type: string
use-system-cert-store:
type: boolean
type: object
type: object
batch-lines:
Expand Down
48 changes: 0 additions & 48 deletions charts/logging-operator/crds/logging.banzaicloud.io_syslogngoutputs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -970,39 +970,6 @@ spec:
type: object
tls:
properties:
ca_dir:
properties:
mountFrom:
properties:
secretKeyRef:
properties:
key:
type: string
name:
type: string
optional:
type: boolean
required:
- key
type: object
type: object
value:
type: string
valueFrom:
properties:
secretKeyRef:
properties:
key:
type: string
name:
type: string
optional:
type: boolean
required:
- key
type: object
type: object
type: object
ca_file:
properties:
mountFrom:
Expand Down Expand Up @@ -1069,8 +1036,6 @@ spec:
type: object
type: object
type: object
cipher-suite:
type: string
key_file:
properties:
mountFrom:
Expand Down Expand Up @@ -1104,19 +1069,6 @@ spec:
type: object
type: object
type: object
peer_verify:
type: boolean
ssl_version:
enum:
- sslv3
- tlsv1
- tlsv1_0
- tlsv1_1
- tlsv1_2
- tlsv1_3
type: string
use-system-cert-store:
type: boolean
type: object
type: object
batch-lines:
Expand Down
2 changes: 1 addition & 1 deletion charts/logging-operator/templates/service_monitor.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{ if .Values.monitoring.serviceMonitor.enabled }}
{{ if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.monitoring.serviceMonitor.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
Expand Down
48 changes: 0 additions & 48 deletions config/crd/bases/logging.banzaicloud.io_syslogngclusteroutputs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -974,39 +974,6 @@ spec:
type: object
tls:
properties:
ca_dir:
properties:
mountFrom:
properties:
secretKeyRef:
properties:
key:
type: string
name:
type: string
optional:
type: boolean
required:
- key
type: object
type: object
value:
type: string
valueFrom:
properties:
secretKeyRef:
properties:
key:
type: string
name:
type: string
optional:
type: boolean
required:
- key
type: object
type: object
type: object
ca_file:
properties:
mountFrom:
Expand Down Expand Up @@ -1073,8 +1040,6 @@ spec:
type: object
type: object
type: object
cipher-suite:
type: string
key_file:
properties:
mountFrom:
Expand Down Expand Up @@ -1108,19 +1073,6 @@ spec:
type: object
type: object
type: object
peer_verify:
type: boolean
ssl_version:
enum:
- sslv3
- tlsv1
- tlsv1_0
- tlsv1_1
- tlsv1_2
- tlsv1_3
type: string
use-system-cert-store:
type: boolean
type: object
type: object
batch-lines:
Expand Down
48 changes: 0 additions & 48 deletions config/crd/bases/logging.banzaicloud.io_syslogngoutputs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -970,39 +970,6 @@ spec:
type: object
tls:
properties:
ca_dir:
properties:
mountFrom:
properties:
secretKeyRef:
properties:
key:
type: string
name:
type: string
optional:
type: boolean
required:
- key
type: object
type: object
value:
type: string
valueFrom:
properties:
secretKeyRef:
properties:
key:
type: string
name:
type: string
optional:
type: boolean
required:
- key
type: object
type: object
type: object
ca_file:
properties:
mountFrom:
Expand Down Expand Up @@ -1069,8 +1036,6 @@ spec:
type: object
type: object
type: object
cipher-suite:
type: string
key_file:
properties:
mountFrom:
Expand Down Expand Up @@ -1104,19 +1069,6 @@ spec:
type: object
type: object
type: object
peer_verify:
type: boolean
ssl_version:
enum:
- sslv3
- tlsv1
- tlsv1_0
- tlsv1_1
- tlsv1_2
- tlsv1_3
type: string
use-system-cert-store:
type: boolean
type: object
type: object
batch-lines:
Expand Down
76 changes: 76 additions & 0 deletions config/samples/pvc-notemplate.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
apiVersion: logging.banzaicloud.io/v1beta1
kind: Logging
metadata:
name: all-to-file
spec:
fluentd:
# image:
# tag: v1.16-ruby3.2-full
disablePvc: true
bufferStorageVolume:
pvc:
source:
claimName: manual2
readOnly: false
extraVolumes:
- containerName: fluentd
path: /manual
volume:
pvc:
source:
claimName: manual
readOnly: false
volumeName: manual
controlNamespace: default
---
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: manual
spec:
storageClassName: ""
accessModes:
- ReadWriteOnce
resources:
requests:
storage: 1Gi
volumeMode: Filesystem
volumeName: manual
---
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: manual2
spec:
storageClassName: ""
accessModes:
- ReadWriteOnce
resources:
requests:
storage: 1Gi
volumeMode: Filesystem
volumeName: manual2
---
apiVersion: v1
kind: PersistentVolume
metadata:
name: manual
spec:
accessModes:
- ReadWriteOnce
capacity:
storage: 1Gi
hostPath:
path: /tmp/asd
---
apiVersion: v1
kind: PersistentVolume
metadata:
name: manual2
spec:
accessModes:
- ReadWriteOnce
capacity:
storage: 1Gi
hostPath:
path: /tmp/asd2
Loading

0 comments on commit e683595

Please sign in to comment.