-
Notifications
You must be signed in to change notification settings - Fork 60
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
Add support for Calico, use RBAC and secrets encryption. #283
Conversation
manifests/calico/tigera-operator.yml
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can't review this amount of YAML 😓
Can we just curl this YAML from the upstream?
https://github.com/projectcalico/calico/blob/v3.26.1/manifests/tigera-operator.yaml
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Absolutly, it actually comes from this repo
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be gitignored and curled on make
.
manifests/secrets-encryption.yml
Outdated
providers: | ||
- secretbox: | ||
keys: | ||
- name: key1 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How is this key consumed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
According to the documentation the key should be used by kube-apiserver
to encrypt the secrets.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we have more descriptive name?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have confirmed we can use something better, currently I set it to secrets_key
.
Do you have something in mind that would be better ?
@@ -51,7 +51,7 @@ function usage() { | |||
echo | |||
echo " --start=UNIT Enable and start the specified target after the installation, e.g. \"u7s.target\". Set to an empty to disable autostart. (Default: \"$start\")" | |||
echo " --cri=RUNTIME Specify CRI runtime, \"containerd\" or \"crio\". (Default: \"$cri\")" | |||
echo ' --cni=RUNTIME Specify CNI, an empty string (none) or "flannel". (Default: none)' | |||
echo ' --cni=RUNTIME Specify CNI, an empty string (none), \"calico\" or "flannel". (Default: none)' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we test calico in CI ?
usernetes/.github/workflows/main.yaml
Line 24 in 58df6ea
- name: "Smoke test (multi-node cluster with Flannel)" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should be able to, I have never used Github CI but I can look into it.
@@ -19,6 +19,8 @@ exec $(dirname $0)/nsenter.sh kube-apiserver \ | |||
--service-account-signing-key-file=$XDG_CONFIG_HOME/usernetes/master/service-account-key.pem \ | |||
--advertise-address=$(cat $XDG_RUNTIME_DIR/usernetes/parent_ip) \ | |||
--allow-privileged \ | |||
--encryption-provider-config=$XDG_CONFIG_HOME/usernetes/master/secrets-encryption.yml \ | |||
--authorization-mode=Node,RBAC \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you split and squash the commits so that one commit has one topic?
Probably, this PR should have the following three commits:
- RBAC
- Secrets encryption
- Calico
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How should I handle install.sh
as it has edits for RBAC, Calico and secrets encryption ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just make commit 3 depend on commit 1 and 2?
manifests/secrets-encryption.yml
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The suffix should be something like .yaml.template
, as this is not a complete manifest
manifests/secrets-encryption.yml
Outdated
- secretbox: | ||
keys: | ||
- name: key1 | ||
secret: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we use envsubst or something for filling up the secret value?
README.md
Outdated
@@ -129,7 +129,7 @@ iptable_filter | |||
ip6table_filter | |||
nf_tables | |||
x_tables | |||
xt_MASQUERADE | |||
xt_MASQUERADE # on older kernels: ipt_MASQUERADE and ip6t_MASQUERADE |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A comment should be a separate line for ease of parsing
@@ -51,7 +51,7 @@ function usage() { | |||
echo | |||
echo " --start=UNIT Enable and start the specified target after the installation, e.g. \"u7s.target\". Set to an empty to disable autostart. (Default: \"$start\")" | |||
echo " --cri=RUNTIME Specify CRI runtime, \"containerd\" or \"crio\". (Default: \"$cri\")" | |||
echo ' --cni=RUNTIME Specify CNI, an empty string (none) or "flannel". (Default: none)' | |||
echo ' --cni=RUNTIME Specify CNI, an empty string (none), \"calico\" or "flannel". (Default: none)' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you update README.md
too?
Signed-off-by: Pierre Boudvillain <[email protected]>
Signed-off-by: Pierre Boudvillain <[email protected]>
Signed-off-by: Pierre Boudvillain <[email protected]>
Signed-off-by: Pierre Boudvillain <[email protected]>
Do you plan to add a test? |
I have tried to work on that by making a similar test to the flannel one (replacing flannel by calico in the docker-compose file and publishing ports according to the calico requirements), however I wasn't able to make it work.
I'm not sure where the issue might come from. |
Closing as outdated, but feel free to reopen. |
kube-apiserver
with RBAC (launch kube-apiserver with --authorization-mode=Node,RBAC #166)Tested with a single node cluster on Centos 9.