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

Bump MetalLB again #421

Merged
merged 7 commits into from
Feb 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
41 changes: 21 additions & 20 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ concurrency:
jobs:
lint:
name: Lint
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Check out code
uses: actions/checkout@v4
Expand All @@ -30,7 +30,7 @@ jobs:
args: --timeout=15m0s --verbose

unit:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
name: Unit and Integration tests
steps:
- name: Checkout
Expand All @@ -57,7 +57,7 @@ jobs:
METALLB_BGP_TYPE=frr-k8s DEPLOY_KUBE_RBAC_PROXIES=true make test

e2e:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
built_image: "metallb-operator:ci" # Arbitrary name
needs:
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
artifact-name: e2e

olm:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs:
- lint
- unit
Expand Down Expand Up @@ -154,11 +154,11 @@ jobs:
artifact-name: olm

upgrade_version:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
built_image_prev_release: "metallb-operator-prev-rel:ci" # Arbitrary name
built_image: "metallb-operator:ci" # Arbitrary name
name: Go 1.17 -> Go 1.20
name: Upgrade version
defaults:
run:
working-directory: metallboperator
Expand All @@ -170,12 +170,12 @@ jobs:
uses: actions/checkout@v4
with:
path: metallboperator
ref: v0.12 # previous release version
ref: v0.13 # previous release version
fetch-depth: 0 # Fetch all history for all tags and branches

- uses: actions/setup-go@v2
with:
go-version: '1.17' # this needs to stay to 1.17 as long as the previous release is v0.12
go-version: '1.20'

- name: Build image
run: |
Expand All @@ -188,8 +188,15 @@ jobs:

- name: Deploy Previous Release Metal LB Operator
run: |
make deploy-cert-manager
IMG=${built_image_prev_release} KUSTOMIZE_DEPLOY_DIR="config/kind-ci/" ENABLE_OPERATOR_WEBHOOK="true" make deploy
IMG=${built_image_prev_release} KUSTOMIZE_DEPLOY_DIR="config/kind-ci/" make deploy

- name: Ensure MetalLB operator is ready
run: |
sleep 5
while [ "$(kubectl get pods -n metallb-system -l control-plane='controller-manager' -o jsonpath='{.items[*].status.containerStatuses[0].ready}')" != "true" ]; do
sleep 5
echo "Waiting for operator pod to be ready."
done

- name: E2E Tests
run: |
Expand All @@ -209,14 +216,6 @@ jobs:
path: metallboperator-latest
fetch-depth: 0 # Fetch all history for all tags and branches

- uses: actions/setup-go@v2
with:
go-version: '1.20'

- name: Delete old controller-gen
run: |
rm $(which controller-gen)

- name: Build image
run: |
cd ${GITHUB_WORKSPACE}/metallboperator-latest
Expand Down Expand Up @@ -253,7 +252,7 @@ jobs:
artifact-name: upgrade_version

metallb_e2e:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
built_image: "metallb-operator:ci" # Arbitrary name
needs:
Expand Down Expand Up @@ -329,6 +328,7 @@ jobs:
- name: MetalLB E2E Tests
run: |
cd ${GITHUB_WORKSPACE}/metallb
inv remove-lb-exclusion-from-nodes
sudo -E env "PATH=$PATH" inv e2etest -b frr --skip "IPV6|DUALSTACK|FRRK8S-MODE" -e /tmp/kind_logs

- name: Collect Logs
Expand All @@ -338,7 +338,7 @@ jobs:
artifact-name: metallb_e2e

metallb_e2e_frr-k8s:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
built_image: "metallb-operator:ci" # Arbitrary name
needs:
Expand Down Expand Up @@ -437,6 +437,7 @@ jobs:
- name: MetalLB E2E Tests
run: |
cd ${GITHUB_WORKSPACE}/metallb
inv remove-lb-exclusion-from-nodes
sudo -E env "PATH=$PATH" inv e2etest -b frr-k8s --skip "IPV6|DUALSTACK|FRR-MODE" -e /tmp/kind_logs

- name: Collect Logs
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/composite/collectlogs/action.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: "collectlogs"
description: "Collect and upload the logs"
description: "Collect and upload the kind logs"

inputs:
artifact-name:
Expand All @@ -12,8 +12,8 @@ runs:
- name: Archive E2E Tests logs
uses: actions/upload-artifact@v2
with:
name: ${{ inputs.artifact-name }}-e2e-logs
path: /tmp/test_e2e_logs/
name: ${{ inputs.artifact-name }}-logs
path: /tmp/kind_logs

- name: Export kind logs
shell: bash
Expand Down
43 changes: 18 additions & 25 deletions bin/metallb-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ spec:
clientConfig:
caBundle: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tDQpNSUlGWlRDQ0EwMmdBd0lCQWdJVU5GRW1XcTM3MVpKdGkrMmlSQzk1WmpBV1MxZ3dEUVlKS29aSWh2Y05BUUVMDQpCUUF3UWpFTE1Ba0dBMVVFQmhNQ1dGZ3hGVEFUQmdOVkJBY01ERVJsWm1GMWJIUWdRMmwwZVRFY01Cb0dBMVVFDQpDZ3dUUkdWbVlYVnNkQ0JEYjIxd1lXNTVJRXgwWkRBZUZ3MHlNakEzTVRrd09UTXlNek5hRncweU1qQTRNVGd3DQpPVE15TXpOYU1FSXhDekFKQmdOVkJBWVRBbGhZTVJVd0V3WURWUVFIREF4RVpXWmhkV3gwSUVOcGRIa3hIREFhDQpCZ05WQkFvTUUwUmxabUYxYkhRZ1EyOXRjR0Z1ZVNCTWRHUXdnZ0lpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElDDQpEd0F3Z2dJS0FvSUNBUUNxVFpxMWZRcC9vYkdlenhES0o3OVB3Ny94azJwellualNzMlkzb1ZYSm5sRmM4YjVlDQpma2ZZQnY2bndscW1keW5PL2phWFBaQmRQSS82aFdOUDBkdVhadEtWU0NCUUpyZzEyOGNXb3F0MGNTN3pLb1VpDQpvcU1tQ0QvRXVBeFFNZjhRZDF2c1gvVllkZ0poVTZBRXJLZEpIaXpFOUJtUkNkTDBGMW1OVW55Rk82UnRtWFZUDQpidkxsTDVYeTc2R0FaQVBLOFB4aVlDa0NtbDdxN0VnTWNiOXlLWldCYmlxQ3VkTXE5TGJLNmdKNzF6YkZnSXV4DQo1L1pXK2JraTB2RlplWk9ZODUxb1psckFUNzJvMDI4NHNTWW9uN0pHZVZkY3NoUnh5R1VpSFpSTzdkaXZVTDVTDQpmM2JmSDFYbWY1ZDQzT0NWTWRuUUV2NWVaOG8zeWVLa3ZrbkZQUGVJMU9BbjdGbDlFRVNNR2dhOGFaSG1URSttDQpsLzlMSmdDYjBnQmtPT0M0WnV4bWh2aERKV1EzWnJCS3pMQlNUZXN0NWlLNVlwcXRWVVk2THRyRW9FelVTK1lsDQpwWndXY2VQWHlHeHM5ZURsR3lNVmQraW15Y3NTU1UvVno2Mmx6MnZCS21NTXBkYldDQWhud0RsRTVqU2dyMjRRDQp0eGNXLys2N3d5KzhuQlI3UXdqVTFITndVRjBzeERWdEwrZ1NHVERnSEVZSlhZelYvT05zMy94TkpoVFNPSkxNDQpoeXNVdyttaGdackdhbUdXcHVIVU1DUitvTWJzMTc1UkcrQjJnUFFHVytPTjJnUTRyOXN2b0ZBNHBBQm8xd1dLDQpRYjRhY3pmeVVscElBOVFoSmFsZEY3S3dPSHVlV3gwRUNrNXg0T2tvVDBvWVp0dzFiR0JjRGtaSmF3SURBUUFCDQpvMU13VVRBZEJnTlZIUTRFRmdRVW90UlNIUm9IWTEyRFZ4R0NCdEhpb1g2ZmVFQXdId1lEVlIwakJCZ3dGb0FVDQpvdFJTSFJvSFkxMkRWeEdDQnRIaW9YNmZlRUF3RHdZRFZSMFRBUUgvQkFVd0F3RUIvekFOQmdrcWhraUc5dzBCDQpBUXNGQUFPQ0FnRUFSbkpsWWRjMTFHd0VxWnh6RDF2R3BDR2pDN2VWTlQ3aVY1d3IybXlybHdPYi9aUWFEa0xYDQpvVStaOVVXT1VlSXJTdzUydDdmQUpvVVAwSm5iYkMveVIrU1lqUGhvUXNiVHduOTc2ZldBWTduM3FMOXhCd1Y0DQphek41OXNjeUp0dlhMeUtOL2N5ak1ReDRLajBIMFg0bWJ6bzVZNUtzWWtYVU0vOEFPdWZMcEd0S1NGVGgrSEFDDQpab1Q5YnZHS25adnNHd0tYZFF0Wnh0akhaUjVqK3U3ZGtQOTJBT051RFNabS8rWVV4b2tBK09JbzdSR3BwSHNXDQo1ZTdNY0FTVXRtb1FORXd6dVFoVkJaRWQ1OGtKYjUrV0VWbGNzanlXNnRTbzErZ25tTWNqR1BsMWgxR2hVbjV4DQpFY0lWRnBIWXM5YWo1NmpBSjk1MVQvZjhMaWxmTlVnanBLQ0c1bnl0SUt3emxhOHNtdGlPdm1UNEpYbXBwSkI2DQo4bmdHRVluVjUrUTYwWFJ2OEhSSGp1VG9CRHVhaERrVDA2R1JGODU1d09FR2V4bkZpMXZYWUxLVllWb1V2MXRKDQo4dVdUR1pwNllDSVJldlBqbzg5ZytWTlJSaVFYUThJd0dybXE5c0RoVTlqTjA0SjdVL1RvRDFpNHE3VnlsRUc5DQorV1VGNkNLaEdBeTJIaEhwVncyTGFoOS9lUzdZMUZ1YURrWmhPZG1laG1BOCtqdHNZamJadnR5Mm1SWlF0UUZzDQpUU1VUUjREbUR2bVVPRVRmeStpRHdzK2RkWXVNTnJGeVVYV2dkMnpBQU4ydVl1UHFGY2pRcFNPODFzVTJTU3R3DQoxVzAyeUtYOGJEYmZFdjBzbUh3UzliQnFlSGo5NEM1Mjg0YXpsdTBmaUdpTm1OUEM4ckJLRmhBPQ0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQ==
service:
name: webhook-service
name: metallb-webhook-service
namespace: metallb-system
path: /convert
conversionReviewVersions:
Expand Down Expand Up @@ -503,6 +503,16 @@ spec:
associated to the BGP session. If not set, the BFD session won't
be set up.
type: string
connectTime:
description: Requested BGP connect time, controls how long BGP waits
between connection attempts to a neighbor.
type: string
x-kubernetes-validations:
- message: connect time should be between 1 seconds to 65535
rule: duration(self).getSeconds() >= 1 && duration(self).getSeconds()
<= 65535
- message: connect time should contain a whole number of seconds
rule: duration(self).getMilliseconds() % 1000 == 0
ebgpMultiHop:
description: To set if the BGPPeer is multi-hops away. Needed for
FRR mode only.
Expand Down Expand Up @@ -3864,7 +3874,7 @@ spec:
apiVersion: v1
kind: Service
metadata:
name: webhook-service
name: metallb-webhook-service
namespace: metallb-system
spec:
ports:
Expand Down Expand Up @@ -4061,7 +4071,7 @@ webhooks:
- v1
clientConfig:
service:
name: webhook-service
name: metallb-webhook-service
namespace: metallb-system
path: /validate-metallb-io-v1beta2-bgppeer
failurePolicy: Fail
Expand All @@ -4081,7 +4091,7 @@ webhooks:
- v1
clientConfig:
service:
name: webhook-service
name: metallb-webhook-service
namespace: metallb-system
path: /validate-metallb-io-v1beta1-bfdprofile
failurePolicy: Fail
Expand All @@ -4101,7 +4111,7 @@ webhooks:
- v1
clientConfig:
service:
name: webhook-service
name: metallb-webhook-service
namespace: metallb-system
path: /validate-metallb-io-v1beta1-bgpadvertisement
failurePolicy: Fail
Expand All @@ -4121,7 +4131,7 @@ webhooks:
- v1
clientConfig:
service:
name: webhook-service
name: metallb-webhook-service
namespace: metallb-system
path: /validate-metallb-io-v1beta1-community
failurePolicy: Fail
Expand All @@ -4141,7 +4151,7 @@ webhooks:
- v1
clientConfig:
service:
name: webhook-service
name: metallb-webhook-service
namespace: metallb-system
path: /validate-metallb-io-v1beta1-ipaddresspool
failurePolicy: Fail
Expand All @@ -4161,7 +4171,7 @@ webhooks:
- v1
clientConfig:
service:
name: webhook-service
name: metallb-webhook-service
namespace: metallb-system
path: /validate-metallb-io-v1beta1-l2advertisement
failurePolicy: Fail
Expand Down Expand Up @@ -4250,14 +4260,6 @@ rules:
verbs:
- get
- list
- apiGroups:
- metallb.io
resources:
- addresspools
verbs:
- get
- list
- watch
- apiGroups:
- metallb.io
resources:
Expand Down Expand Up @@ -4372,14 +4374,6 @@ rules:
- get
- list
- watch
- apiGroups:
- metallb.io
resources:
- addresspools
verbs:
- get
- list
- watch
- apiGroups:
- metallb.io
resources:
Expand Down Expand Up @@ -4653,7 +4647,6 @@ rules:
- apiGroups:
- apiextensions.k8s.io
resourceNames:
- addresspools.metallb.io
- bfdprofiles.metallb.io
- bgpadvertisements.metallb.io
- bgppeers.metallb.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ spec:
{{- with .Values.controller.logLevel }}
- --log-level={{ . }}
{{- end }}
- --cert-service-name=webhook-service
{{- if .Values.loadBalancerClass }}
- --lb-class={{ .Values.loadBalancerClass }}
{{- end }}
Expand Down
19 changes: 1 addition & 18 deletions bundle/manifests/metallb-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ metadata:
categories: Networking
certified: "false"
containerImage: quay.io/metallb/metallb-operator
createdAt: "2024-01-29T17:07:41Z"
createdAt: "2024-02-11T07:26:11Z"
description: An operator for deploying MetalLB on a kubernetes cluster.
operators.operatorframework.io/builder: operator-sdk-v1.26.1
operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
Expand Down Expand Up @@ -405,7 +405,6 @@ spec:
- apiGroups:
- apiextensions.k8s.io
resourceNames:
- addresspools.metallb.io
- bfdprofiles.metallb.io
- bgpadvertisements.metallb.io
- bgppeers.metallb.io
Expand Down Expand Up @@ -845,14 +844,6 @@ spec:
verbs:
- get
- list
- apiGroups:
- metallb.io
resources:
- addresspools
verbs:
- get
- list
- watch
- apiGroups:
- metallb.io
resources:
Expand Down Expand Up @@ -1002,14 +993,6 @@ spec:
- get
- list
- watch
- apiGroups:
- metallb.io
resources:
- addresspools
verbs:
- get
- list
- watch
- apiGroups:
- metallb.io
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
kind: Service
metadata:
creationTimestamp: null
name: webhook-service
name: metallb-webhook-service
spec:
ports:
- port: 443
Expand Down
Loading
Loading