Merge pull request #335 from brancz/upgrade-apps-api

jsonnet: Upgrade apps API versions used to apps/v1
openshift · May 20, 2020 · ca9c4f2 · ca9c4f2
2 parents b87104d + 6815a7a
commit ca9c4f2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/jsonnet/telemeter/client/kubernetes.libsonnet b/jsonnet/telemeter/client/kubernetes.libsonnet
@@ -1,4 +1,4 @@
-local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
+local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
 local secretName = 'telemeter-client';
 local secretVolumeName = 'secret-telemeter-client';
 local secretMountPath = '/etc/telemeter';
@@ -85,9 +85,9 @@ local securePort = 8443;
       clusterRoleBinding.withSubjects([{ kind: 'ServiceAccount', name: 'telemeter-client', namespace: $._config.namespace }]),
 
     deployment:
-      local deployment = k.apps.v1beta2.deployment;
-      local container = k.apps.v1beta2.deployment.mixin.spec.template.spec.containersType;
-      local volume = k.apps.v1beta2.deployment.mixin.spec.template.spec.volumesType;
+      local deployment = k.apps.v1.deployment;
+      local container = k.apps.v1.deployment.mixin.spec.template.spec.containersType;
+      local volume = k.apps.v1.deployment.mixin.spec.template.spec.volumesType;
       local containerPort = container.portsType;
       local containerVolumeMount = container.volumeMountsType;
       local containerEnv = container.envType;
@@ -126,7 +126,7 @@ local securePort = 8443;
           '--anonymize-salt-file=%s/salt' % secretMountPath,
           '--anonymize-labels=$(ANONYMIZE_LABELS)',
         ] + matchRules) +
-        container.withPorts(containerPort.newNamed('http', insecurePort)) +
+        container.withPorts(containerPort.newNamed(insecurePort, 'http')) +
         container.withVolumeMounts([sccabMount, secretMount]) +
         container.withEnv([anonymize, from, id, to, httpProxy, httpsProxy, noProxy]) +
         container.mixin.resources.withRequests({ cpu: '1m' });

diff --git a/jsonnet/telemeter/server/kubernetes.libsonnet b/jsonnet/telemeter/server/kubernetes.libsonnet
@@ -1,4 +1,4 @@
-local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
+local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
 local secretName = 'telemeter-server';
 local secretVolumeName = 'secret-telemeter-server';
 local tlsSecret = 'telemeter-server-shared';
@@ -33,9 +33,9 @@ local internalPort = 8081;
 
   telemeterServer+:: {
     statefulSet:
-      local statefulSet = k.apps.v1beta2.statefulSet;
-      local container = k.apps.v1beta2.statefulSet.mixin.spec.template.spec.containersType;
-      local volume = k.apps.v1beta2.statefulSet.mixin.spec.template.spec.volumesType;
+      local statefulSet = k.apps.v1.statefulSet;
+      local container = k.apps.v1.statefulSet.mixin.spec.template.spec.containersType;
+      local volume = k.apps.v1.statefulSet.mixin.spec.template.spec.volumesType;
       local containerPort = container.portsType;
       local containerVolumeMount = container.volumeMountsType;
       local containerEnv = container.envType;
@@ -89,8 +89,8 @@ local internalPort = 8081;
           '--client-secret=$(CLIENT_SECRET)',
         ] + memcached + whitelist + elide) +
         container.withPorts([
-          containerPort.newNamed('external', externalPort),
-          containerPort.newNamed('internal', internalPort),
+          containerPort.newNamed(externalPort, 'external'),
+          containerPort.newNamed(internalPort, 'internal'),
         ]) +
         container.mixin.resources.withLimitsMixin($._config.telemeterServer.resourceLimits) +
         container.mixin.resources.withRequestsMixin($._config.telemeterServer.resourceRequests) +
@@ -234,13 +234,13 @@ local internalPort = 8081;
       service.mixin.spec.withClusterIp('None'),
 
     statefulSet:
-      local sts = k.apps.v1beta2.statefulSet;
-      local container = k.apps.v1beta2.statefulSet.mixin.spec.template.spec.containersType;
+      local sts = k.apps.v1.statefulSet;
+      local container = k.apps.v1.statefulSet.mixin.spec.template.spec.containersType;
       local containerPort = container.portsType;
 
       local c =
         container.new('memcached', $.memcached.images.memcached + ':' + $.memcached.tags.memcached) +
-        container.withPorts([containerPort.newNamed($.memcached.service.spec.ports[0].name, $.memcached.service.spec.ports[0].port)]) +
+        container.withPorts([containerPort.newNamed($.memcached.service.spec.ports[0].port, $.memcached.service.spec.ports[0].name)]) +
         container.withArgs([
           '-m %(memoryLimitMB)s' % self,
           '-I %(maxItemSize)s' % self,
@@ -252,7 +252,7 @@ local internalPort = 8081;
 
       local exporter =
         container.new('exporter', $.memcached.images.exporter + ':' + $.memcached.tags.exporter) +
-        container.withPorts([containerPort.newNamed($.memcached.service.spec.ports[1].name, $.memcached.service.spec.ports[1].port)]) +
+        container.withPorts([containerPort.newNamed($.memcached.service.spec.ports[1].port, $.memcached.service.spec.ports[1].name)]) +
         container.withArgs([
           '--memcached.address=localhost:%d' % $.memcached.service.spec.ports[0].port,
           '--web.listen-address=0.0.0.0:%d' % $.memcached.service.spec.ports[1].port,

diff --git a/manifests/client/deployment.yaml b/manifests/client/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels: