Merge pull request #942 from laverya/update-k8s-and-kustomize

update embedded kustomize version to 2.0.3 from 2.0.2

Author: laverya

Gopkg.lock

@@ -89,39 +89,39 @@ ignored = [
 
 [[constraint]]
   name = "sigs.k8s.io/kustomize"
-  version = "2.0.2"
+  version = "2.0.3"
 
 [[override]]
   name = "k8s.io/kubernetes"
-  version = "1.13.4"
+  version = "1.13.6"
 
 [[override]]
   name = "k8s.io/code-generator"
-  version = "kubernetes-1.13.4"
+  version = "kubernetes-1.13.6"
 
 [[override]]
   name = "k8s.io/api"
-  version = "kubernetes-1.13.4"
+  version = "kubernetes-1.13.6"
 
 [[override]]
   name = "k8s.io/apiserver"
-  version = "kubernetes-1.13.4"
+  version = "kubernetes-1.13.6"
 
 [[override]]
   name = "k8s.io/apimachinery"
-  version = "kubernetes-1.13.4"
+  version = "kubernetes-1.13.6"
 
 [[override]]
   name = "k8s.io/apiextensions-apiserver"
-  version = "kubernetes-1.13.4"
+  version = "kubernetes-1.13.6"
 
 [[override]]
   name = "k8s.io/cli-runtime"
-  version = "kubernetes-1.13.4"
+  version = "kubernetes-1.13.6"
 
 [[override]]
   name = "k8s.io/client-go"
-  version = "kubernetes-1.13.4"
+  version = "kubernetes-1.13.6"
 
 [[override]]
   name = "github.com/russross/blackfriday"

Gopkg.toml

@@ -14,7 +14,7 @@ VERSION_PACKAGE = github.com/replicatedhq/ship/pkg/version
 VERSION ?=`git describe --tags`
 DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"`
 HELMV = v2.13.0
-KUSTOMIZEV = v2.0.2
+KUSTOMIZEV = v2.0.3
 TERRAFORMV = v0.11.13
 
 GIT_TREE = $(shell git rev-parse --is-inside-work-tree 2>/dev/null)

Makefile

@@ -28,7 +28,7 @@ builds:
     -X github.com/replicatedhq/ship/pkg/version.gitSHA={{.Commit}}
     -X github.com/replicatedhq/ship/pkg/version.buildTime={{.Date}}
     -X github.com/replicatedhq/ship/pkg/version.helm=v2.13.0
-    -X github.com/replicatedhq/ship/pkg/version.kustomize=v2.0.2
+    -X github.com/replicatedhq/ship/pkg/version.kustomize=v2.0.3
     -X github.com/replicatedhq/ship/pkg/version.terraform=v0.11.13
     -extldflags "-static"
   flags: -tags netgo -installsuffix netgo

deploy/.goreleaser.unstable.yml

@@ -28,7 +28,7 @@ builds:
     -X github.com/replicatedhq/ship/pkg/version.gitSHA={{.Commit}}
     -X github.com/replicatedhq/ship/pkg/version.buildTime={{.Date}}
     -X github.com/replicatedhq/ship/pkg/version.helm=v2.13.0
-    -X github.com/replicatedhq/ship/pkg/version.kustomize=v2.0.2
+    -X github.com/replicatedhq/ship/pkg/version.kustomize=v2.0.3
     -X github.com/replicatedhq/ship/pkg/version.terraform=v0.11.13
     -extldflags "-static"
   flags: -tags netgo -installsuffix netgo

deploy/.goreleaser.yml

@@ -1101,6 +1101,98 @@ status:
   conditions: []
   storedVersions: []
 ---
+apiVersion: admissionregistration.k8s.io/v1beta1
+kind: ValidatingWebhookConfiguration
+metadata:
+  annotations:
+    certmanager.k8s.io/inject-apiserver-ca: "true"
+  labels:
+    app: webhook
+    release: cert-manager
+  name: cert-manager-webhook
+webhooks:
+- clientConfig:
+    service:
+      name: kubernetes
+      namespace: default
+      path: /apis/admission.certmanager.k8s.io/v1beta1/certificates
+  failurePolicy: Fail
+  name: certificates.admission.certmanager.k8s.io
+  namespaceSelector:
+    matchExpressions:
+    - key: certmanager.k8s.io/disable-validation
+      operator: NotIn
+      values:
+      - "true"
+    - key: name
+      operator: NotIn
+      values:
+      - cert-manager
+  rules:
+  - apiGroups:
+    - certmanager.k8s.io
+    apiVersions:
+    - v1alpha1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - certificates
+- clientConfig:
+    service:
+      name: kubernetes
+      namespace: default
+      path: /apis/admission.certmanager.k8s.io/v1beta1/issuers
+  failurePolicy: Fail
+  name: issuers.admission.certmanager.k8s.io
+  namespaceSelector:
+    matchExpressions:
+    - key: certmanager.k8s.io/disable-validation
+      operator: NotIn
+      values:
+      - "true"
+    - key: name
+      operator: NotIn
+      values:
+      - cert-manager
+  rules:
+  - apiGroups:
+    - certmanager.k8s.io
+    apiVersions:
+    - v1alpha1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - issuers
+- clientConfig:
+    service:
+      name: kubernetes
+      namespace: default
+      path: /apis/admission.certmanager.k8s.io/v1beta1/clusterissuers
+  failurePolicy: Fail
+  name: clusterissuers.admission.certmanager.k8s.io
+  namespaceSelector:
+    matchExpressions:
+    - key: certmanager.k8s.io/disable-validation
+      operator: NotIn
+      values:
+      - "true"
+    - key: name
+      operator: NotIn
+      values:
+      - cert-manager
+  rules:
+  - apiGroups:
+    - certmanager.k8s.io
+    apiVersions:
+    - v1alpha1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - clusterissuers
+---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -1479,98 +1571,6 @@ spec:
             memory: 32Mi
       serviceAccountName: cert-manager
 ---
-apiVersion: admissionregistration.k8s.io/v1beta1
-kind: ValidatingWebhookConfiguration
-metadata:
-  annotations:
-    certmanager.k8s.io/inject-apiserver-ca: "true"
-  labels:
-    app: webhook
-    release: cert-manager
-  name: cert-manager-webhook
-webhooks:
-- clientConfig:
-    service:
-      name: kubernetes
-      namespace: default
-      path: /apis/admission.certmanager.k8s.io/v1beta1/certificates
-  failurePolicy: Fail
-  name: certificates.admission.certmanager.k8s.io
-  namespaceSelector:
-    matchExpressions:
-    - key: certmanager.k8s.io/disable-validation
-      operator: NotIn
-      values:
-      - "true"
-    - key: name
-      operator: NotIn
-      values:
-      - cert-manager
-  rules:
-  - apiGroups:
-    - certmanager.k8s.io
-    apiVersions:
-    - v1alpha1
-    operations:
-    - CREATE
-    - UPDATE
-    resources:
-    - certificates
-- clientConfig:
-    service:
-      name: kubernetes
-      namespace: default
-      path: /apis/admission.certmanager.k8s.io/v1beta1/issuers
-  failurePolicy: Fail
-  name: issuers.admission.certmanager.k8s.io
-  namespaceSelector:
-    matchExpressions:
-    - key: certmanager.k8s.io/disable-validation
-      operator: NotIn
-      values:
-      - "true"
-    - key: name
-      operator: NotIn
-      values:
-      - cert-manager
-  rules:
-  - apiGroups:
-    - certmanager.k8s.io
-    apiVersions:
-    - v1alpha1
-    operations:
-    - CREATE
-    - UPDATE
-    resources:
-    - issuers
-- clientConfig:
-    service:
-      name: kubernetes
-      namespace: default
-      path: /apis/admission.certmanager.k8s.io/v1beta1/clusterissuers
-  failurePolicy: Fail
-  name: clusterissuers.admission.certmanager.k8s.io
-  namespaceSelector:
-    matchExpressions:
-    - key: certmanager.k8s.io/disable-validation
-      operator: NotIn
-      values:
-      - "true"
-    - key: name
-      operator: NotIn
-      values:
-      - cert-manager
-  rules:
-  - apiGroups:
-    - certmanager.k8s.io
-    apiVersions:
-    - v1alpha1
-    operations:
-    - CREATE
-    - UPDATE
-    resources:
-    - clusterissuers
----
 apiVersion: apiregistration.k8s.io/v1beta1
 kind: APIService
 metadata: