Fix cache race status

go.mod

@@ -5,6 +5,7 @@ go 1.13
 require (
 	github.com/avast/retry-go v2.4.3+incompatible
 	github.com/containerd/containerd v1.3.0
+	github.com/cratonica/2goarray v0.0.0-20190331194516-514510793eaa // indirect
 	github.com/deislabs/oras v0.7.0
 	github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017
 	github.com/docker/distribution v2.7.1+incompatible
@@ -15,8 +16,8 @@ require (
 	github.com/envoyproxy/protoc-gen-validate v0.1.0
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
 	github.com/gogo/protobuf v1.3.1
-	github.com/golang/mock v1.4.0
-	github.com/golang/protobuf v1.3.3
+	github.com/golang/mock v1.4.1
+	github.com/golang/protobuf v1.3.4
 	github.com/hashicorp/go-multierror v1.0.0
 	github.com/manifoldco/promptui v0.7.0
 	github.com/mitchellh/reflectwalk v1.0.1 // indirect
@@ -36,11 +37,12 @@ require (
 	github.com/spf13/cobra v0.0.5
 	github.com/spf13/pflag v1.0.5
 	go.uber.org/zap v1.13.0
-	golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d // indirect
+	golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 // indirect
 	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
-	golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9 // indirect
+	golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 // indirect
 	istio.io/api v0.0.0-20191109011911-e51134872853
 	istio.io/client-go v0.0.0-20191206191348-5c576a7ecef0
+	istio.io/tools v0.0.0-20200305195048-87315378a999 // indirect
 	k8s.io/api v0.17.1
 	k8s.io/apimachinery v0.17.1
 	k8s.io/client-go v11.0.0+incompatible

go.sum

@@ -198,6 +198,8 @@ github.com/coreos/rkt v1.30.0/go.mod h1:O634mlH6U7qk87poQifK6M2rsFNt+FyUTWNMnP1h
 github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk=
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/cratonica/2goarray v0.0.0-20190331194516-514510793eaa h1:Wg+722vs7a2zQH5lR9QWYsVbplKeffaQFIs5FTdfNNo=
+github.com/cratonica/2goarray v0.0.0-20190331194516-514510793eaa/go.mod h1:6Arca19mRx58CA7OWEd7Wu1NpC1rd3uDnNs6s1pj/DI=
 github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
 github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -420,6 +422,8 @@ github.com/golang/mock v1.3.1 h1:qGJ6qTW+x6xX/my+8YUVl4WNpX9B7+/l2tRsHGZ7f2s=
 github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
 github.com/golang/mock v1.4.0 h1:Rd1kQnQu0Hq3qvJppYSG0HtP+f5LPPUiDswTLiEegLg=
 github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.1 h1:ocYkMQY5RrXTYgXl7ICpV0IXwlEQGwKIsery4gyXa1U=
+github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.0.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -428,6 +432,8 @@ github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.4 h1:87PNWwrRvUSnqS4dlcBU/ftvOIBep4sYuBLlh6rX2wk=
+github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho=
@@ -1062,6 +1068,8 @@ golang.org/x/crypto v0.0.0-20200117160349-530e935923ad h1:Jh8cai0fqIK+f6nG0UgPW5
 golang.org/x/crypto v0.0.0-20200117160349-530e935923ad/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d h1:9FCpayM9Egr1baVnV1SX0H87m+XB0B8S0hAMi99X/3U=
 golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 h1:xMPOj6Pz6UipU1wXLkrtqpHbR0AVFnyPEQq/wRWz9lM=
+golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -1174,6 +1182,8 @@ golang.org/x/sys v0.0.0-20200117145432-59e60aa80a0c h1:gUYreENmqtjZb2brVfUas1sC6
 golang.org/x/sys v0.0.0-20200117145432-59e60aa80a0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9 h1:1/DFK4b7JH8DmkqhUk48onnSfrPzImPoVxuomtbT2nk=
 golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 h1:uYVVQ9WP/Ds2ROhcaGPeIdVq0RIXVLwsHlnvJ+cT1So=
+golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1338,8 +1348,11 @@ istio.io/gogo-genproto v0.0.0-20190930162913-45029607206a h1:w7zILua2dnYo9CxImhp
 istio.io/gogo-genproto v0.0.0-20190930162913-45029607206a/go.mod h1:OzpAts7jljZceG4Vqi5/zXy/pOg1b209T3jb7Nv5wIs=
 istio.io/gogo-genproto v0.0.0-20191009201739-17d570f95998 h1:uvW88tRzT6wjR+SdqPoDjR0jjKTYWmjOp2Z1jXs1ZJQ=
 istio.io/gogo-genproto v0.0.0-20191009201739-17d570f95998/go.mod h1:OzpAts7jljZceG4Vqi5/zXy/pOg1b209T3jb7Nv5wIs=
+istio.io/tools v0.0.0-20200128155652-36eceb1fcb9d h1:XR0dBGt0upeD2PGAwWABjxQK7D0WabvCeW+HUzNRSeA=
 istio.io/tools v0.0.0-20200128155652-36eceb1fcb9d/go.mod h1:6u5K87o8AZvfCdPhr0M60yuZR5/4pPCOCiokv7P+I+0=
 istio.io/tools v0.0.0-20200214155848-b0036b2c2d76/go.mod h1:6u5K87o8AZvfCdPhr0M60yuZR5/4pPCOCiokv7P+I+0=
+istio.io/tools v0.0.0-20200305195048-87315378a999 h1:8b/JaXC2x02Bo99wj8MSDvSc953mgBQysHlMsXxHbV4=
+istio.io/tools v0.0.0-20200305195048-87315378a999/go.mod h1:6u5K87o8AZvfCdPhr0M60yuZR5/4pPCOCiokv7P+I+0=
 k8s.io/api v0.0.0-20191004120104-195af9ec3521 h1:StP5An9aFEWfPckudvHEJc4q/WUDCUVGoZJrE/efGME=
 k8s.io/api v0.0.0-20191004120104-195af9ec3521/go.mod h1:/L5qH+AD540e7Cetbui1tuJeXdmNhO8jM6VkXeDdDhQ=
 k8s.io/apiextensions-apiserver v0.0.0-20191204090712-e0e829f17bab h1:pu/YuiYiCpzZuoM+CCbMRg+6y/duiWp5QgD7MmmhtmQ=

operator/generate.go

@@ -169,22 +169,18 @@ func makeOperator() model.Operator {
 
 func makeCache() model.Operator {
 	name := "wasme-cache"
-	defaultDaemonSet := cache.MakeDaemonSet(name, "", "", nil, nil, "")
+	defaultDaemonSet := cache.MakeDeployment(name, "", "", nil, nil, "")
 	defaultRole, _ := cache.MakeRbac(name, "")
-	cacheVolumes := defaultDaemonSet.Spec.Template.Spec.Volumes
 	cacheContainer := defaultDaemonSet.Spec.Template.Spec.Containers[0]
 
 	return model.Operator{
 		Name: name,
 		Deployment: model.Deployment{
-			Image:        makeImage(),
-			Resources:    &cacheContainer.Resources,
-			UseDaemonSet: true,
+			Image:     makeImage(),
+			Resources: &cacheContainer.Resources,
 		},
-		Args:         cache.DefaultCacheArgs("{{ .Release.Namespace }}"),
-		Volumes:      cacheVolumes,
-		VolumeMounts: cacheContainer.VolumeMounts,
-		Rbac:         defaultRole.Rules,
+		Args: cache.DefaultCacheArgs("{{ .Release.Namespace }}"),
+		Rbac: defaultRole.Rules,
 		ConfigMaps: []v1.ConfigMap{
 			{
 				ObjectMeta: metav1.ObjectMeta{

operator/install/wasme-default.yaml

@@ -5,18 +5,16 @@ kind: Namespace
 metadata:
   name: wasme
 ---
-# Source: Wasme Operator/templates/configmap.yaml
-# ConfigMap wasme-cache
+# Source: Wasme Operator/templates/deployment.yaml
+# Service account for wasme-operator
+
 apiVersion: v1
-kind: ConfigMap
+kind: ServiceAccount
 metadata:
   labels:
-    app: wasme-cache
-    configmap: wasme-cache
-  name: wasme-cache
+    app: wasme-operator
+  name: wasme-operator
   namespace: wasme
-data:
-  images: ""
 ---
 # Source: Wasme Operator/templates/deployment.yaml
 # Service account for wasme-operator
@@ -29,16 +27,17 @@ metadata:
   name: wasme-operator
   namespace: wasme
 ---
-# Source: Wasme Operator/templates/deployment.yaml
-# Service account for wasme-cache
-
+# Source: Wasme Operator/templates/configmap.yaml
+# ConfigMap wasme-cache
 apiVersion: v1
-kind: ServiceAccount
+kind: ConfigMap
 metadata:
   labels:
     app: wasme-cache
   name: wasme-cache
   namespace: wasme
+data:
+  images: ""
 ---
 # Source: Wasme Operator/templates/rbac.yaml
 kind: ClusterRole
@@ -148,65 +147,58 @@ roleRef:
   name: wasme-cache
   apiGroup: rbac.authorization.k8s.io
 ---
+# Source: Wasme Operator/templates/service.yaml
+# Service manifest for wasme-operator
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: wasme-cache
+  name: wasme-cache
+  namespace: wasme
+spec:
+  type: ClusterIP
+  selector:
+    app: wasme-cache
+  ports:
+  - port: 9979
+    targetPort: 9979
+---
 # Source: Wasme Operator/templates/deployment.yaml
-# DaemonSet manifest for wasme-cache
+# Deployment manifest for wasme-operator
 
 apiVersion: apps/v1
-kind: DaemonSet
+kind: Deployment
 metadata:
   labels:
-    app: wasme-cache
-  name: wasme-cache
+    app: wasme-operator
+  name: wasme-operator
   namespace: wasme
 spec:
   selector:
     matchLabels:
-      app: wasme-cache
+      app: wasme-operator
   template:
     metadata:
       labels:
-        app: wasme-cache
+        app: wasme-operator
       annotations:
         prometheus.io/path: /metrics
         prometheus.io/port: "9091"
         prometheus.io/scrape: "true"
     spec:
-      serviceAccountName: wasme-cache
-      volumes:
-      - hostPath:
-          path: /var/local/lib/wasme-cache
-          type: DirectoryOrCreate
-        name: cache-dir
-      - configMap:
-          items:
-          - key: images
-            path: images.txt
-          name: wasme-cache
-        name: config
+      serviceAccountName: wasme-operator
       containers:
       - image: quay.io/solo-io/wasme:dev
         args:
-        - cache
-        - --directory
-        - /var/local/lib/wasme-cache
-        - --ref-file
-        - /etc/wasme-cache/images.txt
-        - --cache-ns
-        - 'wasme'
-        volumeMounts:
-        - mountPath: /var/local/lib/wasme-cache
-          name: cache-dir
-        - mountPath: /etc/wasme-cache
-          name: config
+        - operator
+        - --log-level=debug
         imagePullPolicy: Always
-        name: wasme-cache
+        name: wasme-operator
         resources:
-          limits:
-            cpu: 500m
-            memory: 256Mi
           requests:
-            cpu: 50m
-            memory: 128Mi
+            cpu: 125m
+            memory: 256Mi
         securityContext:
           readOnlyRootFilesystem: true
           allowPrivilegeEscalation: false
@@ -215,40 +207,42 @@ spec:
             - ALL
 ---
 # Source: Wasme Operator/templates/deployment.yaml
-# Deployment manifest for wasme-operator
+# Deployment manifest for wasme-cache
 
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: wasme-operator
-  name: wasme-operator
+    app: wasme-cache
+  name: wasme-cache
   namespace: wasme
 spec:
   selector:
     matchLabels:
-      app: wasme-operator
+      app: wasme-cache
   template:
     metadata:
       labels:
-        app: wasme-operator
+        app: wasme-cache
       annotations:
         prometheus.io/path: /metrics
         prometheus.io/port: "9091"
         prometheus.io/scrape: "true"
     spec:
-      serviceAccountName: wasme-operator
+      serviceAccountName: wasme-cache
       containers:
       - image: quay.io/solo-io/wasme:dev
         args:
-        - operator
-        - --log-level=debug
+        - cache
         imagePullPolicy: Always
-        name: wasme-operator
+        name: wasme-cache
         resources:
-          requests:
-            cpu: 125m
+          limits:
+            cpu: 500m
             memory: 256Mi
+          requests:
+            cpu: 50m
+            memory: 128Mi
         securityContext:
           readOnlyRootFilesystem: true
           allowPrivilegeEscalation: false

operator/install/wasme/templates/deployment.yaml

@@ -66,12 +66,12 @@ metadata:
   namespace: {{ $.Release.Namespace }}
 ---
 
-# DaemonSet manifest for wasme-cache
+# Deployment manifest for wasme-cache
 {{- $wasmeCache := $.Values.wasmeCache}}
 {{- $wasmeCacheImage := $wasmeCache.image }}
 
 apiVersion: apps/v1
-kind: DaemonSet
+kind: Deployment
 metadata:
   labels:
     app: wasme-cache
@@ -91,32 +91,10 @@ spec:
         prometheus.io/scrape: "true"
     spec:
       serviceAccountName: wasme-cache
-      volumes:
-      - hostPath:
-          path: /var/local/lib/wasme-cache
-          type: DirectoryOrCreate
-        name: cache-dir
-      - configMap:
-          items:
-          - key: images
-            path: images.txt
-          name: wasme-cache
-        name: config
       containers:
       - image: {{ $wasmeCacheImage.registry }}/{{ $wasmeCacheImage.repository }}:{{ $wasmeCacheImage.tag }}
         args:
         - cache
-        - --directory
-        - /var/local/lib/wasme-cache
-        - --ref-file
-        - /etc/wasme-cache/images.txt
-        - --cache-ns
-        - '{{ .Release.Namespace }}'
-        volumeMounts:
-        - mountPath: /var/local/lib/wasme-cache
-          name: cache-dir
-        - mountPath: /etc/wasme-cache
-          name: config
         imagePullPolicy: {{ $wasmeCacheImage.pullPolicy }}
         name: wasme-cache
 {{- if $wasmeCache.resources }}

operator/install/wasme/templates/service.yaml

@@ -0,0 +1,15 @@
+# Service manifest for wasme-operator
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: wasme-cache
+  name: wasme-cache
+  namespace: {{ .Release.Namespace }}
+spec:
+  type: ClusterIP
+  selector:
+    app: wasme-cache
+  ports:
+  - port: 9979
+    targetPort: 9979