Skip to content

Commit 5cf7bd7

Browse files
rjeberhardrjeberhard
authored
Support hostAliases (#2639)
1 parent 58e9047 commit 5cf7bd7

File tree

13 files changed

+1065
-908
lines changed

13 files changed

+1065
-908
lines changed

‎documentation/domains/Domain.json

Lines changed: 48 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -782,10 +782,6 @@
782782
"description": "NodeName is a request to schedule this Pod onto a specific Node. If it is non-empty, the scheduler simply schedules this pod onto that node, assuming that it fits the resource requirements. See `kubectl explain pods.spec.nodeName`.",
783783
"type": "string"
784784
},
785-
"livenessProbe": {
786-
"description": "Settings for the liveness probe associated with a WebLogic Server instance.",
787-
"$ref": "#/definitions/ProbeTuning"
788-
},
789785
"readinessGates": {
790786
"description": "If specified, all readiness gates will be evaluated for Pod readiness. A Pod is ready when all its containers are ready AND all conditions specified in the readiness gates have a status equal to \"True\". More info: https://github.com/kubernetes/community/blob/master/keps/sig-network/0007-pod-ready%2B%2B.md.",
791787
"type": "array",
@@ -805,35 +801,20 @@
805801
"description": "If specified, indicates the Pod\u0027s priority. \"system-node-critical\" and \"system-cluster-critical\" are two special keywords which indicate the highest priorities with the former being the highest priority. Any other name must be defined by creating a PriorityClass object with that name. If not specified, the pod priority will be the default or zero, if there is no default. See `kubectl explain pods.spec.priorityClassName`.",
806802
"type": "string"
807803
},
808-
"volumes": {
809-
"description": "Additional volumes to be created in the server Pod. See `kubectl explain pods.spec.volumes`.",
810-
"type": "array",
811-
"items": {
812-
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.Volume"
813-
}
814-
},
815-
"resources": {
816-
"description": "Memory and CPU minimum requirements and limits for the WebLogic Server instance. See `kubectl explain pods.spec.containers.resources`.",
817-
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.ResourceRequirements"
818-
},
819804
"annotations": {
820805
"description": "The annotations to be added to generated resources.",
821806
"additionalProperties": {
822807
"type": "string"
823808
},
824809
"$ref": "#/definitions/Map"
825810
},
826-
"env": {
827-
"description": "A list of environment variables to set in the container running a WebLogic Server instance. More info: https://oracle.github.io/weblogic-kubernetes-operator/userguide/managing-domains/domain-resource/#jvm-memory-and-java-option-environment-variables. See `kubectl explain pods.spec.containers.env`.",
811+
"hostAliases": {
812+
"description": "HostAliases is an optional list of hosts and IPs that will be injected into the pod\u0027s hosts file if specified. This is only valid for non-hostNetwork pods.",
828813
"type": "array",
829814
"items": {
830-
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.EnvVar"
815+
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.HostAlias"
831816
}
832817
},
833-
"restartPolicy": {
834-
"description": "Restart policy for all containers within the Pod. One of Always, OnFailure, Never. Default to Always. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#restart-policy. See `kubectl explain pods.spec.restartPolicy`.",
835-
"type": "string"
836-
},
837818
"nodeSelector": {
838819
"description": "Selector which must match a Node\u0027s labels for the Pod to be scheduled on that Node. See `kubectl explain pods.spec.nodeSelector`.",
839820
"additionalProperties": {
@@ -848,13 +829,6 @@
848829
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.VolumeMount"
849830
}
850831
},
851-
"labels": {
852-
"description": "The labels to be added to generated resources. The label names must not start with \"weblogic.\".",
853-
"additionalProperties": {
854-
"type": "string"
855-
},
856-
"$ref": "#/definitions/Map"
857-
},
858832
"runtimeClassName": {
859833
"description": "RuntimeClassName refers to a RuntimeClass object in the node.k8s.io group, which should be used to run this Pod. If no RuntimeClass resource matches the named class, the Pod will not be run. If unset or empty, the \"legacy\" RuntimeClass will be used, which is an implicit class with an empty definition that uses the default runtime handler. More info: https://github.com/kubernetes/community/blob/master/keps/sig-node/0014-runtime-class.md This is an alpha feature and may change in the future. See `kubectl explain pods.spec.runtimeClassName`.",
860834
"type": "string"
@@ -866,32 +840,65 @@
866840
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.Toleration"
867841
}
868842
},
843+
"readinessProbe": {
844+
"description": "Settings for the readiness probe associated with a WebLogic Server instance.",
845+
"$ref": "#/definitions/ProbeTuning"
846+
},
847+
"containerSecurityContext": {
848+
"description": "Container-level security attributes. Will override any matching Pod-level attributes. See `kubectl explain pods.spec.containers.securityContext`.",
849+
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.SecurityContext"
850+
},
851+
"schedulerName": {
852+
"description": "If specified, the Pod will be dispatched by the specified scheduler. If not specified, the Pod will be dispatched by the default scheduler. See `kubectl explain pods.spec.schedulerName`.",
853+
"type": "string"
854+
},
855+
"livenessProbe": {
856+
"description": "Settings for the liveness probe associated with a WebLogic Server instance.",
857+
"$ref": "#/definitions/ProbeTuning"
858+
},
859+
"volumes": {
860+
"description": "Additional volumes to be created in the server Pod. See `kubectl explain pods.spec.volumes`.",
861+
"type": "array",
862+
"items": {
863+
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.Volume"
864+
}
865+
},
866+
"resources": {
867+
"description": "Memory and CPU minimum requirements and limits for the WebLogic Server instance. See `kubectl explain pods.spec.containers.resources`.",
868+
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.ResourceRequirements"
869+
},
870+
"env": {
871+
"description": "A list of environment variables to set in the container running a WebLogic Server instance. More info: https://oracle.github.io/weblogic-kubernetes-operator/userguide/managing-domains/domain-resource/#jvm-memory-and-java-option-environment-variables. See `kubectl explain pods.spec.containers.env`.",
872+
"type": "array",
873+
"items": {
874+
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.EnvVar"
875+
}
876+
},
877+
"restartPolicy": {
878+
"description": "Restart policy for all containers within the Pod. One of Always, OnFailure, Never. Default to Always. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#restart-policy. See `kubectl explain pods.spec.restartPolicy`.",
879+
"type": "string"
880+
},
881+
"labels": {
882+
"description": "The labels to be added to generated resources. The label names must not start with \"weblogic.\".",
883+
"additionalProperties": {
884+
"type": "string"
885+
},
886+
"$ref": "#/definitions/Map"
887+
},
869888
"auxiliaryImages": {
870889
"description": "Use an auxiliary image to automatically include directory content from additional images. This is a useful alternative for including Model in Image model files, or other types of files, in a pod without requiring modifications to the pod\u0027s base image \u0027domain.spec.image\u0027. This feature internally uses a Kubernetes emptyDir volume and Kubernetes init containers to share the files from the additional images with the pod.",
871890
"type": "array",
872891
"items": {
873892
"$ref": "#/definitions/AuxiliaryImage"
874893
}
875894
},
876-
"readinessProbe": {
877-
"description": "Settings for the readiness probe associated with a WebLogic Server instance.",
878-
"$ref": "#/definitions/ProbeTuning"
879-
},
880895
"containers": {
881896
"description": "Additional containers to be included in the server Pod. See `kubectl explain pods.spec.containers`.",
882897
"type": "array",
883898
"items": {
884899
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.Container"
885900
}
886901
},
887-
"containerSecurityContext": {
888-
"description": "Container-level security attributes. Will override any matching Pod-level attributes. See `kubectl explain pods.spec.containers.securityContext`.",
889-
"$ref": "https://github.com/garethr/kubernetes-json-schema/blob/master/v1.13.5/_definitions.json#/definitions/io.k8s.api.core.v1.SecurityContext"
890-
},
891-
"schedulerName": {
892-
"description": "If specified, the Pod will be dispatched by the specified scheduler. If not specified, the Pod will be dispatched by the default scheduler. See `kubectl explain pods.spec.schedulerName`.",
893-
"type": "string"
894-
},
895902
"initContainers": {
896903
"description": "Initialization containers to be included in the server Pod. See `kubectl explain pods.spec.initContainers`.",
897904
"type": "array",

‎documentation/domains/Domain.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ The current status of the operation of the WebLogic domain. Updated automaticall
143143
| `containers` | Array of [Container](k8s1.13.5.md#container) | Additional containers to be included in the server Pod. See `kubectl explain pods.spec.containers`. |
144144
| `containerSecurityContext` | [Security Context](k8s1.13.5.md#security-context) | Container-level security attributes. Will override any matching Pod-level attributes. See `kubectl explain pods.spec.containers.securityContext`. |
145145
| `env` | Array of [Env Var](k8s1.13.5.md#env-var) | A list of environment variables to set in the container running a WebLogic Server instance. More info: https://oracle.github.io/weblogic-kubernetes-operator/userguide/managing-domains/domain-resource/#jvm-memory-and-java-option-environment-variables. See `kubectl explain pods.spec.containers.env`. |
146+
| `hostAliases` | Array of [Host Alias](k8s1.13.5.md#host-alias) | HostAliases is an optional list of hosts and IPs that will be injected into the pod's hosts file if specified. This is only valid for non-hostNetwork pods. |
146147
| `initContainers` | Array of [Container](k8s1.13.5.md#container) | Initialization containers to be included in the server Pod. See `kubectl explain pods.spec.initContainers`. |
147148
| `labels` | Map | The labels to be added to generated resources. The label names must not start with "weblogic.". |
148149
| `livenessProbe` | [Probe Tuning](#probe-tuning) | Settings for the liveness probe associated with a WebLogic Server instance. |

0 commit comments

Comments
 (0)