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.

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

Fix cloud tracking #383

Merged
merged 5 commits into from
Jul 17, 2023
Merged

Fix cloud tracking #383

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
250eca9
Removing a recently added integ test (need some refactoring to make i…
pdk27 Jul 11, 2023
52eb973
Added a warning to cloud name description to prevent users from modif…
pdk27 Jul 11, 2023
ad77186
Deleting files related to cloud instance tracking and reassignments
pdk27 Jul 11, 2023
67c351f
[fix] Remove references of oldId and EC2FleetCloudAware class, remove…
pdk27 Jul 11, 2023
b85ea10
Merge branch 'master' into remove-cloud-tracking-2
pdk27 Jul 14, 2023
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
8 changes: 2 additions & 6 deletions src/main/resources/com/amazon/jenkins/ec2fleet/EC2FleetCloud/config.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,12 @@
xmlns:t="/lib/hudson" xmlns:f="/lib/form"
xmlns:c="/lib/credentials">

<f:description>A unique name for this EC2 Fleet cloud</f:description>
<f:description>Warning: Cloud name is used to track agents belonging to this cloud. Please do not modify an existing cloud's name. See <a href="https://github.com/jenkinsci/ec2-fleet-plugin/issues/382">this issue</a> for details</f:description>
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is this warning the only barrier in place from changing the cloud name? What would happen to existing agents if a cloud name is changed?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Unfortunately yes. I meant to create another task to implement disallowing name change. This PR is already handling a lot, so didn't want to overload it.

<f:entry title="${%Name}" field="name">
<f:textbox default="FleetCloud"/>
</f:entry>

<!-- we use this hidden field to be able detect previous name of cloud
see javadoc for EC2FleetCloudAware -->
<f:invisibleEntry>
<f:textbox field="oldId" />
</f:invisibleEntry>

<f:description>Select AWS Credentials or leave set to none to use <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2.html">AWS EC2 Instance Role</a></f:description>
<f:entry title="${%AWS Credentials}" field="awsCredentialsId">
<c:select/>
Expand Down
8 changes: 2 additions & 6 deletions src/main/resources/com/amazon/jenkins/ec2fleet/EC2FleetLabelCloud/config.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,12 @@
xmlns:t="/lib/hudson" xmlns:f="/lib/form"
xmlns:c="/lib/credentials">

<f:description>A unique name for this EC2 Fleet label cloud</f:description>
<f:description>Warning: Cloud name is used to track agents belonging to this cloud. Please do not modify an existing cloud's name. See <a href="https://github.com/jenkinsci/ec2-fleet-plugin/issues/382">this issue</a> for details</f:description>
<f:entry title="${%Name}" field="name">
<f:textbox default="FleetCloudLabel"/>
</f:entry>

<!-- we use this hidden field to be able detect previous name of cloud
see javadoc for EC2FleetCloudAware -->
<f:invisibleEntry>
<f:textbox field="oldId" />
</f:invisibleEntry>

<f:description>Select AWS Credentials or leave set to none to use <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2.html">AWS EC2 Instance Role</a></f:description>
<f:entry title="${%AWS Credentials}" field="awsCredentialsId">
<c:select/>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/com/amazon/jenkins/ec2fleet/EC2FleetNode/configure-entries.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
EC2 Spot Fleet Instance
EC2 Instance
</j:jelly>