Merge pull request #12 from titel-media/chore/remove-vpn

Remove vpn from orb

.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  cli: circleci/[email protected].4
+  cli: circleci/[email protected].9
 
 resources:
   semver_tags: &semver_tags
@@ -25,7 +25,7 @@ workflows:
             - test
           filters:
             branches:
-              ignore: master
+              ignore: main
             tags:
               ignore: /.*/
           context: orb-publishing

src/@orb.yml

@@ -2,7 +2,6 @@ version: 2.1
 description: Google Kubernetes Engine (GKE) Orb
 
 orbs:
-  gcloud: circleci/[email protected]
-  gcr: circleci/[email protected]
-  k8s: circleci/[email protected]
-  vpn: titel-media/[email protected]
+  gcloud: circleci/[email protected]
+  gcr: circleci/[email protected]
+  k8s: circleci/[email protected]

src/commands/install.yml

@@ -2,8 +2,3 @@ description: "Install `gcloud` and `kubectl` if not already installed."
 steps:
   - gcloud/install
   - k8s/install
-  - when:
-      condition: $WIREGUARD_CONFIG
-      steps:
-        - vpn/install
-        - vpn/initialize

src/jobs/publish-and-rollout-image.yml

@@ -1,5 +1,5 @@
 description: "Update cluster with new Docker image."
-machine: 
+machine:
   image: ubuntu-1604:202004-01
 parameters:
   cluster:
@@ -57,11 +57,6 @@ parameters:
     description: >
       Extra flags to pass to docker build. For examples, see
       https://docs.docker.com/engine/reference/commandline/build
-  disable_vpn:
-    type: string
-    default: ""
-    description: >
-      Avoid connecting to the VPN if value provided
 steps:
   - add_ssh_keys
   - checkout-submodule
@@ -79,10 +74,6 @@ steps:
       tag: << parameters.tag >>
       path: <<parameters.cwd-path-for-build>>
       extra_build_args: <<parameters.extra_build_args>>
-  - unless:
-      condition: <<parameters.disable_vpn>>
-      steps:
-        - vpn/connect
   - gcr/push-image:
       registry-url: <<parameters.registry-url>>
       google-project-id: <<parameters.google-project-id>>