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

whereabouts: bump to v0.5.4 #847

Merged
merged 1 commit into from
Aug 11, 2022
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
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,24 @@ rules:
- pods
verbs:
- list
- watch
- apiGroups:
- k8s.cni.cncf.io
resources:
- network-attachment-definitions
verbs:
- get
- list
- watch
- apiGroups:
- ""
- events.k8s.io
resources:
- events
verbs:
- create
- patch
- update
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
Expand All @@ -184,8 +202,10 @@ metadata:
name: ip-reconciler
namespace: kube-system
spec:
concurrencyPolicy: Forbid
jobTemplate:
spec:
backoffLimit: 0
template:
metadata:
labels:
Expand All @@ -195,7 +215,7 @@ spec:
- command:
- /ip-reconciler
- -log-level=verbose
image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5-amd64
image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5.4-amd64
name: whereabouts
resources:
requests:
Expand All @@ -211,7 +231,9 @@ spec:
- hostPath:
path: /etc/cni/net.d
name: cni-net-dir
ttlSecondsAfterFinished: 300
schedule: '*/5 * * * *'
successfulJobsHistoryLimit: 0
---
apiVersion: apps/v1
kind: DaemonSet
Expand All @@ -233,12 +255,18 @@ spec:
tier: node
spec:
containers:
- env:
- args:
- -c
- |
SLEEP=false /install-cni.sh && /ip-control-loop -log-level debug
command:
- /bin/sh
env:
- name: WHEREABOUTS_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5-amd64
image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5.4-amd64
name: whereabouts
resources:
limits:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,24 @@ rules:
- pods
verbs:
- list
- watch
- apiGroups:
- k8s.cni.cncf.io
resources:
- network-attachment-definitions
verbs:
- get
- list
- watch
- apiGroups:
- ""
- events.k8s.io
resources:
- events
verbs:
- create
- patch
- update
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
Expand All @@ -184,8 +202,10 @@ metadata:
name: ip-reconciler
namespace: kube-system
spec:
concurrencyPolicy: Forbid
jobTemplate:
spec:
backoffLimit: 0
template:
metadata:
labels:
Expand All @@ -195,7 +215,7 @@ spec:
- command:
- /ip-reconciler
- -log-level=verbose
image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5-amd64
image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5.4-amd64
name: whereabouts
resources:
requests:
Expand All @@ -211,7 +231,9 @@ spec:
- hostPath:
path: /etc/cni/net.d
name: cni-net-dir
ttlSecondsAfterFinished: 300
schedule: '*/5 * * * *'
successfulJobsHistoryLimit: 0
---
apiVersion: apps/v1
kind: DaemonSet
Expand All @@ -233,12 +255,18 @@ spec:
tier: node
spec:
containers:
- env:
- args:
- -c
- |
SLEEP=false /install-cni.sh && /ip-control-loop -log-level debug
command:
- /bin/sh
env:
- name: WHEREABOUTS_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5-amd64
image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5.4-amd64
name: whereabouts
resources:
limits:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,24 @@ rules:
- pods
verbs:
- list
- watch
- apiGroups:
- k8s.cni.cncf.io
resources:
- network-attachment-definitions
verbs:
- get
- list
- watch
- apiGroups:
- ""
- events.k8s.io
resources:
- events
verbs:
- create
- patch
- update
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
Expand All @@ -184,8 +202,10 @@ metadata:
name: ip-reconciler
namespace: kube-system
spec:
concurrencyPolicy: Forbid
jobTemplate:
spec:
backoffLimit: 0
template:
metadata:
labels:
Expand All @@ -195,7 +215,7 @@ spec:
- command:
- /ip-reconciler
- -log-level=verbose
image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5-amd64
image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5.4-amd64
name: whereabouts
resources:
requests:
Expand All @@ -211,7 +231,9 @@ spec:
- hostPath:
path: /etc/cni/net.d
name: cni-net-dir
ttlSecondsAfterFinished: 300
schedule: '*/5 * * * *'
successfulJobsHistoryLimit: 0
---
apiVersion: apps/v1
kind: DaemonSet
Expand All @@ -233,12 +255,18 @@ spec:
tier: node
spec:
containers:
- env:
- args:
- -c
- |
SLEEP=false /install-cni.sh && /ip-control-loop -log-level debug
command:
- /bin/sh
env:
- name: WHEREABOUTS_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5-amd64
image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5.4-amd64
name: whereabouts
resources:
limits:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,24 @@ rules:
- pods
verbs:
- list
- watch
- apiGroups:
- k8s.cni.cncf.io
resources:
- network-attachment-definitions
verbs:
- get
- list
- watch
- apiGroups:
- ""
- events.k8s.io
resources:
- events
verbs:
- create
- patch
- update
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
Expand All @@ -184,8 +202,10 @@ metadata:
name: ip-reconciler
namespace: kube-system
spec:
concurrencyPolicy: Forbid
jobTemplate:
spec:
backoffLimit: 0
template:
metadata:
labels:
Expand All @@ -195,7 +215,7 @@ spec:
- command:
- /ip-reconciler
- -log-level=verbose
image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5-amd64
image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5.4-amd64
name: whereabouts
resources:
requests:
Expand All @@ -211,7 +231,9 @@ spec:
- hostPath:
path: /etc/cni/net.d
name: cni-net-dir
ttlSecondsAfterFinished: 300
schedule: '*/5 * * * *'
successfulJobsHistoryLimit: 0
---
apiVersion: apps/v1
kind: DaemonSet
Expand All @@ -233,12 +255,18 @@ spec:
tier: node
spec:
containers:
- env:
- args:
- -c
- |
SLEEP=false /install-cni.sh && /ip-control-loop -log-level debug
command:
- /bin/sh
env:
- name: WHEREABOUTS_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5-amd64
image: ghcr.io/k8snetworkplumbingwg/whereabouts:v0.5.4-amd64
name: whereabouts
resources:
limits:
Expand Down
1 change: 1 addition & 0 deletions hack/bump-whereabouts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ cd -
manifests_dir=doc
[[ -d ${tmp_dir}/whereabouts/doc/crds ]] && manifests_dir=doc/crds
cp hack/kustomization/whereabouts/*.yaml ${tmp_dir}/whereabouts/${manifests_dir}/
sed -i "s/##VERSION##/${whereabouts_version}/" ${tmp_dir}/whereabouts/${manifests_dir}/kustomization.yaml

target_dir="cluster-provision/k8s/${provider}/manifests/whereabouts"
mkdir -p ${target_dir}
Expand Down
5 changes: 3 additions & 2 deletions hack/kustomization/whereabouts/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ resources:
- ./whereabouts.cni.cncf.io_ippools.yaml
- ./whereabouts.cni.cncf.io_overlappingrangeipreservations.yaml

transformers:
Copy link
Contributor

@oshoval oshoval Jul 31, 2022

Choose a reason for hiding this comment

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

I think that the files appear above are deleted as well ?
(they were merged into the current file)
also once there isn't a transformers we basically not need this file and the references of it

On the other hand, we will need on a follow PR to use kustomize again in order to pin the version
until k8snetworkplumbingwg/whereabouts#252 is fixed
(unless it is already fixed for 0.5.4)

- patch-ip-reconciler-job.yaml
images:
- name: ghcr.io/k8snetworkplumbingwg/whereabouts
newTag: ##VERSION##-amd64
14 changes: 0 additions & 14 deletions hack/kustomization/whereabouts/patch-ip-reconciler-job.yaml

This file was deleted.