fix(state): package repo fix

saltstack-formulas · Jul 7, 2020 · ee37c64 · ee37c64
1 parent c164992
commit ee37c64
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 12 deletions.
diff --git a/kubernetes/defaults.yaml b/kubernetes/defaults.yaml
@@ -49,11 +49,11 @@ kubernetes:
   kubeadm:
     pkg:
       name: kubeadm
-      use_upstream_repo: true
+      use_upstream_repo: false
   kubelet:
     pkg:
       name: kubelet
-      use_upstream_repo: true
+      use_upstream_repo: false
   minikube:
     version: 1.9.2
     config_file: /etc/default/minikube.ini

diff --git a/kubernetes/kubeadm/package/clean.sls b/kubernetes/kubeadm/package/clean.sls
@@ -5,7 +5,7 @@
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
 {%- set formula = d.formula %}
 
-    {%- if grains.kernel|lower in ('linux',) %}
+    {%- if grains.os_family|lower in ('redhat', 'debian') %}
         {%- if d.kubeadm.pkg.use_upstream_repo %}
             {%- set sls_repo_clean = tplroot ~ '.package.repo.clean' %}
 include:

diff --git a/kubernetes/kubeadm/package/install.sls b/kubernetes/kubeadm/package/install.sls
@@ -5,7 +5,7 @@
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
 {%- set formula = d.formula %}
 
-    {%- if grains.kernel|lower in ('linux',) %}
+    {%- if grains.os_family|lower in ('redhat', 'debian') %}
         {%- if d.kubeadm.pkg.use_upstream_repo %}
             {%- set sls_repo_install = tplroot ~ '.package.repo.install' %}
 include:

diff --git a/kubernetes/kubelet/package/clean.sls b/kubernetes/kubelet/package/clean.sls
@@ -5,7 +5,7 @@
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
 {%- set formula = d.formula %}
 
-    {%- if grains.kernel|lower in ('linux',) %}
+    {%- if grains.os_family|lower in ('redhat', 'debian') %}
         {%- if d.kubelet.pkg.use_upstream_repo %}
             {%- set sls_repo_clean = tplroot ~ '.package.repo.clean' %}
 include:

diff --git a/kubernetes/kubelet/package/install.sls b/kubernetes/kubelet/package/install.sls
@@ -5,7 +5,7 @@
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
 {%- set formula = d.formula %}
 
-    {%- if grains.kernel|lower in ('linux',) %}
+    {%- if grains.os_family|lower in ('redhat', 'debian') %}
         {%- if d.kubelet.pkg.use_upstream_repo %}
             {%- set sls_repo_install = tplroot ~ '.package.repo.install' %}
 include:

diff --git a/kubernetes/package/repo/install.sls b/kubernetes/package/repo/install.sls
@@ -4,8 +4,9 @@
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
 {%- set formula = d.formula %}
+{%- from tplroot ~ "/files/macros.jinja" import format_kwargs with context %}
 
 {{ formula }}-package-repo-managed:
   pkgrepo.managed:
-    {{- format_kwargs(k8s.pkg.repo) }}
+    {{- format_kwargs(d.pkg.repo) }}
     - onlyif: {{ d.pkg.repo }}
diff --git a/test/integration/default/controls/default_spec.rb b/test/integration/default/controls/default_spec.rb
@@ -64,11 +64,11 @@
     it { should be_file }
     it { should_not be_directory }
   end
-  describe file('/usr/local/bin/crictl') do
-    it { should be_symlink }
-    it { should be_file }
-    it { should_not be_directory }
-  end
+  # describe file('/usr/bin/crictl') do
+  # describe file('/usr/local/bin/crictl') do
+  #   it { should be_file }
+  #   it { should_not be_directory }
+  # end
   describe file('/usr/local/bin/ctr') do
     it { should be_symlink }
     it { should be_file }