Skip to content

Bug 1871737: Update status using subresource /status #468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 29, 2020
Merged

Bug 1871737: Update status using subresource /status #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bundle/manifests/elasticsearch-operator.v4.6.0.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ spec:
- configmaps
- secrets
- serviceaccounts
- services/finalizers
verbs:
- "*"
- apiGroups:
Expand Down
230 changes: 229 additions & 1 deletion bundle/manifests/logging.openshift.io_elasticsearches_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ spec:
- es
singular: elasticsearch
scope: Namespaced
subresources: {}
subresources:
status: {}
validation:
openAPIV3Schema:
description: Elasticsearch is the Schema for the elasticsearches API
Expand Down Expand Up @@ -401,6 +402,233 @@ spec:
- redundancyPolicy
type: object
status:
description: ElasticsearchStatus defines the observed state of Elasticsearch
properties:
cluster:
properties:
activePrimaryShards:
format: int32
type: integer
activeShards:
format: int32
type: integer
initializingShards:
format: int32
type: integer
numDataNodes:
format: int32
type: integer
numNodes:
format: int32
type: integer
pendingTasks:
format: int32
type: integer
relocatingShards:
format: int32
type: integer
status:
type: string
unassignedShards:
format: int32
type: integer
required:
- activePrimaryShards
- activeShards
- initializingShards
- numDataNodes
- numNodes
- pendingTasks
- relocatingShards
- status
- unassignedShards
type: object
clusterHealth:
type: string
conditions:
items:
properties:
lastTransitionTime:
description: Last time the condition transitioned from one status
to another.
format: date-time
type: string
message:
description: Human-readable message indicating details about last
transition.
type: string
reason:
description: Unique, one-word, CamelCase reason for the condition's
last transition.
type: string
status:
type: string
type:
description: ClusterConditionType is a valid value for ClusterCondition.Type
type: string
required:
- lastTransitionTime
- status
- type
type: object
type: array
indexManagement:
properties:
lastUpdated:
format: date-time
type: string
mappings:
items:
properties:
conditions:
description: Reasons for the state of the corresponding mapping
for this status
items:
properties:
message:
type: string
reason:
type: string
status:
type: string
type:
type: string
type: object
type: array
lastUpdated:
description: LastUpdated represents the last time that the
status was updated.
format: date-time
type: string
message:
type: string
name:
description: Name of the corresponding mapping for this status
type: string
reason:
type: string
state:
description: State of the corresponding mapping for this status
type: string
type: object
type: array
message:
type: string
policies:
items:
properties:
conditions:
description: Reasons for the state of the corresponding policy
for this status
items:
properties:
message:
type: string
reason:
type: string
status:
type: string
type:
type: string
type: object
type: array
lastUpdated:
description: LastUpdated represents the last time that the
status was updated.
format: date-time
type: string
message:
description: Message about the corresponding policy
type: string
name:
description: Name of the corresponding policy for this status
type: string
reason:
description: Reasons for the state of the corresponding policy
for this status
type: string
state:
description: State of the corresponding policy for this status
type: string
type: object
type: array
reason:
type: string
state:
description: IndexManagementState of IndexManagment
type: string
type: object
nodes:
items:
description: ElasticsearchNodeStatus represents the status of individual
Elasticsearch node
properties:
conditions:
items:
properties:
lastTransitionTime:
description: Last time the condition transitioned from one
status to another.
format: date-time
type: string
message:
description: Human-readable message indicating details about
last transition.
type: string
reason:
description: Unique, one-word, CamelCase reason for the
condition's last transition.
type: string
status:
type: string
type:
description: ClusterConditionType is a valid value for ClusterCondition.Type
type: string
required:
- lastTransitionTime
- status
- type
type: object
type: array
deploymentName:
type: string
roles:
items:
enum:
- master
- client
- data
type: string
type: array
statefulSetName:
type: string
status:
type: string
upgradeStatus:
properties:
scheduledCertRedeploy:
type: string
scheduledRedeploy:
type: string
scheduledUpgrade:
type: string
underUpgrade:
type: string
upgradePhase:
type: string
type: object
type: object
type: array
pods:
additionalProperties:
additionalProperties:
items:
type: string
type: array
type: object
type: object
shardAllocationEnabled:
type: string
type: object
type: object
version: v1
Expand Down
50 changes: 49 additions & 1 deletion bundle/manifests/logging.openshift.io_kibanas_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,55 @@ spec:
- managementState
type: object
status:
type: object
items:
description: KibanaStatus defines the observed state of Kibana
properties:
clusterCondition:
additionalProperties:
items:
properties:
lastTransitionTime:
description: Last time the condition transitioned from one
status to another.
format: date-time
type: string
message:
description: Human-readable message indicating details about
last transition.
type: string
reason:
description: Unique, one-word, CamelCase reason for the condition's
Copy link
Contributor

@blockloop blockloop Aug 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: CamelCase PascalCase

Copy link
Contributor Author

@periklis periklis Aug 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No chance to change this wording. It comes from deps.

last transition.
type: string
status:
type: string
type:
description: ClusterConditionType is a valid value for ClusterCondition.Type
type: string
required:
- lastTransitionTime
- status
- type
type: object
type: array
type: object
deployment:
type: string
pods:
additionalProperties:
items:
type: string
type: array
type: object
replicaSets:
items:
type: string
type: array
replicas:
format: int32
type: integer
type: object
type: array
type: object
version: v1
versions:
Expand Down
10 changes: 0 additions & 10 deletions hack/generate-crd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ source .bingo/variables.env
set -euo pipefail

MANIFESTS_DIR=${1:-"manifests/${OCP_VERSION}"}
ES_CRD_FILE="logging.openshift.io_elasticsearches_crd.yaml"
KB_CRD_FILE="logging.openshift.io_kibanas_crd.yaml"

echo "--------------------------------------------------------------"
echo "Generate k8s golang code"
Expand All @@ -19,14 +17,6 @@ echo "--------------------------------------------------------------"
$OPERATOR_SDK generate crds --crd-version v1beta1
mv deploy/crds/*.yaml "${MANIFESTS_DIR}"

echo "---------------------------------------------------------------"
echo "Kustomize: Patch CRDs for backward-compatibility"
echo "---------------------------------------------------------------"
oc kustomize "${MANIFESTS_DIR}" | \
awk -v es="${MANIFESTS_DIR}/${ES_CRD_FILE}" \
-v kb="${MANIFESTS_DIR}/${KB_CRD_FILE}"\
'BEGIN{filename = es} /---/ {getline; filename = kb}{print $0> filename}'

echo "---------------------------------------------------------------"
echo "Cleanup operator-sdk generation folder"
echo "---------------------------------------------------------------"
Expand Down
4 changes: 0 additions & 4 deletions manifests/4.6/crd-drop-status-validation-patch.yaml
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions manifests/4.6/kustomization.yaml
View file
Open in desktop

This file was deleted.

Loading