Merge pull request #2202 from rnc/AMAZON

Remove Amazon AWS S3 code

Author: rnc

.github/renovate.json

@@ -17,14 +17,6 @@
       "matchCurrentValue": "/-SNAPSHOT$/",
       "enabled": false
     },
-    {
-        "description": "Set noisy package updates to only get PRs once a month",
-        "matchPackageNames": [
-            "github.com/aws/aws-sdk-go",
-            "com.amazonaws:aws-java-sdk-codeartifact"
-        ],
-      "schedule": ["before 4am on the first day of the month"]
-    }
   ],
   "enabledManagers": [
   ]

README.adoc

@@ -27,9 +27,6 @@ This is currently using link:https://docs.openshift.com/pipelines/1.15/about/op-
 The following environment variables are configurable and may be set by the user prior to deploying this depending upon which features are to be enabled.
 
 |=======================
-| AWS_ACCESS_KEY_ID | AWS Access Key used for S3 and CodeArtfact Access
-| AWS_PROFILE | AWS Region used for CodeArtifact deployment
-| AWS_SECRET_ACCESS_KEY | AWS Secret Access Key used for S3 and CodeArtfact Access
 | GIT_DEPLOY_IDENTITY | Username/organisation name for the Git service
 | GIT_DEPLOY_TOKEN | Authentication token
 | GIT_DEPLOY_URL | The URL for the Git service (GitHub/GitLab are supported) to archive the sources
@@ -41,7 +38,6 @@ The following environment variables are configurable and may be set by the user
 | JBS_GIT_CREDENTIALS | Support for private repositories (See below)
 | JBS_MAX_MEMORY | Maximum additional memory allowed
 | JBS_RECIPE_DATABASE | Recipe database to use (defaults to `https://github.com/redhat-appstudio/jvm-build-data`)
-| JBS_S3_SYNC_ENABLED | Whether to enable Amazon S3 sync for storage (default: `false`)
 | JBS_WORKER_NAMESPACE | Worker namespace (default: `test-jvm-namespace`) may be customised by setting this
 | MAVEN_PASSWORD | Password for the Maven repository
 | MAVEN_REPOSITORY | The URL for the external Maven repository to deploy to

cmd/controller/main.go

@@ -62,12 +62,6 @@ func main() {
 
 	util.ImageTag = os.Getenv("IMAGE_TAG")
 	util.ImageRepo = os.Getenv("IMAGE_REPO")
-	if os.Getenv("S3_SYNC_ENABLED") == "true" {
-		logger.Info("Enabling S3 Sync")
-		util.S3Enabled = true
-	} else {
-		logger.Info("S3 Sync Disabled")
-	}
 
 	mgr, err := controller.NewManager(restConfig, mopts)
 	if err != nil {

deploy/base-development.sh

@@ -30,17 +30,9 @@ if [ -z "$JBS_BUILD_IMAGE_SECRET" ]; then
     # Represents an empty dockerconfig.json
     export JBS_BUILD_IMAGE_SECRET="ewogICAgImF1dGhzIjogewogICAgfQp9Cg==" # notsecret
 fi
-if [ -z "$JBS_S3_SYNC_ENABLED" ]; then
-    export JBS_S3_SYNC_ENABLED=false
-fi
 if [ -z "$JBS_MAX_MEMORY" ]; then
     export JBS_MAX_MEMORY=4096
 fi
-# Horrendous hack to work around
-# https://github.com/kubernetes-sigs/kustomize/issues/5124
-# given an env var is a string (https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/)
-# and if 'true' or 'false' is seen that is coerced to a bool which causes an issue
-export JBS_S3_SYNC_ENABLED="\"$JBS_S3_SYNC_ENABLED\""
 
 function cleanAllArtifacts() {
     # Following are created in CI code
@@ -71,9 +63,6 @@ DIR=`dirname $0`
 
 echo -e "\033[0;32mRunning kustomize/kubectl...\033[0m"
 kustomize build $DIR/overlays/dev-template | envsubst '
-${AWS_ACCESS_KEY_ID}
-${AWS_PROFILE}
-${AWS_SECRET_ACCESS_KEY}
 ${GIT_DEPLOY_IDENTITY}
 ${GIT_DEPLOY_TOKEN}
 ${GIT_DEPLOY_URL}
@@ -85,7 +74,6 @@ ${JBS_QUAY_IMAGE_TAG}
 ${JBS_QUAY_ORG}
 ${JBS_MAX_MEMORY}
 ${JBS_RECIPE_DATABASE}
-${JBS_S3_SYNC_ENABLED}
 ${JBS_WORKER_NAMESPACE}
 ${MAVEN_PASSWORD}
 ${MAVEN_REPOSITORY}

deploy/base/secrets/jbs-build-maven-repo-aws.yaml

@@ -9,6 +9,4 @@ resources:
   - jbs-build-git-repo.yaml
   - jbs-build-git.yaml
   - jbs-build-image.yaml
-  - jbs-build-maven-repo-aws.yaml
   - jbs-build-maven-repo.yaml
-  - jbs-build-s3.yaml

deploy/base/secrets/jbs-build-s3.yaml

@@ -22,7 +22,7 @@ spec:
     schema:
       openAPIV3Schema:
         description: RebuiltArtifact An artifact that has been rebuilt and deployed
-          to S3 or a Container registry
+          to a Container registry
         properties:
           apiVersion:
             description: |-

deploy/base/secrets/kustomization.yaml

@@ -13,17 +13,6 @@ images:
   newTag: ${JBS_QUAY_IMAGE_TAG}
 
 patches:
-# Note - see base-development for quoting requirements for
-# JBS_S3_SYNC_ENABLED and the linked kubernete issue.
-- patch: |-
-    - op: add
-      path: /spec/template/spec/containers/0/env
-      value:
-        - name: S3_SYNC_ENABLED
-          value: ${JBS_S3_SYNC_ENABLED}
-  target:
-    kind: Deployment
-    name: hacbs-jvm-operator
 - patch: |-
     - op: replace
       path: /spec/template/spec/containers/0/imagePullPolicy

deploy/crds/base/jvmbuildservice.io_rebuiltartifacts.yaml

@@ -3,8 +3,6 @@ apiVersion: jvmbuildservice.io/v1alpha1
 kind: JBSConfig
 metadata:
   name: jvm-build-config
-  annotations:
-    jvmbuildservice.io/s3-bucket-name: "jvm-build-service-data"
 spec:
   registry:
     owner: ${QUAY_USERNAME}