Skip to content

Release v1.28.x with BP contrib WIPs (edge) #70

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

Draft
ederst wants to merge 3 commits into
base: release-1.28-bp
Choose a base branch
from
Draft

Release v1.28.x with BP contrib WIPs (edge) #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ffd9e5
Upload all binaries when releasing
ederst Mar 10, 2023
19ea451
WIP: Configure IPv6 for Calico
ederst Jul 11, 2022
22bcc78
Run hack/update-expected.sh
ederst Oct 17, 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
18 changes: 12 additions & 6 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ jobs:
run: |
make all examples test

- name: Upload Linux binary
- name: Upload Linux binaries
if: startsWith(github.ref, 'refs/tags/')
uses: actions/upload-artifact@v2
with:
name: kops-linux-amd64
path: ${{ env.GOPATH }}/src/k8s.io/kops/.build/dist/linux/amd64/kops
path: ${{ env.GOPATH }}/src/k8s.io/kops/.build/dist/linux/amd64/*
if-no-files-found: error
retention-days: 1

Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
run: |
make kops examples test

- name: Upload macos binary
- name: Upload kops MacOS binary
if: startsWith(github.ref, 'refs/tags/')
uses: actions/upload-artifact@v2
with:
Expand Down Expand Up @@ -136,18 +136,24 @@ jobs:
- build-macos-amd64
- verify
steps:
- name: Download all kops binary artifacts
- name: Download all binary artifacts
uses: actions/download-artifact@v2

- name: Rename kops binary artifacts
run: |
mv kops-linux-amd64/kops kops-linux-amd64/kops-linux-amd64
mv kops-darwin-amd64/kops kops-darwin-amd64/kops-darwin-amd64
mv kops-linux-amd64/kops kops-linux-amd64/kops-linux-amd64
mv kops-linux-amd64/channels kops-linux-amd64/channels-linux-amd64
mv kops-linux-amd64/protokube kops-linux-amd64/protokube-linux-amd64
mv kops-linux-amd64/nodeup kops-linux-amd64/nodeup-linux-amd64

- name: Release
uses: softprops/action-gh-release@v1
with:
fail_on_unmatched_files: true
files: |
kops-linux-amd64/kops-linux-amd64
kops-darwin-amd64/kops-darwin-amd64
kops-linux-amd64/kops-linux-amd64
kops-linux-amd64/channels-linux-amd64
kops-linux-amd64/protokube-linux-amd64
kops-linux-amd64/nodeup-linux-amd64
2 changes: 1 addition & 1 deletion ...uster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ spec:
version: 9.99.0
- id: k8s-1.25
manifest: networking.projectcalico.org/k8s-1.25.yaml
manifestHash: 36e27a220f36800fe4dba1c00904fc41b0a3398f553549235c8bbbd205b47205
manifestHash: 7f657c7a2a50fb6327576c4a4f409d012dcda40845c1ec0d5db84403c897031f
name: networking.projectcalico.org
prune:
kinds:
Expand Down
2 changes: 2 additions & 0 deletions ..._s3_object_privatecalico.example.com-addons-networking.projectcalico.org-k8s-1.25_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4583,6 +4583,8 @@ spec:
name: calico-config
- name: CALICO_IPV4POOL_CIDR
value: 100.96.0.0/11
- name: CALICO_IPV6POOL_NAT_OUTGOING
value: "false"
- name: CALICO_DISABLE_FILE_LOGGING
value: "true"
- name: FELIX_DEFAULTENDPOINTTOHOSTACTION
Expand Down
8 changes: 5 additions & 3 deletions upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.22.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ data:
"mtu": __CNI_MTU__,
"ipam": {
"assign_ipv4": "{{ not IsIPv6Only }}",
"assign_ipv6": "{{ IsIPv6Only }}",
"assign_ipv6": "{{ CalicoUseIPv6 }}",
{{- if IsIPv6Only }}
"type": "host-local",
"ranges": [[{ "subnet": "usePodCidrIPv6" }]]
Expand Down Expand Up @@ -4633,7 +4633,7 @@ spec:
- name: IP
value: "{{- if not IsIPv6Only -}}autodetect{{- else -}}none{{- end -}}"
- name: IP6
value: "{{- if IsIPv6Only -}}autodetect{{- else -}}none{{- end -}}"
value: "{{- if CalicoUseIPv6 -}}autodetect{{- else -}}none{{- end -}}"
{{- if IsIPv6Only }}
- name: IP_AUTODETECTION_METHOD
value: "{{- or .Networking.Calico.IPv4AutoDetectionMethod "none" }}"
Expand Down Expand Up @@ -4680,6 +4680,8 @@ spec:
{{- else }}
- name: CALICO_IPV4POOL_CIDR
value: "{{ .KubeControllerManager.ClusterCIDR }}"
- name: CALICO_IPV6POOL_NAT_OUTGOING
value: "{{- CalicoUseIPv6 }}"
{{- end }}
# Disable file logging so `kubectl logs` works.
- name: CALICO_DISABLE_FILE_LOGGING
Expand All @@ -4689,7 +4691,7 @@ spec:
value: "ACCEPT"
# Set IPv6 on Kubernetes.
- name: FELIX_IPV6SUPPORT
value: "{{ IsIPv6Only }}"
value: "{{ CalicoUseIPv6 }}"
- name: FELIX_HEALTHENABLED
value: "true"

Expand Down
10 changes: 6 additions & 4 deletions upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.25.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ data:
"mtu": __CNI_MTU__,
"ipam": {
"assign_ipv4": "{{ not IsIPv6Only }}",
"assign_ipv6": "{{ IsIPv6Only }}",
"assign_ipv6": "{{ CalicoUseIPv6 }}",
{{- if IsIPv6Only }}
"type": "host-local",
"ranges": [[{ "subnet": "usePodCidrIPv6" }]]
Expand Down Expand Up @@ -4273,7 +4273,7 @@ rules:
resources:
- endpointslices
verbs:
- watch
- watch
- list
- apiGroups: [""]
resources:
Expand Down Expand Up @@ -4650,7 +4650,7 @@ spec:
- name: IP
value: "{{- if not IsIPv6Only -}}autodetect{{- else -}}none{{- end -}}"
- name: IP6
value: "{{- if IsIPv6Only -}}autodetect{{- else -}}none{{- end -}}"
value: "{{- if CalicoUseIPv6 -}}autodetect{{- else -}}none{{- end -}}"
{{- if IsIPv6Only }}
- name: IP_AUTODETECTION_METHOD
value: "{{- or .Networking.Calico.IPv4AutoDetectionMethod "none" }}"
Expand Down Expand Up @@ -4697,6 +4697,8 @@ spec:
{{- else }}
- name: CALICO_IPV4POOL_CIDR
value: "{{ .KubeControllerManager.ClusterCIDR }}"
- name: CALICO_IPV6POOL_NAT_OUTGOING
value: "{{- CalicoUseIPv6 }}"
{{- end }}
# Disable file logging so `kubectl logs` works.
- name: CALICO_DISABLE_FILE_LOGGING
Expand All @@ -4706,7 +4708,7 @@ spec:
value: "ACCEPT"
# Set IPv6 on Kubernetes.
- name: FELIX_IPV6SUPPORT
value: "{{ IsIPv6Only }}"
value: "{{ CalicoUseIPv6 }}"
- name: FELIX_HEALTHENABLED
value: "true"

Expand Down
7 changes: 7 additions & 0 deletions upup/pkg/fi/cloudup/template_functions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,13 @@ func (tf *TemplateFunctions) AddTo(dest template.FuncMap, secretStore fi.SecretS
}
return "CrossSubnet"
}
dest["CalicoUseIPv6"] = func() bool {
// TODO:
// In the templates this is done:
// value: "{{- or .Networking.Calico.IPv6AutoDetectionMethod "none" }}"
// But doc states that default is "first-found", so this might not work like expected (IPv6 always on)
return cluster.Spec.IsIPv6Only() || (c.IPv6AutoDetectionMethod != "" && c.IPv6AutoDetectionMethod != "none")
}
}

if cluster.Spec.Networking.Cilium != nil {
Expand Down