Merge pull request #136 from squat/telemeter_bump

Telemeter salt
openshift · Oct 26, 2018 · 141e8ae · 141e8ae
2 parents 19832cd + 321d2c9
commit 141e8ae
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/assets/telemeter-client/deployment.yaml b/assets/telemeter-client/deployment.yaml
@@ -26,6 +26,7 @@ spec:
         - --to-token-file=/etc/telemeter/token
         - --listen=localhost:8080
         - --match-file=/etc/telemeter/match-rules
+        - --anonymize-salt-file=/etc/telemeter/salt
         env:
         - name: ID
           valueFrom:

diff --git a/assets/telemeter-client/secret.yaml b/assets/telemeter-client/secret.yaml
@@ -1,7 +1,9 @@
 apiVersion: v1
 data:
   match-rules: e19fbmFtZV9fPSJ1cCJ9CntfX25hbWVfXz0ib3BlbnNoaWZ0X2J1aWxkX2luZm8ifQp7X19uYW1lX189Im1hY2hpbmVfY3B1X2NvcmVzIn0Ke19fbmFtZV9fPSJtYWNoaW5lX21lbW9yeV9ieXRlcyJ9CntfX25hbWVfXz0iZXRjZF9vYmplY3RfY291bnRzIn0Ke19fbmFtZV9fPSJBTEVSVFMiLGFsZXJ0c3RhdGU9ImZpcmluZyJ9
+  salt: ""
   to: aHR0cHM6Ly9pbmZvZ3cuYXBpLm9wZW5zaGlmdC5jb20=
+  token: ""
 kind: Secret
 metadata:
   labels:

diff --git a/jsonnet/jsonnetfile.lock.json b/jsonnet/jsonnetfile.lock.json
@@ -78,7 +78,7 @@
                     "subdir": "Documentation/etcd-mixin"
                 }
             },
-            "version": "798955d4d67db09e69dc2e3deb06950a569f4d77"
+            "version": "583763261f1c843e07c1bf7fea5fb4cfb684fe87"
         },
         {
             "name": "telemeter-client",
@@ -88,7 +88,7 @@
                     "subdir": "jsonnet/telemeter/client"
                 }
             },
-            "version": "9dde1deabaf931d60a19793f1fca5746ec9d702a"
+            "version": "a867a43f1ee44a68a6ec58e5bbbbe8f8246b1d90"
         }
     ]
 }
diff --git a/pkg/manifests/bindata.go b/pkg/manifests/bindata.go
diff --git a/pkg/manifests/manifests.go b/pkg/manifests/manifests.go
@@ -1527,7 +1527,13 @@ func (f *Factory) TelemeterClientSecret() (*v1.Secret, error) {
 		return nil, err
 	}
 
+	salt, err := GeneratePassword(32)
+	if err != nil {
+		return nil, fmt.Errorf("failed to generate Telemeter client salt: %v", err)
+	}
+
 	s.Data["id"] = []byte(f.config.TelemeterClientConfig.ClusterID)
+	s.Data["salt"] = []byte(salt)
 	s.Data["to"] = []byte(f.config.TelemeterClientConfig.TelemeterServerURL)
 	s.Data["token"] = []byte(f.config.TelemeterClientConfig.Token)
 	s.Namespace = f.namespace