Skip to content
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.

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

Handle Serverless version in association versions check #7896

Merged
merged 6 commits into from
Jun 17, 2024

Conversation

barkbay
Copy link
Contributor

@barkbay barkbay commented Jun 12, 2024

This PR attempts to detect when a referenced resource is an Elasticsearch project, and skip version check if it's the case.

@botelastic botelastic bot added the triage label Jun 12, 2024
@barkbay barkbay added the >enhancement Enhancement of existing functionality label Jun 12, 2024
@botelastic botelastic bot removed the triage label Jun 12, 2024
@botelastic botelastic bot removed the triage label Jun 12, 2024
@barkbay
Copy link
Contributor Author

barkbay commented Jun 12, 2024

buildkite test this -f p=gke,s=8.14.0 -m t=TestVersionUpgradeOrdering*

Copy link
Collaborator

@pebrc pebrc left a comment

Choose a reason for hiding this comment

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

LGTM in general I wonder if we should support the serverless flavour for Kibana as well.

}

func (kibanaVersionResponse) IsServerless() bool {
return false
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think we could look at build flavour here as well:

{
  "name": "kb",
  "uuid": "8e06f008-43d4-4b38-ae49-51256b8945da",
  "version": {
    "number": "8.15.0",
    "build_hash": "cf768dcb71f422fbf3bc7cc16f3e3d3513ceac6a",
    "build_number": 75272,
    "build_snapshot": false,
    "build_flavor": "serverless",
    "build_date": "2024-06-12T16:25:20.017Z"
  }
}

@@ -78,7 +78,7 @@ type AssociationInfo struct { //nolint:revive
AssociationConfAnnotationNameBase string
// ReferencedResourceVersion returns the currently running version of the referenced resource.
// It may return an empty string if the version is unknown.
ReferencedResourceVersion func(c k8s.Client, association commonv1.Association) (string, error)
ReferencedResourceVersion func(c k8s.Client, association commonv1.Association) (string, bool, error)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Document the boolean return value?

@barkbay barkbay merged commit 50bdb00 into elastic:main Jun 17, 2024
5 checks passed
@barkbay barkbay deleted the serverless-in-association branch June 17, 2024 06:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
>enhancement Enhancement of existing functionality v2.14.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants