diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8c6721af..d5af1dd1 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -96,10 +96,6 @@ jobs: env: RELEASE: v2.0.${{ github.run_number }} CLIENT: release - ArmoBEServer: api.armo.cloud - ArmoAuthServer: auth.armo.cloud - ArmoERServer: report.armo.cloud - ArmoWebsite: portal.armo.cloud CGO_ENABLED: 1 run: python3 --version && python3 build.py @@ -134,7 +130,7 @@ jobs: name: Build docker container, tag and upload to registry needs: build runs-on: ubuntu-latest - if: ${{ github.repository == 'armosec/kubescape' }} # TODO + if: ${{ github.repository == 'kubescape/kubescape' }} # TODO permissions: id-token: write packages: write diff --git a/.github/workflows/build_dev.yaml b/.github/workflows/build_dev.yaml index 64888aa0..ad03b6d8 100644 --- a/.github/workflows/build_dev.yaml +++ b/.github/workflows/build_dev.yaml @@ -88,10 +88,6 @@ jobs: env: RELEASE: v2.0.${{ github.run_number }} CLIENT: release-dev - ArmoBEServer: api.armo.cloud - ArmoAuthServer: auth.armo.cloud - ArmoERServer: report.armo.cloud - ArmoWebsite: portal.armo.cloud CGO_ENABLED: 1 run: python3 --version && python3 build.py @@ -110,7 +106,7 @@ jobs: build-docker: name: Build docker container, tag and upload to registry needs: build - if: ${{ github.repository == 'armosec/kubescape' }} # TODO + if: ${{ github.repository == 'kubescape/kubescape' }} # TODO runs-on: ubuntu-latest permissions: id-token: write diff --git a/.github/workflows/pr_checks.yaml b/.github/workflows/pr_checks.yaml index b9e5aa5d..ca3c7b9d 100644 --- a/.github/workflows/pr_checks.yaml +++ b/.github/workflows/pr_checks.yaml @@ -81,10 +81,6 @@ jobs: env: RELEASE: v2.0.${{ github.run_number }} CLIENT: test - ArmoBEServer: api.armo.cloud - ArmoAuthServer: auth.armo.cloud - ArmoERServer: report.armo.cloud - ArmoWebsite: portal.armo.cloud CGO_ENABLED: 1 run: python3 --version && python3 build.py diff --git a/README.md b/README.md index 41b21454..c4fc63cf 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Kubescape integrates natively with other DevOps tools, including Jenkins, Circle # TL;DR ## Install: ```sh -curl -s https://raw.githubusercontent.com/armosec/kubescape/master/install.sh | /bin/bash +curl -s https://raw.githubusercontent.com/kubescape/kubescape/master/install.sh | /bin/bash ``` [Install on windows](#install-on-windows) @@ -96,7 +96,7 @@ Want to contribute? Want to discuss something? Have an issue? **Requires powershell v5.0+** ``` powershell -iwr -useb https://raw.githubusercontent.com/armosec/kubescape/master/install.ps1 | iex +iwr -useb https://raw.githubusercontent.com/kubescape/kubescape/master/install.ps1 | iex ``` Note: if you get an error you might need to change the execution policy (i.e. enable Powershell) with @@ -412,6 +412,6 @@ Kubescape is an open source project, we welcome your feedback and ideas for impr ## Thanks to all the contributors ❤️ - + diff --git a/core/pkg/resourcehandler/k8sresources_test.go b/core/pkg/resourcehandler/k8sresources_test.go index 326ddbbc..73f674ca 100644 --- a/core/pkg/resourcehandler/k8sresources_test.go +++ b/core/pkg/resourcehandler/k8sresources_test.go @@ -158,8 +158,8 @@ func TestIsMasterNodeTaints(t *testing.T) { }, { "names": [ - "quay.io/armosec/kubescape@sha256:6196f766be50d94b45d903a911f5ee95ac99bc392a1324c3e063bec41efd98ba", - "quay.io/armosec/kubescape:v2.0.153" + "quay.io/kubescape/kubescape@sha256:6196f766be50d94b45d903a911f5ee95ac99bc392a1324c3e063bec41efd98ba", + "quay.io/kubescape/kubescape:v2.0.153" ], "sizeBytes": 110345054 }, @@ -423,8 +423,8 @@ func TestIsMasterNodeTaints(t *testing.T) { }, { "names": [ - "quay.io/armosec/kubescape@sha256:6196f766be50d94b45d903a911f5ee95ac99bc392a1324c3e063bec41efd98ba", - "quay.io/armosec/kubescape:v2.0.153" + "quay.io/kubescape/kubescape@sha256:6196f766be50d94b45d903a911f5ee95ac99bc392a1324c3e063bec41efd98ba", + "quay.io/kubescape/kubescape:v2.0.153" ], "sizeBytes": 110345054 }, diff --git a/core/pkg/resourcehandler/urlloader_test.go b/core/pkg/resourcehandler/urlloader_test.go index e8c96d39..aa7356c8 100644 --- a/core/pkg/resourcehandler/urlloader_test.go +++ b/core/pkg/resourcehandler/urlloader_test.go @@ -14,7 +14,7 @@ func TestLoadResourcesFromUrl(t *testing.T) { for i, w := range workloads { switch i { - case "https://raw.githubusercontent.com/armosec/kubescape/master/examples/online-boutique/adservice.yaml": + case "https://raw.githubusercontent.com/kubescape/kubescape/master/examples/online-boutique/adservice.yaml": assert.Equal(t, 2, len(w)) assert.Equal(t, "apps/v1//Deployment/adservice", w[0].GetID()) assert.Equal(t, "/v1//Service/adservice", w[1].GetID()) @@ -28,7 +28,7 @@ func TestLoadResourcesFromUrl(t *testing.T) { for i, w := range workloads { switch i { - case "https://raw.githubusercontent.com/armosec/kubescape/master/examples/online-boutique/adservice.yaml": + case "https://raw.githubusercontent.com/kubescape/kubescape/master/examples/online-boutique/adservice.yaml": assert.Equal(t, 2, len(w)) assert.Equal(t, "apps/v1//Deployment/adservice", w[0].GetID()) assert.Equal(t, "/v1//Service/adservice", w[1].GetID()) @@ -42,7 +42,7 @@ func TestLoadResourcesFromUrl(t *testing.T) { for i, w := range workloads { switch i { - case "https://raw.githubusercontent.com/armosec/kubescape/master/examples/online-boutique/adservice.yaml": + case "https://raw.githubusercontent.com/kubescape/kubescape/master/examples/online-boutique/adservice.yaml": assert.Equal(t, 2, len(w)) assert.Equal(t, "apps/v1//Deployment/adservice", w[0].GetID()) assert.Equal(t, "/v1//Service/adservice", w[1].GetID()) @@ -50,13 +50,13 @@ func TestLoadResourcesFromUrl(t *testing.T) { } } { - workloads, err := loadResourcesFromUrl([]string{"https://raw.githubusercontent.com/armosec/kubescape/master/examples/online-boutique/adservice.yaml"}) + workloads, err := loadResourcesFromUrl([]string{"https://raw.githubusercontent.com/kubescape/kubescape/master/examples/online-boutique/adservice.yaml"}) assert.NoError(t, err) assert.Equal(t, 1, len(workloads)) for i, w := range workloads { switch i { - case "https://raw.githubusercontent.com/armosec/kubescape/master/examples/online-boutique/adservice.yaml": + case "https://raw.githubusercontent.com/kubescape/kubescape/master/examples/online-boutique/adservice.yaml": assert.Equal(t, 2, len(w)) assert.Equal(t, "apps/v1//Deployment/adservice", w[0].GetID()) assert.Equal(t, "/v1//Service/adservice", w[1].GetID()) diff --git a/core/pkg/resultshandling/printer/v2/html/report.gohtml b/core/pkg/resultshandling/printer/v2/html/report.gohtml index 890dd579..2c51d34a 100644 --- a/core/pkg/resultshandling/printer/v2/html/report.gohtml +++ b/core/pkg/resultshandling/printer/v2/html/report.gohtml @@ -69,7 +69,7 @@ } - +

