Merge branch 'master' into feature-slicegw-lb

Signed-off-by: Md Imran <[email protected]>

.github/ISSUE_TEMPLATE/BUG.yaml

@@ -0,0 +1,87 @@
+name: "🐛 Bug Report"
+description: "Submit a bug report to help us improve"
+title: "Bug: "
+labels: [bug]
+assignees: ["narmidm","bharath-avesha","YachikaRalhan","Rahul-D78","rahulsawra98","gourishkb","mridulgain","richiesebastian"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out our bug report form 🙏
+  - type: textarea
+    id: description
+    validations:
+      required: true
+    attributes:
+      label: "📜 Description"
+      description: "A clear and concise description of what the bug is."
+      placeholder: "It bugs out when ..."
+  - type: textarea
+    id: steps-to-reproduce
+    validations:
+      required: true
+    attributes:
+      label: "👟 Reproduction steps"
+      description: "How do you trigger this bug? Please walk us through it step by step."
+      placeholder: "1. When I ..."
+  - type: textarea
+    id: expected-behavior
+    validations:
+      required: true
+    attributes:
+      label: "👍 Expected behavior"
+      description: "What did you think would happen?"
+      placeholder: "It should ..."
+  - type: textarea
+    id: actual-behavior
+    validations:
+      required: true
+    attributes:
+      label: "👎 Actual Behavior"
+      description: "What did actually happen? Add screenshots, if applicable."
+      placeholder: "It actually ..."
+  - type: textarea
+    id: logs
+    attributes:
+      label:  "🐚 Relevant log output"
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+  - type: textarea
+    id: version
+    attributes:
+      label: Version
+      description: What version of our software are you running?
+      placeholder: "I used ...."
+  - type: dropdown
+    id: os
+    attributes:
+      label: "🖥️ What operating system are you seeing the problem on?"
+      multiple: true
+      options:
+        - Linux
+        - MacOS
+        - Windows
+  - type: textarea
+    id: solution
+    validations:
+      required: false
+    attributes:
+      label: "✅ Proposed Solution"
+      description: "Any thoughts as to potential solutions or ideas to go about finding one. Please include links to any research."
+      placeholder: "To fix this, I found ..."
+  - type: checkboxes
+    id: no-duplicate-issues
+    attributes:
+      label: "👀 Have you spent some time to check if this issue has been raised before?"
+      description: "Have you researched on internet for a similar issue or checked our older issues for a similar bug?"
+      options:
+        - label: "I checked and didn't find any similar issue"
+          required: true
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Code of Conduct
+      description: I have read the [https://github.com/kubeslice/worker-operator/blob/master/code_of_conduct.md)
+      options:
+        - label: I agree to follow this project's Code of Conduct
+          required: true

.github/ISSUE_TEMPLATE/FEATURE.yaml

@@ -0,0 +1,57 @@
+name: 🚀 Feature
+description: "Submit a proposal for a new feature"
+title: "Feature: "
+labels: [feature]
+assignees: ["narmidm","bharath-avesha","YachikaRalhan","Rahul-D78","rahulsawra98","gourishkb","mridulgain","richiesebastian"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out our feature request form 🙏
+  - type: textarea
+    id: feature-description
+    validations:
+      required: true
+    attributes:
+      label: "🔖 Feature description"
+      description: "A clear and concise description of what the feature is."
+      placeholder: "You should add ..."
+  - type: textarea
+    id: pitch
+    validations:
+      required: true
+    attributes:
+      label: "🎤 Pitch"
+      description: "Please explain why this feature should be implemented and how it would be used. Add examples, if applicable."
+      placeholder: "In my use-case, ..."
+  - type: textarea
+    id: solution
+    validations:
+      required: true
+    attributes:
+      label: "✌️ Solution"
+      description: "A clear and concise description of what you want to happen."
+      placeholder: "I want this feature to, ..."
+  - type: textarea
+    id: alternative
+    validations:
+      required: false
+    attributes:
+      label: "🔄️ Alternative"
+      description: "A clear and concise description of any alternative solutions or features you've considered."
+      placeholder: "I tried, ..."
+  - type: checkboxes
+    id: no-duplicate-issues
+    attributes:
+      label: "👀 Have you spent some time to check if this issue has been raised before?"
+      description: "Have you researched on internet for a similar issue or checked our older issues for a similar bug?"
+      options:
+        - label: "I checked and didn't find similar issue"
+          required: true
+  - type: checkboxes
+    id: read-code-of-conduct
+    attributes:
+      label: "🏢 Have you read the Code of Conduct?"
+      options:
+        - label: "I have read the [Code of Conduct](https://github.com/kubeslice/worker-operator/blob/master/code_of_conduct.md)"
+          required: true

.github/pull_request_template.md

@@ -0,0 +1,51 @@
+<!--
+Type of change: Title of the PR should clearly mention which type of PR is this, you can select any of the below-mentioned types:
+
+- docs() - The PR contains Documentation ONLY changes. 
+- feat() - The PR contains new feature/enhancements.
+- fix() - The PR contains a bug fix.
+
+Example Title: 
+feat(): New field addition for Cluster CRD 
+-->
+
+# Description
+<!--
+Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
+-->
+
+Fixes # <!-- Mention any issues which might be fixed on this PR merge. -->
+
+## How Has This Been Tested?
+<!--
+Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
+
+test-cases
+- [ ] Test case A
+- [ ] Test case B
+-->
+
+## Checklist:
+
+* [ ] The title of the PR states what changed and the related issues number (used for the release note).
+* [ ] Does this PR requires documentation updates?
+* [ ] I've updated documentation as required by this PR.
+* [ ] I have ran `go fmt`
+* [ ] I have updated the helm chart as required by this PR.
+* [ ] I have performed a self-review of my own code.
+* [ ] I have commented my code, particularly in hard-to-understand areas.
+* [ ] I have tested it for all user roles.
+* [ ] I have added all the required unit test cases.
+* [ ] I have verified the E2E test cases with new code changes.
+* [ ] I have added all the required E2E test cases.
+
+## Does this PR introduce a breaking change?
+<!--
+If NO, leave the release-note block blank.
+If YES, a release note is required:
+Enter your extended release note in the block below. If the PR requires additional manual action from users switching to the new version, include the string "action-required".
+-->
+
+```release-note
+
+```

AUTHORS

@@ -1,9 +1,51 @@
 # Names should be added to this file as
-#	Name or Organization <email address>
+# Name or Organization <email address>
 # The email address is not required for organizations.
 
 # You can update this list using the following command:
 #
-#   $ (head -n10 AUTHORS && git shortlog -se | sed -E 's/^\s+[0-9]+\t//') | tee AUTHORS
-
+# (head -n10 AUTHORS && git shortlog -se | sed -E 's/^\s+[0-9]+\t//') | tee AUTHORS
+#
 # Please keep the list sorted.
+Aakash <[email protected]>
+Aakash <[email protected]>
+Aakash <[email protected]>
+Bharath Horatti <[email protected]>
+Gourish Biradar <[email protected]>
+Jayadeep KM <[email protected]>
+Jayadeep KM <[email protected]>
+Jayadeep KM <[email protected]>
+Md Imran <[email protected]>
+Mohammed Ahmed <[email protected]>
+Mridul Gain <[email protected]>
+Nishant Singh <[email protected]>
+Nishant Singh <[email protected]>
+Rahul <[email protected]>
+Rahul Kumar <[email protected]>
+Rahul Kumar <[email protected]>
+Rahul Sawra <[email protected]>
+Rahul-D78 <[email protected]>
+Richie Sebastian <[email protected]>
+Venkatesh Poola <[email protected]>
+Venkatesh2102 <[email protected]>
+Yachika <[email protected]>
+Yachika Ralhan <[email protected]>
+YachikaRalhan <[email protected]>
+YachikaRalhan <[email protected]>
+YachikaRalhan <[email protected]>
+bharath-avesha <[email protected]>
+gourishkb <[email protected]>
+gourishkb <[email protected]>
+kon3m <[email protected]>
+kumar.bavanasi <[email protected]>
+nishantsingh <[email protected]>
+pnavali <[email protected]>
+rahulii <[email protected]>
+rahulsawra98 <[email protected]>
+rahulsawra98 <[email protected]>
+richiesebastian <[email protected]>
+sai v <[email protected]>
+saivenkatesh1909 <[email protected]>
+srinivas-avesha <[email protected]>
+uma-kt <[email protected]>
+veenamj-avesha <[email protected]>

CODEOWNERS

@@ -0,0 +1,67 @@
+# This is a comment.
+# Each line is a file pattern followed by one or more owners.
+
+# These owners will be the default owners for everything in
+# the repo. Unless a later match takes precedence,
+# @global-owner1 and @global-owner2 will be requested for
+# review when someone opens a pull request.
+#*       @global-owner1 @global-owner2
+
+# Order is important; the last matching pattern takes the most
+# precedence. When someone opens a pull request that only
+# modifies JS files, only @js-owner and not the global
+# owner(s) will be requested for a review.
+#*.js    @js-owner #This is an inline comment.
+
+# You can also use email addresses if you prefer. They'll be
+# used to look up users just like we do for commit author
+# emails.
+#*.go [email protected]
+
+# Teams can be specified as code owners as well. Teams should
+# be identified in the format @org/team-name. Teams must have
+# explicit write access to the repository. In this example,
+# the octocats team in the octo-org organization owns all .txt files.
+#*.txt @octo-org/octocats
+
+# In this example, @doctocat owns any files in the build/logs
+# directory at the root of the repository and any of its
+# subdirectories.
+#/build/logs/ @doctocat
+
+# The `docs/*` pattern will match files like
+# `docs/getting-started.md` but not further nested files like
+# `docs/build-app/troubleshooting.md`.
+#docs/*  [email protected]
+
+# In this example, @octocat owns any file in an apps directory
+# anywhere in your repository.
+#apps/ @octocat
+
+# In this example, @doctocat owns any file in the `/docs`
+# directory in the root of your repository and any of its
+# subdirectories.
+#/docs/ @doctocat
+
+# In this example, any change inside the `/scripts` directory
+# will require approval from @doctocat or @octocat.
+#/scripts/ @doctocat @octocat
+
+# In this example, @octocat owns any file in a `/logs` directory such as
+# `/build/logs`, `/scripts/logs`, and `/deeply/nested/logs`. Any changes
+# in a `/logs` directory will require approval from @octocat.
+#**/logs @octocat
+
+# In this example, @octocat owns any file in the `/apps`
+# directory in the root of your repository except for the `/apps/github`
+# subdirectory, as its owners are left empty.
+#/apps/ @octocat
+#/apps/github
+
+# In this example, @octocat owns any file in the `/apps`
+# directory in the root of your repository except for the `/apps/github`
+# subdirectory, as this subdirectory has its own owner @doctocat
+#/apps/ @octocat
+#/apps/github @doctocat
+
+*       @narmidm @bharath-avesha @YachikaRalhan @Rahul-D78 @rahulsawra98 @gourishkb @mridulgain

MAINTAINERS.md

@@ -0,0 +1,8 @@
+# KubeSlice Worker-Operator Maintainers 
+The maintainers are generally available in Slack at https://kubernetes.slack.com in channel #kubeslice
+
+Md Imran [email protected]
+Eric Peterson [email protected]
+Prabhu Navali [email protected]
+Bharath Horatti [email protected]
+Richie Sebastian [email protected]

pkg/hub/controllers/vpnkeyrotation/reconciler.go

@@ -412,9 +412,7 @@ func (r *Reconciler) syncCurrentRotationState(ctx context.Context,
 			}
 		}
 		if len(syncedRotationState) != len(vpnKeyRotation.Status.CurrentRotationState) || len(keysToDeleteFromStatus) > 0 {
-			log.Info("syncing current rotation state for the gateways",
-				"from", vpnKeyRotation.Status.CurrentRotationState,
-				"to", syncedRotationState)
+
 			// Merge the new syncedRotationState with the existing state
 			for gw, obj := range syncedRotationState {
 				currentRotationState[gw] = obj
@@ -425,7 +423,9 @@ func (r *Reconciler) syncCurrentRotationState(ctx context.Context,
 					delete(currentRotationState, key)
 				}
 			}
-
+			log.Info("syncing current rotation state for the gateways",
+				"from", vpnKeyRotation.Status.CurrentRotationState,
+				"to", currentRotationState)
 			vpnKeyRotation.Status.CurrentRotationState = currentRotationState
 			requeue = true
 			return r.Status().Update(ctx, vpnKeyRotation)

pkg/hub/controllers/vpnkeyrotation/vpnrotation_ctrl_test.go

@@ -75,6 +75,7 @@ var _ = Describe("Hub VPN Key Rotation", func() {
 					ClusterGatewayMapping: map[string][]string{
 						CLUSTER_NAME: {gws[0]},
 					},
+					Clusters:                []string{ClusterName},
 					CertificateCreationTime: &metav1.Time{Time: time.Now()},
 				},
 			}
@@ -177,6 +178,7 @@ var _ = Describe("Hub VPN Key Rotation", func() {
 					ClusterGatewayMapping: map[string][]string{
 						CLUSTER_NAME: gws,
 					},
+					Clusters:                []string{ClusterName},
 					CertificateCreationTime: &metav1.Time{Time: time.Now()},
 					CertificateExpiryTime:   &metav1.Time{Time: time.Now().AddDate(0, 0, 30)},
 					RotationInterval:        30,
@@ -515,6 +517,7 @@ var _ = Describe("Hub VPN Key Rotation", func() {
 					ClusterGatewayMapping: map[string][]string{
 						CLUSTER_NAME: {gws[0]},
 					},
+					Clusters:                []string{ClusterName},
 					CertificateCreationTime: &metav1.Time{Time: time.Now()},
 					CertificateExpiryTime:   &metav1.Time{Time: time.Now().AddDate(0, 0, 30)},
 					RotationInterval:        30,
@@ -742,6 +745,7 @@ var _ = Describe("Hub VPN Key Rotation", func() {
 					ClusterGatewayMapping: map[string][]string{
 						"worker-1": gws,
 					},
+					Clusters:                []string{ClusterName},
 					CertificateCreationTime: &metav1.Time{Time: time.Now()},
 				},
 			}