Skip to content

Commit 7751026

Browse files
committed
Update CRD
1 parent e454e24 commit 7751026

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

documentation/domains/Domain.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -604,8 +604,8 @@
604604
"type": "object",
605605
"properties": {
606606
"image": {
607-
"default": "fluent/fluentd-kubernetes-daemonset:v1.16.1-debian-elasticsearch7-1.2",
608-
"description": "The Fluentbit container image name. Defaults to fluent/fluentd-kubernetes-daemonset:v1.16.1-debian-elasticsearch7-1.2",
607+
"default": "fluent/fluentd-kubernetes-daemonset:v1.19-debian-elasticsearch7-1",
608+
"description": "The Fluentbit container image name. Defaults to fluent/fluentd-kubernetes-daemonset:v1.19-debian-elasticsearch7-1",
609609
"type": "string"
610610
},
611611
"imagePullPolicy": {
@@ -666,8 +666,8 @@
666666
"type": "object",
667667
"properties": {
668668
"image": {
669-
"default": "fluent/fluentd-kubernetes-daemonset:v1.16.1-debian-elasticsearch7-1.2",
670-
"description": "The Fluentd container image name. Defaults to fluent/fluentd-kubernetes-daemonset:v1.16.1-debian-elasticsearch7-1.2",
669+
"default": "fluent/fluentd-kubernetes-daemonset:v1.19-debian-elasticsearch7-1",
670+
"description": "The Fluentd container image name. Defaults to fluent/fluentd-kubernetes-daemonset:v1.19-debian-elasticsearch7-1",
671671
"type": "string"
672672
},
673673
"imagePullPolicy": {

documentation/domains/Domain.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ The current status of the operation of the WebLogic domain. Updated automaticall
102102
| `elasticSearchCredentials` | string | Fluentbit elastic search credentials. A Kubernetes secret in the same namespace of the domain. It must contains 4 keys: elasticsearchhost - ElasticSearch Host Service Address, elasticsearchport - Elastic Search Service Port, elasticsearchuser - Elastic Search Service User Name, elasticsearchpassword - Elastic Search User Password |
103103
| `env` | Array of [Env Var](k8s1.28.2.md#env-var) | A list of environment variables to set in the fluentbit container. See `kubectl explain pods.spec.containers.env`. |
104104
| `fluentbitConfiguration` | string | The Fluentbit configuration text, specify your own custom fluentbit configuration. |
105-
| `image` | string | The Fluentbit container image name. Defaults to fluent/fluentd-kubernetes-daemonset:v1.16.1-debian-elasticsearch7-1.2 |
105+
| `image` | string | The Fluentbit container image name. Defaults to fluent/fluentd-kubernetes-daemonset:v1.19-debian-elasticsearch7-1 |
106106
| `imagePullPolicy` | string | The image pull policy for the Fluentbit sidecar container image. Legal values are Always, Never, and IfNotPresent. Defaults to Always if image ends in :latest; IfNotPresent, otherwise. |
107107
| `parserConfiguration` | string | The Fluentbit parser configuration text, specify your own custom fluentbit configuration. |
108108
| `resources` | [Resource Requirements](k8s1.28.2.md#resource-requirements) | Memory and CPU minimum requirements and limits for the fluentbit container. See `kubectl explain pods.spec.containers.resources`. |
@@ -118,7 +118,7 @@ The current status of the operation of the WebLogic domain. Updated automaticall
118118
| `elasticSearchCredentials` | string | Fluentd elastic search credentials. A Kubernetes secret in the same namespace of the domain. It must contains 4 keys: elasticsearchhost - ElasticSearch Host Service Address, elasticsearchport - Elastic Search Service Port, elasticsearchuser - Elastic Search Service User Name, elasticsearchpassword - Elastic Search User Password |
119119
| `env` | Array of [Env Var](k8s1.28.2.md#env-var) | A list of environment variables to set in the fluentd container. See `kubectl explain pods.spec.containers.env`. |
120120
| `fluentdConfiguration` | string | The fluentd configuration text, specify your own custom fluentd configuration. |
121-
| `image` | string | The Fluentd container image name. Defaults to fluent/fluentd-kubernetes-daemonset:v1.16.1-debian-elasticsearch7-1.2 |
121+
| `image` | string | The Fluentd container image name. Defaults to fluent/fluentd-kubernetes-daemonset:v1.19-debian-elasticsearch7-1 |
122122
| `imagePullPolicy` | string | The image pull policy for the Fluentd sidecar container image. Legal values are Always, Never, and IfNotPresent. Defaults to Always if image ends in :latest; IfNotPresent, otherwise. |
123123
| `resources` | [Resource Requirements](k8s1.28.2.md#resource-requirements) | Memory and CPU minimum requirements and limits for the fluentd container. See `kubectl explain pods.spec.containers.resources`. |
124124
| `volumeMounts` | Array of [Volume Mount](k8s1.28.2.md#volume-mount) | Volume mounts for fluentd container |

kubernetes/crd/domain-crd.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apiVersion: apiextensions.k8s.io/v1
55
kind: CustomResourceDefinition
66
metadata:
77
annotations:
8-
weblogic.sha256: 9e69b381a8e83bb3617c6b7bc93c72602cf8365da6cab74e5d1b82a3ae03e5d6
8+
weblogic.sha256: d7c04088508b18f47a0dd58bb2673c31c0324c00fd6b14a65d456631daf89991
99
name: domains.weblogic.oracle
1010
spec:
1111
group: weblogic.oracle
@@ -772,8 +772,8 @@ spec:
772772
pod will have the fluentd sidecar or not, as appropriate
773773
properties:
774774
image:
775-
default: fluent/fluentd-kubernetes-daemonset:v1.16.1-debian-elasticsearch7-1.2
776-
description: The Fluentd container image name. Defaults to fluent/fluentd-kubernetes-daemonset:v1.16.1-debian-elasticsearch7-1.2
775+
default: fluent/fluentd-kubernetes-daemonset:v1.19-debian-elasticsearch7-1
776+
description: The Fluentd container image name. Defaults to fluent/fluentd-kubernetes-daemonset:v1.19-debian-elasticsearch7-1
777777
type: string
778778
imagePullPolicy:
779779
description: The image pull policy for the Fluentd sidecar container
@@ -1002,8 +1002,8 @@ spec:
10021002
pod will have the fluent-bit sidecar or not, as appropriate
10031003
properties:
10041004
image:
1005-
default: fluent/fluentd-kubernetes-daemonset:v1.16.1-debian-elasticsearch7-1.2
1006-
description: The Fluentbit container image name. Defaults to fluent/fluentd-kubernetes-daemonset:v1.16.1-debian-elasticsearch7-1.2
1005+
default: fluent/fluentd-kubernetes-daemonset:v1.19-debian-elasticsearch7-1
1006+
description: The Fluentbit container image name. Defaults to fluent/fluentd-kubernetes-daemonset:v1.19-debian-elasticsearch7-1
10071007
type: string
10081008
imagePullPolicy:
10091009
description: The image pull policy for the Fluentbit sidecar container

0 commit comments

Comments
 (0)