Kubescape Scan Report

{{ with .OPASessionObj.Report.SummaryDetails }}

By Controls

diff --git a/httphandler/examples/microservice/ks-deployment.yaml b/httphandler/examples/microservice/ks-deployment.yaml index c5713636..83356e05 100644 --- a/httphandler/examples/microservice/ks-deployment.yaml +++ b/httphandler/examples/microservice/ks-deployment.yaml @@ -89,7 +89,7 @@ spec: port: 8080 initialDelaySeconds: 3 periodSeconds: 3 - image: quay.io/armosec/kubescape:latest + image: quay.io/kubescape/kubescape:latest imagePullPolicy: Always env: - name: KS_DEFAULT_CONFIGMAP_NAMESPACE diff --git a/httphandler/examples/prometheus/ks-deployment.yaml b/httphandler/examples/prometheus/ks-deployment.yaml index 829fcd46..53d2c077 100644 --- a/httphandler/examples/prometheus/ks-deployment.yaml +++ b/httphandler/examples/prometheus/ks-deployment.yaml @@ -89,7 +89,7 @@ spec: port: 8080 initialDelaySeconds: 3 periodSeconds: 3 - image: quay.io/armosec/kubescape:latest + image: quay.io/kubescape/kubescape:latest imagePullPolicy: Always env: - name: KS_DEFAULT_CONFIGMAP_NAMESPACE diff --git a/install.ps1 b/install.ps1 index 0bbcf61b..08434c74 100644 --- a/install.ps1 +++ b/install.ps1 @@ -4,7 +4,7 @@ $BASE_DIR=$env:USERPROFILE + "\.kubescape" $packageName = "/kubescape-windows-latest" # Get latest release url -$config = Invoke-WebRequest "https://api.github.com/repos/armosec/kubescape/releases/latest" | ConvertFrom-Json +$config = Invoke-WebRequest "https://api.github.com/repos/kubescape/kubescape/releases/latest" | ConvertFrom-Json $url = $config.html_url.Replace("/tag/","/download/") $fullUrl = $url + $packageName