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

add possibillity to use imagePullSecrets #62

Merged
merged 2 commits into from
Jul 5, 2023
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
36 changes: 36 additions & 0 deletions REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2348,6 +2348,7 @@ Generates and deploys standard Kubernetes in-cluster services

The following parameters are available in the `k8s::server::resources` class:

* [`image_pull_secrets`](#-k8s--server--resources--image_pull_secrets)
* [`kubeconfig`](#-k8s--server--resources--kubeconfig)
* [`cluster_cidr`](#-k8s--server--resources--cluster_cidr)
* [`dns_service_address`](#-k8s--server--resources--dns_service_address)
Expand All @@ -2371,6 +2372,14 @@ The following parameters are available in the `k8s::server::resources` class:
* [`flannel_tag`](#-k8s--server--resources--flannel_tag)
* [`flannel_daemonset_config`](#-k8s--server--resources--flannel_daemonset_config)

##### <a name="-k8s--server--resources--image_pull_secrets"></a>`image_pull_secrets`

Data type: `Optional[Array]`

the secrets to pull from private registries

Default value: `undef`

##### <a name="-k8s--server--resources--kubeconfig"></a>`kubeconfig`

Data type: `Stdlib::Unixpath`
Expand Down Expand Up @@ -2606,6 +2615,7 @@ The following parameters are available in the `k8s::server::resources::coredns`
* [`image_tag`](#-k8s--server--resources--coredns--image_tag)
* [`deployment_config`](#-k8s--server--resources--coredns--deployment_config)
* [`hosts`](#-k8s--server--resources--coredns--hosts)
* [`image_pull_secrets`](#-k8s--server--resources--coredns--image_pull_secrets)
* [`ensure`](#-k8s--server--resources--coredns--ensure)
* [`kubeconfig`](#-k8s--server--resources--coredns--kubeconfig)
* [`cluster_domain`](#-k8s--server--resources--coredns--cluster_domain)
Expand Down Expand Up @@ -2650,6 +2660,14 @@ Additional host-style entries for the CoreDNS deployment to serve

Default value: `[]`

##### <a name="-k8s--server--resources--coredns--image_pull_secrets"></a>`image_pull_secrets`

Data type: `Optional[Array]`

the secrets to pull from private registries

Default value: `$k8s::server::resources::image_pull_secrets`

##### <a name="-k8s--server--resources--coredns--ensure"></a>`ensure`

Data type: `K8s::Ensure`
Expand Down Expand Up @@ -2689,6 +2707,7 @@ The following parameters are available in the `k8s::server::resources::flannel`
* [`image_tag`](#-k8s--server--resources--flannel--image_tag)
* [`daemonset_config`](#-k8s--server--resources--flannel--daemonset_config)
* [`net_config`](#-k8s--server--resources--flannel--net_config)
* [`image_pull_secrets`](#-k8s--server--resources--flannel--image_pull_secrets)
* [`ensure`](#-k8s--server--resources--flannel--ensure)
* [`kubeconfig`](#-k8s--server--resources--flannel--kubeconfig)

Expand Down Expand Up @@ -2748,6 +2767,14 @@ Additional configuration to merge into net-conf.json for Flannel

Default value: `{}`

##### <a name="-k8s--server--resources--flannel--image_pull_secrets"></a>`image_pull_secrets`

Data type: `Optional[Array]`

the secrets to pull from private registries

Default value: `$k8s::server::resources::image_pull_secrets`

##### <a name="-k8s--server--resources--flannel--ensure"></a>`ensure`

Data type: `K8s::Ensure`
Expand Down Expand Up @@ -2778,6 +2805,7 @@ The following parameters are available in the `k8s::server::resources::kube_prox
* [`daemonset_config`](#-k8s--server--resources--kube_proxy--daemonset_config)
* [`extra_args`](#-k8s--server--resources--kube_proxy--extra_args)
* [`extra_config`](#-k8s--server--resources--kube_proxy--extra_config)
* [`image_pull_secrets`](#-k8s--server--resources--kube_proxy--image_pull_secrets)
* [`ensure`](#-k8s--server--resources--kube_proxy--ensure)
* [`kubeconfig`](#-k8s--server--resources--kube_proxy--kubeconfig)

Expand Down Expand Up @@ -2829,6 +2857,14 @@ Additional configuration data to apply to the kube-proxy configuration file

Default value: `{}`

##### <a name="-k8s--server--resources--kube_proxy--image_pull_secrets"></a>`image_pull_secrets`

Data type: `Optional[Array]`

the secrets to pull from private registries

Default value: `$k8s::server::resources::image_pull_secrets`

##### <a name="-k8s--server--resources--kube_proxy--ensure"></a>`ensure`

Data type: `K8s::Ensure`
Expand Down
3 changes: 3 additions & 0 deletions manifests/server/resources.pp
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# @summary Generates and deploys standard Kubernetes in-cluster services
# @param image_pull_secrets the secrets to pull from private registries
#
class k8s::server::resources (
Stdlib::Unixpath $kubeconfig = '/root/.kube/config',

Expand All @@ -25,6 +27,7 @@
String[1] $flannel_image = 'rancher/mirrored-flannelcni-flannel',
String[1] $flannel_tag = 'v0.16.1',
Hash[String,Data] $flannel_daemonset_config = {},
Optional[Array] $image_pull_secrets = undef,
) {
assert_private()

Expand Down
4 changes: 4 additions & 0 deletions manifests/server/resources/coredns.pp
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,16 @@
# @param image_tag The CoreDNS image tag to use
# @param deployment_config Additional configuration to merge into the Kubernetes Deployment object
# @param hosts Additional host-style entries for the CoreDNS deployment to serve
# @param image_pull_secrets the secrets to pull from private registries
#
class k8s::server::resources::coredns (
K8s::Ensure $ensure = $k8s::ensure,
Stdlib::Unixpath $kubeconfig = $k8s::server::resources::kubeconfig,
K8s::IP_addresses $dns_service_address = $k8s::server::resources::dns_service_address,
String[1] $cluster_domain = $k8s::server::resources::cluster_domain,
String[1] $image = $k8s::server::resources::coredns_image,
String[1] $image_tag = $k8s::server::resources::coredns_tag,
Optional[Array] $image_pull_secrets = $k8s::server::resources::image_pull_secrets,
Hash[String,Data] $deployment_config = $k8s::server::resources::coredns_deployment_config,
Array[String[1]] $hosts = [],
) {
Expand Down Expand Up @@ -274,6 +277,7 @@
},
},
],
imagePullSecrets => $image_pull_secrets,
dnsPolicy => 'Default',
volumes => [
{
Expand Down
4 changes: 4 additions & 0 deletions manifests/server/resources/flannel.pp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
# @param image_tag The Flannel image tag to use
# @param daemonset_config Additional configuration to merge into the DaemonSet object
# @param net_config Additional configuration to merge into net-conf.json for Flannel
# @param image_pull_secrets the secrets to pull from private registries
#
class k8s::server::resources::flannel (
K8s::Ensure $ensure = $k8s::ensure,
Stdlib::Unixpath $kubeconfig = $k8s::server::resources::kubeconfig,
Expand All @@ -16,6 +18,7 @@
String[1] $image = $k8s::server::resources::flannel_image,
String[1] $image_tag = $k8s::server::resources::flannel_tag,
Hash[String,Data] $daemonset_config = $k8s::server::resources::flannel_daemonset_config,
Optional[Array] $image_pull_secrets = $k8s::server::resources::image_pull_secrets,
Hash[String,Data] $net_config = {},
) {
assert_private()
Expand Down Expand Up @@ -243,6 +246,7 @@
],
},
],
imagePullSecrets => $image_pull_secrets,
initContainers => [
{
name => 'install-cni-plugin',
Expand Down
4 changes: 4 additions & 0 deletions manifests/server/resources/kube_proxy.pp
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,15 @@
# @param daemonset_config Additional configuration to merge into the DaemonSet object
# @param extra_args Additional arguments to specify to the kube-proxy application
# @param extra_config Additional configuration data to apply to the kube-proxy configuration file
# @param image_pull_secrets the secrets to pull from private registries
#
class k8s::server::resources::kube_proxy (
K8s::Ensure $ensure = $k8s::ensure,
Stdlib::Unixpath $kubeconfig = $k8s::server::resources::kubeconfig,
K8s::CIDR $cluster_cidr = $k8s::server::resources::cluster_cidr,
String[1] $image = $k8s::server::resources::kube_proxy_image,
String[1] $image_tag = $k8s::server::resources::kube_proxy_tag,
Optional[Array] $image_pull_secrets = $k8s::server::resources::image_pull_secrets,
Hash[String,Data] $daemonset_config = {},
Hash[String,Data] $extra_args = {},
Hash[String,Data] $extra_config = {},
Expand Down Expand Up @@ -239,6 +242,7 @@
],
}
],
imagePullSecrets => $image_pull_secrets,
hostNetwork => true,
priorityClassName => 'system-node-critical',
serviceAccountName => 'kube-proxy',
Expand Down
1 change: 1 addition & 0 deletions spec/fixtures/files/resources/kube-proxy-older.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ spec:
readOnly: true
- mountPath: "/run/xtables.lock"
name: iptables-lock
imagePullSecrets: null
hostNetwork: true
priorityClassName: system-node-critical
serviceAccountName: kube-proxy
Expand Down
1 change: 1 addition & 0 deletions spec/fixtures/files/resources/kube-proxy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ spec:
readOnly: true
- mountPath: "/run/xtables.lock"
name: iptables-lock
imagePullSecrets: null
hostNetwork: true
priorityClassName: system-node-critical
serviceAccountName: kube-proxy
Expand Down