Skip to content
Snippets Groups Projects
Commit 107028ff authored by Matthias Loibl's avatar Matthias Loibl
Browse files

Remove extra ksonnet4 dependency

parent 2e4b89b0
No related branches found
No related tags found
No related merge requests found
Showing
with 21 additions and 37 deletions
local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
{ {
_config+:: { _config+:: {
......
...@@ -49,16 +49,6 @@ ...@@ -49,16 +49,6 @@
} }
}, },
"version": "master" "version": "master"
},
{
"name": "ksonnet4",
"source": {
"git": {
"remote": "https://github.com/metalmatze/ksonnet-lib",
"subdir": ""
}
},
"version": "ksonnet.beta.4"
} }
] ]
} }
local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
local statefulSet = k.apps.v1.statefulSet; local statefulSet = k.apps.v1.statefulSet;
local affinity = statefulSet.mixin.spec.template.spec.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecutionType; local affinity = statefulSet.mixin.spec.template.spec.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecutionType;
local matchExpression = affinity.mixin.podAffinityTerm.labelSelector.matchExpressionsType; local matchExpression = affinity.mixin.podAffinityTerm.labelSelector.matchExpressionsType;
......
local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
local service = k.core.v1.service; local service = k.core.v1.service;
local servicePort = k.core.v1.service.mixin.spec.portsType; local servicePort = k.core.v1.service.mixin.spec.portsType;
......
local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
local service = k.core.v1.service; local service = k.core.v1.service;
local servicePort = k.core.v1.service.mixin.spec.portsType; local servicePort = k.core.v1.service.mixin.spec.portsType;
......
local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
local service = k.core.v1.service; local service = k.core.v1.service;
local servicePort = k.core.v1.service.mixin.spec.portsType; local servicePort = k.core.v1.service.mixin.spec.portsType;
......
local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
local service = k.core.v1.service; local service = k.core.v1.service;
local servicePort = k.core.v1.service.mixin.spec.portsType; local servicePort = k.core.v1.service.mixin.spec.portsType;
......
local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
local service = k.core.v1.service; local service = k.core.v1.service;
local servicePort = k.core.v1.service.mixin.spec.portsType; local servicePort = k.core.v1.service.mixin.spec.portsType;
......
local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
local service = k.core.v1.service; local service = k.core.v1.service;
local servicePort = k.core.v1.service.mixin.spec.portsType; local servicePort = k.core.v1.service.mixin.spec.portsType;
......
local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
local service = k.core.v1.service; local service = k.core.v1.service;
local servicePort = k.core.v1.service.mixin.spec.portsType; local servicePort = k.core.v1.service.mixin.spec.portsType;
......
local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
(import 'etcd-mixin/mixin.libsonnet') + { (import 'etcd-mixin/mixin.libsonnet') + {
_config+:: { _config+:: {
......
local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
local service = k.core.v1.service; local service = k.core.v1.service;
local servicePort = k.core.v1.service.mixin.spec.portsType; local servicePort = k.core.v1.service.mixin.spec.portsType;
......
local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
local k3 = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; local k3 = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
local configMapList = k3.core.v1.configMapList; local configMapList = k3.core.v1.configMapList;
......
local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
{ {
_config+:: { _config+:: {
......
local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
{ {
_config+:: { _config+:: {
......
local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
{ {
_config+:: { _config+:: {
......
local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
local k3 = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; local k3 = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
{ {
......
...@@ -8,7 +8,11 @@ ...@@ -8,7 +8,11 @@
"subdir": "jsonnet/kube-prometheus" "subdir": "jsonnet/kube-prometheus"
} }
}, },
<<<<<<< HEAD
"version": "bedeadb7f5686537b7733096dcbb86ab0f722ce8" "version": "bedeadb7f5686537b7733096dcbb86ab0f722ce8"
=======
"version": "c5c70e2101c29818d350a3b90ae0e417a5602507"
>>>>>>> Remove extra ksonnet4 dependency
}, },
{ {
"name": "ksonnet", "name": "ksonnet",
...@@ -18,17 +22,7 @@ ...@@ -18,17 +22,7 @@
"subdir": "" "subdir": ""
} }
}, },
"version": "d03da231d6c8bd74437b74a1e9e8b966f13dffa2" "version": "0d2f82676817bbf9e4acf6495b2090205f323b9f"
},
{
"name": "ksonnet4",
"source": {
"git": {
"remote": "https://github.com/metalmatze/ksonnet-lib",
"subdir": ""
}
},
"version": "3e10db7d0dce7c175ac03be631001489b5578744"
}, },
{ {
"name": "kubernetes-mixin", "name": "kubernetes-mixin",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment