Merge pull request #1180 from snyk/chore/remove-openshift-3

chore: remove openshift 3 tests

Author: ivanstanev

.circleci/config.yml

@@ -389,31 +389,6 @@ jobs:
                 name: Notify Slack on failure
                 when: on_fail
         working_directory: ~/kubernetes-monitor
-    openshift3_integration_tests:
-        machine:
-            docker_layer_caching: true
-            image: ubuntu-2004:202111-02
-            resource_class: large
-        steps:
-            - checkout
-            - setup_node16
-            - install_python_requests
-            - run:
-                command: mkdir -p /tmp/logs/test/integration/openshift3
-                name: Create temporary directory for logs
-            - run:
-                command: |
-                    export IMAGE_TAG_UBI_SUFFIX="-ubi8"
-                    export KUBERNETES_MONITOR_IMAGE_NAME_AND_TAG=$(./scripts/circleci-jobs/setup-integration-tests.py)
-                    npm run test:integration:openshift3:yaml
-                name: Integration tests OpenShift 3
-            - run:
-                command: ./scripts/slack/notify_failure.py "${CIRCLE_BRANCH}" "${CIRCLE_JOB}" "${CIRCLE_BUILD_URL}" "${CIRCLE_PULL_REQUEST}" "${SLACK_WEBHOOK}"
-                name: Notify Slack on failure
-                when: on_fail
-            - store_artifacts:
-                path: /tmp/logs/test/integration/openshift3
-        working_directory: ~/kubernetes-monitor
     openshift4_integration_tests:
         machine:
             docker_layer_caching: true
@@ -1131,13 +1106,6 @@ workflows:
                             - staging
                 requires:
                     - build_image
-            - openshift3_integration_tests:
-                filters:
-                    branches:
-                        only:
-                            - staging
-                requires:
-                    - build_image
             - integration_tests_operator_on_k8s:
                 filters:
                     branches:

.circleci/config/@config.yml

@@ -73,10 +73,6 @@ workflows:
           requires:
             - build_image
           <<: *staging_branch_only_filter
-      - openshift3_integration_tests:
-          requires:
-            - build_image
-          <<: *staging_branch_only_filter
       - integration_tests_operator_on_k8s:
           requires:
             - build_image

.circleci/config/jobs/openshift3_integration_tests.yml

@@ -21,7 +21,6 @@
     "test:integration:kindolm:operator": "DEPLOYMENT_TYPE=OperatorOLM TEST_PLATFORM=kindolm CREATE_CLUSTER=true jest --logHeapUsage --ci --maxWorkers=1 test/integration/kubernetes.spec.ts",
     "test:integration:eks:yaml": "DEPLOYMENT_TYPE=YAML TEST_PLATFORM=eks CREATE_CLUSTER=false jest --logHeapUsage --ci --maxWorkers=1 test/integration/kubernetes.spec.ts",
     "test:integration:aks:yaml": "DEPLOYMENT_TYPE=YAML TEST_PLATFORM=aks CREATE_CLUSTER=false jest --logHeapUsage --ci --maxWorkers=1 test/integration/kubernetes.spec.ts",
-    "test:integration:openshift3:yaml": "DEPLOYMENT_TYPE=YAML TEST_PLATFORM=openshift3 CREATE_CLUSTER=true jest --logHeapUsage --ci --maxWorkers=1 test/integration/kubernetes.spec.ts",
     "test:integration:openshift4:operator": "scripts/test-openshift4.sh",
     "test:coverage": "npm run test:unit -- --coverage",
     "test:watch": "tsc-watch --onSuccess 'npm run test:unit'",

package.json

@@ -108,22 +108,12 @@ export async function createPodFromImage(
   name: string,
   image: string,
   namespace: string,
-) {
+): Promise<void> {
   console.log(
     `Letting Kubernetes decide how to manage image ${image} with name ${name}`,
   );
-  /**
-   * HACK! The newest version of kubectl does not support generators. However, "OpenShift 3" tests run on K8s 1.11 which supports generators.
-   * The default behaviour there is to create a Deployment, whereas new versions of kubectl create Pods.
-   * We can't use the default behaviour for both OpenShift 3 and other tests, because we would get different results.
-   * Hence we need to specifically select the Pod generator on OS3 but it would default to Pod on anything else.
-   */
-  const generator =
-    process.env['TEST_PLATFORM'] === 'openshift3'
-      ? '--generator=run-pod/v1'
-      : '';
   await exec(
-    `./kubectl run ${name} ${generator} --image=${image} -n ${namespace} -- sleep 999999999`,
+    `./kubectl run ${name} --image=${image} -n ${namespace} -- sleep 999999999`,
   );
   console.log(
     `Done Letting Kubernetes decide how to manage image ${image} with name ${name}`,

test/helpers/kubectl.ts

@@ -188,9 +188,7 @@ export async function deployMonitor(): Promise<string> {
 
     // TODO: hack, rewrite this
     const imagePullPolicy =
-      testPlatform === 'kind' ||
-      testPlatform === 'kindolm' ||
-      testPlatform === 'openshift3'
+      testPlatform === 'kind' || testPlatform === 'kindolm'
         ? 'Never'
         : 'Always';
     const deploymentImageOptions: IImageOptions = {

test/setup/index.ts

@@ -2,7 +2,6 @@ import * as kind from './kind';
 import * as kindOlm from './kind-olm';
 import * as eks from './eks';
 import * as aks from './aks';
-import * as openshift3 from './openshift3';
 import * as openshift4 from './openshift4';
 
 interface IPlatformSetup {
@@ -62,17 +61,6 @@ const aksSetup: IPlatformSetup = {
   validateRequiredEnvironment: aks.validateRequiredEnvironment,
 };
 
-// Use a kind cluster pinned to a specific Kubernetes version to mimic OS3.
-const openshift3Setup: IPlatformSetup = {
-  create: kind.createCluster,
-  loadImage: kind.loadImageInCluster,
-  delete: kind.deleteCluster,
-  config: kind.exportKubeConfig,
-  clean: kind.clean,
-  setupTester: openshift3.setupTester,
-  validateRequiredEnvironment: openshift3.validateRequiredEnvironment,
-};
-
 const openshift4Setup: IPlatformSetup = {
   create: openshift4.createCluster,
   loadImage: openshift4.returnUnchangedImageNameAndTag,
@@ -85,8 +73,6 @@ const openshift4Setup: IPlatformSetup = {
 
 export function getKubernetesVersionForPlatform(testPlatform: string): string {
   switch (testPlatform) {
-    case 'openshift3':
-      return 'v1.11.10';
     default:
       return 'latest';
   }
@@ -97,7 +83,6 @@ export default {
   kindolm: kindOlmSetup,
   eks: eksSetup,
   aks: aksSetup,
-  openshift3: openshift3Setup,
   openshift4: openshift4Setup,
 } as {
   [key: string]: IPlatformSetup;