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

Change rke2-multus chart to local #366

Merged

Conversation

thomasferrandiz
Copy link
Contributor

Upstream chart is not maintained so this allows us to configure multus deployments properly.

@thomasferrandiz thomasferrandiz requested a review from a team as a code owner August 16, 2023 15:47
Copy link
Contributor

@manuelbuil manuelbuil left a comment

Choose a reason for hiding this comment

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

I think the condition that checks k8s > 1.16 can be removed in all manifests

@@ -0,0 +1,34 @@
======
{{- if or ( gt .Capabilities.KubeVersion.Major "1" ) ( ge .Capabilities.KubeVersion.Minor "16" ) }}
Copy link
Contributor

Choose a reason for hiding this comment

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

This condition does not make sense anymore :P

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if or ( gt .Capabilities.KubeVersion.Major "1" ) ( ge .Capabilities.KubeVersion.Minor "16" ) }}
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if or ( gt .Capabilities.KubeVersion.Major "1" ) ( ge .Capabilities.KubeVersion.Minor "16" ) }}
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
{{- if or ( gt .Capabilities.KubeVersion.Major "1" ) ( ge .Capabilities.KubeVersion.Minor "16" ) }}
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here

cni_conf:
#skipMultusBinaryCopy: false
#kubeconfig: /etc/cni/net.d/multus.d/multus.kubeconfig
cniVersion: 0.3.1
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you increase this one to 1.0.0?

@thomasferrandiz thomasferrandiz force-pushed the update-multus-chart branch 2 times, most recently from ca7aa43 to 32e7ce8 Compare August 18, 2023 08:49
Upstream chart is not maintained so this allows us
to configure multus deployments properly.

Also bump multus image version to latest.
@thomasferrandiz thomasferrandiz merged commit 3efffcc into rancher:main-source Aug 18, 2023
1 check passed
github-actions bot pushed a commit that referenced this pull request Aug 18, 2023
@thomasferrandiz thomasferrandiz deleted the update-multus-chart branch November 10, 2023 14:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants