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 allow to discover #54

Merged
merged 2 commits into from
Apr 23, 2024
Merged

Fix allow to discover #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e32d51
Remove allow_to_discover from appInstance
uncleDecart Apr 22, 2024
472e8bb
Generate proto files for previous commit
uncleDecart Apr 22, 2024
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
75 changes: 31 additions & 44 deletions go/config/appconfig.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

64 changes: 32 additions & 32 deletions images/devconfig.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 0 additions & 6 deletions proto/config/appconfig.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
// restart command i.e., an increase to the restart counter. The restart counter
// can also be increased to cause an application instance restart without
// any other change to the application instance.
message AppInstanceConfig {

Check failure on line 105 in proto/config/appconfig.proto

View workflow job for this annotation

GitHub Actions / yetus 

bufcompat:Previously present field "25" with name "allow_to_discover" on message "AppInstanceConfig" was deleted.
// deprecated fields
reserved 14, 24;

Expand Down Expand Up @@ -158,8 +158,6 @@
// contains the encrypted userdata
org.lfedge.eve.common.CipherBlock cipherData = 13;

// Deprecated 14

// The static IP address assigned on the NetworkAdapter which App Container
// stats collection uses. If the 'collectStatsIPAddr' is not empty and valid,
// it enables the container stats collection for this App.
Expand Down Expand Up @@ -210,10 +208,6 @@
// PatchEnvelopeRef is used to track all patch envelopes used by the app instance
PatchEnvelopeRef patchRef = 23;

// allow AppInstance to discover other AppInstances
Copy link
Contributor

Choose a reason for hiding this comment

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

But this was already removed in #52 based on the diffs, right?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, but #46 introduced this field once again with different number, if you look at master here, you'll see this field

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah - presumably due to some mismerge. Got it.

// attached to its network instances
bool allow_to_discover = 25;

// This edge-node UUID for the Designate Node for the Application
string designated_node_id = 26;
}
Expand Down
20 changes: 10 additions & 10 deletions python/config/appconfig_pb2.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading