chore: remove reference to private fork

minsiyang · KatieArmstr · commit d6920199b889 · 2022-02-17T11:59:19.000Z
diff --git a/Tiltfile b/Tiltfile
@@ -1,4 +1,4 @@
-docker_build("snyk/kubernetes-monitor-private-fork", ".",
+docker_build("snyk/kubernetes-monitor", ".",
   live_update=[
     fall_back_on(["package.json", "package-lock.json"]),
     sync('.', '/srv/app'),
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,10 +1,10 @@
 {
-  "name": "@snyk/kubernetes-monitor-private-fork",
+  "name": "@snyk/kubernetes-monitor",
   "private": true,
   "description": "Snyk Kubernetes Monitoring Container",
   "repository": {
     "type": "git",
-    "url": "https://github.com/snyk/kubernetes-monitor-private-fork.git"
+    "url": "https://github.com/snyk/kubernetes-monitor.git"
   },
   "license": "private",
   "author": "snyk.io",
diff --git a/scripts/circleci-jobs/setup-integration-tests.py b/scripts/circleci-jobs/setup-integration-tests.py
@@ -14,7 +14,7 @@
 else:
     image_tag = "discardable"
 circle_sha1 = os.getenv("CIRCLE_SHA1")
-kubernetes_monitor_image_name_and_tag = "snyk/kubernetes-monitor-private-fork:" + image_tag + "-" + circle_sha1
+kubernetes_monitor_image_name_and_tag = "snyk/kubernetes-monitor:" + image_tag + "-" + circle_sha1
 
 subprocess.getoutput("docker pull " + kubernetes_monitor_image_name_and_tag)
 
diff --git a/scripts/docker/approve-image.sh b/scripts/docker/approve-image.sh
@@ -8,8 +8,8 @@ if [ $1 == "null" ]; then
   echo Semantic-Release did not create a new version, not pushing a new approved image
   ./scripts/slack/notify_success_no_release.py
 else
-  IMAGE_NAME_CANDIDATE=snyk/kubernetes-monitor-private-fork:staging-candidate-${CIRCLE_SHA1}
-  IMAGE_NAME_APPROVED=snyk/kubernetes-monitor-private-fork:${1}-approved
+  IMAGE_NAME_CANDIDATE=snyk/kubernetes-monitor:staging-candidate-${CIRCLE_SHA1}
+  IMAGE_NAME_APPROVED=snyk/kubernetes-monitor:${1}-approved
 
   docker pull ${IMAGE_NAME_CANDIDATE}
   docker tag ${IMAGE_NAME_CANDIDATE} ${IMAGE_NAME_APPROVED}
diff --git a/scripts/docker/build-image.sh b/scripts/docker/build-image.sh
@@ -2,7 +2,7 @@
 
 # default value for our name and tag, when we don't want to push the image
 # for example when testing locally or on opening a PR
-LOCAL_DISCARDABLE_IMAGE=snyk/kubernetes-monitor-private-fork:local
+LOCAL_DISCARDABLE_IMAGE=snyk/kubernetes-monitor:local
 
 # allow overriding name and tag, when we intend to push the image
 # should happen on merging to `staging`
diff --git a/scripts/local-testing.sh b/scripts/local-testing.sh
@@ -7,7 +7,7 @@ get_latest_release() {
     sed 's/v//'                                                     # Remove "v" prefix
 }
 
-LATEST_TAG=$(get_latest_release snyk/kubernetes-monitor-private-fork)
+LATEST_TAG=$(get_latest_release snyk/kubernetes-monitor)
 IP=$(ifconfig | grep "inet " | grep -Fv 127.0.0.1 | awk 'NR==1{print $2}')
 
 if [ "$INTEGRATION_ID" == "" ]; then
diff --git a/scripts/operator/main.py b/scripts/operator/main.py
@@ -37,7 +37,7 @@
         print("Missing environment variable KUBERNETES_MONITOR_IMAGE_TAG")
         print("Building kubernetes-monitor image and pushing to DockerHub")
         new_monitor_tag = operator_version
-        monitor_name_and_tag = "snyk/kubernetes-monitor-private-fork:" + new_monitor_tag
+        monitor_name_and_tag = "snyk/kubernetes-monitor:" + new_monitor_tag
         call(["docker", "build", "-t", monitor_name_and_tag, "."])
         call(["docker", "push", monitor_name_and_tag])
 
diff --git a/scripts/publish-gh-pages.sh b/scripts/publish-gh-pages.sh
@@ -9,7 +9,7 @@ echo About to update the gh-pages branch with new tag ${NEW_TAG}
 echo configuring git
 git config --global user.email "egg@snyk.io"
 git config --global user.name "Runtime CI & CD"
-git remote add origin-pages https://${GH_TOKEN}@github.com/snyk/kubernetes-monitor-private-fork.git > /dev/null 2>&1
+git remote add origin-pages https://${GH_TOKEN}@github.com/snyk/kubernetes-monitor.git > /dev/null 2>&1
 git checkout -f gh-pages
 
 if grep -Fxq "  tag: ${NEW_TAG}" ./snyk-monitor/values.yaml
diff --git a/scripts/slack/notify_deploy.py b/scripts/slack/notify_deploy.py
@@ -16,8 +16,8 @@ def notifySlack(image_name, deployment_env_name):
             {
                 'color': '#7CD197',
                 'fallback': 'Build Notification: ' + circle_build_url,
-                'title': 'Kubernetes-Monitor-Private-Fork Deploy Notification',
-                'text': ':hatching_chick: Deploying Kubernetes-Monitor-Private-Fork on `' + deployment_env_name + '`: `' + image_name + '` :hatching_chick:'
+                'title': 'Kubernetes-Monitor Deploy Notification',
+                'text': ':hatching_chick: Deploying Kubernetes-Monitor on `' + deployment_env_name + '`: `' + image_name + '` :hatching_chick:'
             }
         ]
     }
diff --git a/scripts/slack/notify_failure.py b/scripts/slack/notify_failure.py
@@ -10,7 +10,7 @@ def notifySlack(branch_name: str, job_name: str, build_url: str, pr_url: str, sl
     job_name_message = 'Job name: `' + job_name + '`\n'
     build_url_message = 'Build URL: ' + build_url + '\n'
     pr_url_message = 'Pull request URL: ' + pr_url + '\n'
-    message = ':egg_broken_1: Kubernetes-Monitor-Private-Fork broken branch: `' + branch_name + \
+    message = ':egg_broken_1: Kubernetes-Monitor broken branch: `' + branch_name + \
         '` :egg_broken_1:\n' + job_name_message + build_url_message + pr_url_message
 
     data = {
@@ -19,7 +19,7 @@ def notifySlack(branch_name: str, job_name: str, build_url: str, pr_url: str, sl
             {
                 'color': '#EE0000',
                 'fallback': 'Build Notification: ' + build_url,
-                'title': ':warning: Kubernetes-Monitor-Private-Fork Merge Failure :warning:',
+                'title': ':warning: Kubernetes-Monitor Merge Failure :warning:',
                 'text': message
             }
         ]
diff --git a/scripts/slack/notify_push.py b/scripts/slack/notify_push.py
@@ -15,8 +15,8 @@ def notifySlack(branch_name):
         {
           'color': '#7CD197',
           'fallback': 'Build Notification: ' + circle_build_url,
-          'title': 'Kubernetes-Monitor-Private-Fork Publish Notification',
-          'text': ':fork_and_knife: Published Kubernetes-Monitor-Private-Fork: `' + branch_name + '` :fork_and_knife:'
+          'title': 'Kubernetes-Monitor Publish Notification',
+          'text': ':egg_fancy: Published Kubernetes-Monitor: `' + branch_name + '` :egg_fancy:'
         }
       ]
     }
diff --git a/scripts/slack/notify_success_no_publish.py b/scripts/slack/notify_success_no_publish.py
@@ -14,8 +14,8 @@ def notifySlack():
         {
           'color': '#7CD197',
           'fallback': 'Build Notification: ' + circle_build_url,
-          'title': 'Kubernetes-Monitor-Private-Fork Publish Notification',
-          'text': ':fork_and_knife: Successful `master` merge, but no `gh-pages` release occurring :fork_and_knife:'
+          'title': 'Kubernetes-Monitor Publish Notification',
+          'text': ':egg_fancy: Successful `master` merge, but no `gh-pages` release occurring :egg_fancy:'
         }
       ]
     }
diff --git a/scripts/slack/notify_success_no_release.py b/scripts/slack/notify_success_no_release.py
@@ -14,8 +14,8 @@ def notifySlack():
         {
           'color': '#7CD197',
           'fallback': 'Build Notification: ' + circle_build_url,
-          'title': 'Kubernetes-Monitor-Private-Fork Publish Notification',
-          'text': ':fork_and_knife: Successful `staging` merge, but no semantic-release occurring :fork_and_knife:'
+          'title': 'Kubernetes-Monitor Publish Notification',
+          'text': ':egg_fancy: Successful `staging` merge, but no semantic-release occurring :egg_fancy:'
         }
       ]
     }
diff --git a/scripts/test-openshift4.sh b/scripts/test-openshift4.sh
@@ -18,7 +18,7 @@
 #
 # Optional environment variables:
 # - KUBERNETES_MONITOR_IMAGE_TAG (if missing the script will build a kubernetes-monitor image)
-#   Choose a published tag from https://github.com/snyk/kubernetes-monitor-private-fork/releases.
+#   Choose a published tag from https://github.com/snyk/kubernetes-monitor/releases.
 #
 
 set -eo pipefail
diff --git a/snyk-monitor-deployment.yaml b/snyk-monitor-deployment.yaml
@@ -19,7 +19,7 @@ spec:
         app.kubernetes.io/name: snyk-monitor
     spec:
       containers:
-      - image: snyk/kubernetes-monitor-private-fork:IMAGE_TAG_OVERRIDE_WHEN_PUBLISHING
+      - image: snyk/kubernetes-monitor:IMAGE_TAG_OVERRIDE_WHEN_PUBLISHING
         imagePullPolicy: Always
         name: snyk-monitor
         terminationMessagePath: /dev/termination-log
diff --git a/snyk-monitor/README.md b/snyk-monitor/README.md
@@ -1,4 +1,4 @@
-# snyk/kubernetes-monitor-private-fork-chart #
+# snyk/kubernetes-monitor-chart #
 
 ## Summary ##
 
diff --git a/snyk-monitor/values.yaml b/snyk-monitor/values.yaml
@@ -30,7 +30,7 @@ integrationApi: ""
 
 # The registry from which to pull the snyk-monitor image.
 image:
-  repository: snyk/kubernetes-monitor-private-fork
+  repository: snyk/kubernetes-monitor
   tag: IMAGE_TAG_OVERRIDE_WHEN_PUBLISHING
   pullPolicy: Always
 
diff --git a/snyk-operator-certified/bundle/manifests/snyk-monitor.clusterserviceversion.yaml b/snyk-operator-certified/bundle/manifests/snyk-monitor.clusterserviceversion.yaml
@@ -60,7 +60,7 @@ metadata:
     description: A Kubernetes Operator for creating and managing Snyk controller instances.
     operators.operatorframework.io/builder: operator-sdk-v1.3.0
     operators.operatorframework.io/project_layout: helm.sdk.operatorframework.io/v1
-    repository: https://github.com/docker.io/snyk/kubernetes-monitor-private-fork
+    repository: https://github.com/docker.io/snyk/kubernetes-monitor
     support: Snyk Ltd.
   name: snyk-operator-marketplace.v1.68.2
 spec:
diff --git a/src/transmitter/payload.ts b/src/transmitter/payload.ts
@@ -162,7 +162,15 @@ export function constructRuntimeData(
         runtimeResult.workloadKind = mappedWorkloadKind;
         acc.push(runtimeResult);
       } else {
-        logger.error({ runtimeResult }, 'invalid Sysdig workload kind');
+        logger.error(
+          {
+            imageID: runtimeResult.imageID,
+            namespace: runtimeResult.namespace,
+            workloadName: runtimeResult.workloadName,
+            workloadKind: runtimeResult.workloadKind,
+          },
+          'invalid Sysdig workload kind',
+        );
       }
     }
     return acc;
diff --git a/test/common/config.spec.ts b/test/common/config.spec.ts
@@ -1,10 +1,14 @@
 describe('extractNamespaceName()', () => {
   beforeEach(() => {
     jest.resetModules();
+    process.env.SNYK_SYSDIG_ENDPOINT = 'https://api/v1/images/';
+    process.env.SNYK_SYSDIG_TOKEN = '1432gtrhtrw32raf';
   });
 
   afterEach(() => {
     jest.restoreAllMocks();
+    delete process.env.SNYK_CLUSTER_NAME;
+    delete process.env.SNYK_SYSDIG_ENDPOINT;
   });
 
   test.each([
@@ -48,8 +52,6 @@ describe('extractNamespaceName()', () => {
     ) => {
       if (clusterNameEnvVar) {
         process.env.SNYK_CLUSTER_NAME = clusterNameEnvVar;
-        process.env.SNYK_SYSDIG_ENDPOINT = 'https://api/v1/images/';
-        process.env.SNYK_SYSDIG_TOKEN = '1432gtrhtrw32raf';
       }
 
       const consoleSpy = jest.spyOn(console, 'log').mockReturnValue();
@@ -58,7 +60,7 @@ describe('extractNamespaceName()', () => {
       expect(config.CLUSTER_NAME).toBe(wantClusterName);
       expect(consoleSpy).toHaveBeenCalledTimes(consoleLogCalledTimes);
 
-      delete process.env.SNYK_CLUSTER_NAME;
+      delete process.env.SNYK_SYSDIG_TOKEN;
     },
   );
 
@@ -77,11 +79,11 @@ describe('extractNamespaceName()', () => {
     expect(config.SKOPEO_COMPRESSION_LEVEL).toEqual(6);
     expect(config.SYSDIG_ENDPOINT).toEqual('https://api/v1/images/');
     expect(config.SYSDIG_TOKEN).toEqual('1432gtrhtrw32raf');
-    delete process.env.SNYK_SYSDIG_ENDPOINT;
-    delete process.env.SNYK_SYSDIG_TOKEN;
   });
 
   it('cannot load sysdig API and JWT values if it is not enabled', () => {
+    delete process.env.SNYK_SYSDIG_ENDPOINT;
+    delete process.env.SNYK_SYSDIG_TOKEN;
     const { config } = require('../../src/common/config');
     expect(config.SYSDIG_ENDPOINT).toBeUndefined();
     expect(config.SYSDIG_TOKEN).toBeUndefined();
diff --git a/test/setup/index.ts b/test/setup/index.ts
@@ -159,7 +159,7 @@ export async function deployMonitor(): Promise<string> {
     const imageNameAndTag = getEnvVariableOrDefault(
       'KUBERNETES_MONITOR_IMAGE_NAME_AND_TAG',
       // the default, determined by ./script/build-image.sh
-      'snyk/kubernetes-monitor-private-fork:local',
+      'snyk/kubernetes-monitor:local',
     );
 
     console.log(
diff --git a/test/setup/platforms/eks.ts b/test/setup/platforms/eks.ts
@@ -60,7 +60,7 @@ export async function loadImageInCluster(
     throw new Error('aws ecr get-login-password returned an unexpected output');
   }
 
-  const targetImage = `${ecrURL}/snyk/kubernetes-monitor-private-fork:local`;
+  const targetImage = `${ecrURL}/snyk/kubernetes-monitor:local`;
 
   await exec(`docker tag ${imageNameAndTag} ${targetImage}`);
   await exec(`docker push ${targetImage}`);

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-docker_build("snyk/kubernetes-monitor-private-fork", ".",`
	`1`	`+docker_build("snyk/kubernetes-monitor", ".",`
`2`	`2`	`live_update=[`
`3`	`3`	`fall_back_on(["package.json", "package-lock.json"]),`
`4`	`4`	`sync('.', '/srv/app'),`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ get_latest_release() {`
`7`	`7`	`sed 's/v//' # Remove "v" prefix`
`8`	`8`	`}`
`9`	`9`
`10`		`-LATEST_TAG=$(get_latest_release snyk/kubernetes-monitor-private-fork)`
	`10`	`+LATEST_TAG=$(get_latest_release snyk/kubernetes-monitor)`
`11`	`11`	`IP=$(ifconfig \| grep "inet " \| grep -Fv 127.0.0.1 \| awk 'NR==1{print $2}')`
`12`	`12`
`13`	`13`	`if [ "$INTEGRATION_ID" == "" ]; then`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ def notifySlack(image_name, deployment_env_name):`
`16`	`16`	`{`
`17`	`17`	`'color': '#7CD197',`
`18`	`18`	`'fallback': 'Build Notification: ' + circle_build_url,`
`19`		`- 'title': 'Kubernetes-Monitor-Private-Fork Deploy Notification',`
`20`		- 'text': ':hatching_chick: Deploying Kubernetes-Monitor-Private-Fork on `' + deployment_env_name + '`: `' + image_name + '` :hatching_chick:'
	`19`	`+ 'title': 'Kubernetes-Monitor Deploy Notification',`
	`20`	+ 'text': ':hatching_chick: Deploying Kubernetes-Monitor on `' + deployment_env_name + '`: `' + image_name + '` :hatching_chick:'
`21`	`21`	`}`
`22`	`22`	`]`
`23`	`23`	`}`