From 77f307c42162d52adeb946c4cb3178f5a0bd9afb Mon Sep 17 00:00:00 2001 From: abdul haseeb Date: Tue, 5 Nov 2024 14:49:55 +0100 Subject: [PATCH 1/3] Update docs --- crossplane-api/README.md | 91 +++++----------------------------------- 1 file changed, 11 insertions(+), 80 deletions(-) diff --git a/crossplane-api/README.md b/crossplane-api/README.md index 4d7e4c2..fb44d43 100644 --- a/crossplane-api/README.md +++ b/crossplane-api/README.md @@ -202,7 +202,12 @@ In a separate terminal start an ssh tunnel to Service Broker ```bash export SERVICE_INSTANCE_NAME= #e.g. postgresql-ms-1686299661 -export SERVICEBROKER_IP=$(ssh aws-s1-inception ". /var/vcap/store/jumpbox/home/a9s/bosh/envs/dsf2;bosh -d $SERVICE_INSTANCE_NAME instances | grep broker/" | awk '{print $4}') +``` + +**NOTE:** You would have to load the credentials to execute the bosh cli cmd in the BOSH director env. + +```bash +export SERVICEBROKER_IP=$(ssh {IP of the virtual machine from where you can access the BOSH director};bosh -d $SERVICE_INSTANCE_NAME instances | grep broker/" | awk '{print $4}') echo $SERVICEBROKER_IP @@ -215,8 +220,12 @@ In a separate terminal start an ssh tunnel to Backup Manager ```bash export SERVICE_INSTANCE_NAME= #e.g. postgresql-ms-1686299661 +``` + +**NOTE:** You would have to load the credentials to execute the bosh cli cmd in the BOSH director env. -export BACKUP_MANAGER_IP=$(ssh aws-s1-inception ". /var/vcap/store/jumpbox/home/a9s/bosh/envs/dsf2;bosh -d $SERVICE_INSTANCE_NAME instances | grep backup-manager/" | awk '{print $4}') +```bash +export BACKUP_MANAGER_IP=$(ssh {IP of the virtual machine from where you can access the BOSH director};bosh -d $SERVICE_INSTANCE_NAME instances | grep backup-manager/" | awk '{print $4}') echo $BACKUP_MANAGER_IP @@ -487,84 +496,6 @@ you can restore a PostgreSQL Backup with the following command: kubectl apply -f ./crossplane-api/examples/a9s/postgresql/restore-claim.yaml ``` -## Usage - aws s3 provider - -The aws s3 provider does require the helm and crossplane pre-requisites in order to be deployed - -### AWS Access - -Some of the pipelines require access to AWS EKS in order to be able to create clusters for testing -purposes. For these pipelines please apply a manifest using the following template: - -```yaml -apiVersion: v1 -kind: Secret -metadata: - name: aws-secret - namespace: crossplane-system -type: Opaque -stringData: - creds: |- - [default] - AWS_ACCESS_KEY_ID: # - AWS_SECRET_ACCESS_KEY: # - config: |- - [default] - AWS_DEFAULT_REGION: eu-central-1 -``` - -### Provision the aws s3 provider - -The provider itself can be run by applying the provider file - -```bash -kubectl apply -f ./crossplane-api/deploy/provider-aws.yaml -``` - -Verify the providers were created successfully. There should be 2 providers: provider-aws-s3 and upboard-provider-family-aws -```bash -kubectl get providers -``` - -Apply the provider config -```bash -kubectl apply -f ./crossplane-api/deploy/provider-aws-config.yaml -``` - -### Managing an s3 bucket - -To create an s3 bucket, use the example object store yaml. This generates a hash for the name - -```bash -kubectl create -f ./crossplane-api/examples/a8s/objectstore-claim.yaml -``` - -Check that the bucket was created successfully -```bash -kubectl get buckets -``` - -To delete the s3 bucket: - -```bash -kubectl delete bucket -``` - -### Creating an s3 bucket policy - -To add an s3 bucket policy as a service binding, use the example s3 service binding claim. -Make sure to update the claim with the bucket name and the iam role arn. - -```bash -kubectl apply -f ./crossplane-api/examples/a8s/s3-servicebinding-claim.yaml -``` - -To remove the service binding - -```bash -kubectl delete servicebinding/example-a8s-s3 -``` - ## Update or Add a Service or Plan in a8s In case of a Service or Plan is changed or a new one is added, it is essential From b42349d8e048f4033698c30982b6bae322a9550f Mon Sep 17 00:00:00 2001 From: abdul haseeb Date: Tue, 5 Nov 2024 14:50:04 +0100 Subject: [PATCH 2/3] Remove resources that are not needed --- crossplane-api/api/a8s/s3/composition.yaml | 22 ------- .../a8s/servicebinding/s3-composition.yaml | 41 ------------- .../anynines-dataservices-300f2df2a659.xpkg | Bin 17920 -> 0 bytes .../api/common/servicebinding_definition.yaml | 2 +- .../api/iam/policy_composition.yaml | 17 ------ crossplane-api/api/iam/policy_definition.yaml | 56 ------------------ .../deploy/provider-aws-config.yaml | 23 ------- crossplane-api/deploy/provider-aws.yaml | 13 ---- .../examples/a8s/objectstore-claim.yaml | 8 --- crossplane-api/examples/a8s/policy-claim.yaml | 13 ---- .../examples/a8s/s3-servicebinding-claim.yaml | 28 --------- crossplane-api/kustomization.yaml | 6 -- 12 files changed, 1 insertion(+), 228 deletions(-) delete mode 100644 crossplane-api/api/a8s/s3/composition.yaml delete mode 100644 crossplane-api/api/a8s/servicebinding/s3-composition.yaml delete mode 100644 crossplane-api/api/anynines-dataservices-300f2df2a659.xpkg delete mode 100644 crossplane-api/api/iam/policy_composition.yaml delete mode 100644 crossplane-api/api/iam/policy_definition.yaml delete mode 100644 crossplane-api/deploy/provider-aws-config.yaml delete mode 100644 crossplane-api/deploy/provider-aws.yaml delete mode 100644 crossplane-api/examples/a8s/objectstore-claim.yaml delete mode 100644 crossplane-api/examples/a8s/policy-claim.yaml delete mode 100644 crossplane-api/examples/a8s/s3-servicebinding-claim.yaml diff --git a/crossplane-api/api/a8s/s3/composition.yaml b/crossplane-api/api/a8s/s3/composition.yaml deleted file mode 100644 index 0b40435..0000000 --- a/crossplane-api/api/a8s/s3/composition.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: apiextensions.crossplane.io/v1 -kind: Composition -metadata: - name: a8s-s3-bucket -spec: - compositeTypeRef: - apiVersion: anynines.com/v1 - kind: XObjectStorageInstance - resources: - - name: a8s-s3-bucket - base: - apiVersion: s3.aws.upbound.io/v1beta1 - kind: Bucket - spec: - forProvider: - region: "eu-central-1" - providerConfigRef: - name: aws-s3-provider - patches: - - type: FromCompositeFieldPath - fromFieldPath: "spec.region" - toFieldPath: "spec.forProvider.region" \ No newline at end of file diff --git a/crossplane-api/api/a8s/servicebinding/s3-composition.yaml b/crossplane-api/api/a8s/servicebinding/s3-composition.yaml deleted file mode 100644 index 70e4a20..0000000 --- a/crossplane-api/api/a8s/servicebinding/s3-composition.yaml +++ /dev/null @@ -1,41 +0,0 @@ -apiVersion: apiextensions.crossplane.io/v1 -kind: Composition -metadata: - name: a8s-s3-servicebinding -spec: - compositeTypeRef: - apiVersion: anynines.com/v1 - kind: XServiceBinding - resources: - - name: a8s-s3-bucket-policy - base: - apiVersion: s3.aws.upbound.io/v1beta1 - kind: BucketPolicy - spec: - providerConfigRef: - name: aws-s3-provider - forProvider: - bucketRef.name: "s3-bucket-name" - region: "eu-central-1" - policy: > - { - "Id": "Policy1712922854010", - "Version": "2012-10-17", - "Statement": [ - { - "Sid": "Stmt1712922850476", - "Action": "s3:*", - "Effect": "Deny", - "Resource": "arn:aws:s3:::*/*", - "Principal": "*" - } - ] - } - patches: - - type: FromCompositeFieldPath - fromFieldPath: "spec.region" - toFieldPath: "spec.forProvider.region" - - fromFieldPath: "spec.instanceRef" - toFieldPath: "spec.forProvider.bucketRef.name" - - fromFieldPath: "spec.policy" - toFieldPath: "spec.forProvider.policy" \ No newline at end of file diff --git a/crossplane-api/api/anynines-dataservices-300f2df2a659.xpkg b/crossplane-api/api/anynines-dataservices-300f2df2a659.xpkg deleted file mode 100644 index 22ab1d39ab570bccdb1172fb9ccd3d26ae3dc8b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17920 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 E0ASCmVE_OC diff --git a/crossplane-api/api/common/servicebinding_definition.yaml b/crossplane-api/api/common/servicebinding_definition.yaml index 7ec3e9c..9f55507 100644 --- a/crossplane-api/api/common/servicebinding_definition.yaml +++ b/crossplane-api/api/common/servicebinding_definition.yaml @@ -23,7 +23,7 @@ spec: - region: ®ion ["eu-central-1", "us-east-1"] - types: &serviceInstanceTypes ["postgresql", "mongodb", "search", "logme2", "prometheus", "messaging", "mariadb", - "messaging", "s3"] + "messaging"] properties: spec: x-kubernetes-validations: diff --git a/crossplane-api/api/iam/policy_composition.yaml b/crossplane-api/api/iam/policy_composition.yaml deleted file mode 100644 index 8f3b08d..0000000 --- a/crossplane-api/api/iam/policy_composition.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: apiextensions.crossplane.io/v1 -kind: Composition -metadata: - name: a8s-iam-policy -spec: - compositeTypeRef: - apiVersion: anynines.com/v1 - kind: XPolicy - mode: Pipeline - pipeline: - - step: run-the-template - functionRef: - name: function-iam-policy - input: - apiVersion: iam.fn.anynines.com/v1beta1 - kind: Input - providerConfigRef: "aws-iam-provider" diff --git a/crossplane-api/api/iam/policy_definition.yaml b/crossplane-api/api/iam/policy_definition.yaml deleted file mode 100644 index a9e64d8..0000000 --- a/crossplane-api/api/iam/policy_definition.yaml +++ /dev/null @@ -1,56 +0,0 @@ -apiVersion: apiextensions.crossplane.io/v1 -kind: CompositeResourceDefinition -metadata: - name: xpolicies.anynines.com -spec: - group: anynines.com - names: - kind: XPolicy - plural: xpolicies - claimNames: - kind: Policy - plural: policies - defaultCompositionRef: - name: a8s-iam-policy - defaultCompositeDeletePolicy: Foreground - versions: - - name: v1 - served: true - referenceable: true - schema: - openAPIV3Schema: - properties: - spec: - type: object - properties: - resource: - description: | - The Resource defines the object or objects that the statement applies to. Statements must include either a Resource or a NotResource element - type: string - path: - description: | - Path in which to create the policy - type: string - description: - description: | - Description of the policy - type: string - actions: - description: | - Action describes the specific action or actions that will be allowed like Get, List, etc.. - type: array - items: - type: string - tags: - description: | - Key-value map of resource tags. - type: object - required: - - resource - - actions - status: - type: object - properties: - managed: - type: object - x-kubernetes-preserve-unknown-fields: true diff --git a/crossplane-api/deploy/provider-aws-config.yaml b/crossplane-api/deploy/provider-aws-config.yaml deleted file mode 100644 index b8174e8..0000000 --- a/crossplane-api/deploy/provider-aws-config.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: aws.upbound.io/v1beta1 -kind: ProviderConfig -metadata: - name: aws-s3-provider -spec: - credentials: - source: Secret - secretRef: - namespace: crossplane-system - name: aws-secret - key: creds ---- -apiVersion: aws.upbound.io/v1beta1 -kind: ProviderConfig -metadata: - name: aws-iam-provider -spec: - credentials: - source: Secret - secretRef: - namespace: crossplane-system - name: aws-secret - key: creds \ No newline at end of file diff --git a/crossplane-api/deploy/provider-aws.yaml b/crossplane-api/deploy/provider-aws.yaml deleted file mode 100644 index 1046a69..0000000 --- a/crossplane-api/deploy/provider-aws.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: pkg.crossplane.io/v1 -kind: Provider -metadata: - name: provider-aws-s3 -spec: - package: xpkg.upbound.io/upbound/provider-aws-s3:v1.1.0 ---- -apiVersion: pkg.crossplane.io/v1 -kind: Provider -metadata: - name: provider-aws-iam -spec: - package: xpkg.upbound.io/upbound/provider-aws-iam:v1.1.0 diff --git a/crossplane-api/examples/a8s/objectstore-claim.yaml b/crossplane-api/examples/a8s/objectstore-claim.yaml deleted file mode 100644 index d362098..0000000 --- a/crossplane-api/examples/a8s/objectstore-claim.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: anynines.com/v1 -kind: ObjectStorageInstance -metadata: - name: test-crossplane-bucket -spec: - region: "us-east-1" - compositionRef: - name: a8s-s3-bucket \ No newline at end of file diff --git a/crossplane-api/examples/a8s/policy-claim.yaml b/crossplane-api/examples/a8s/policy-claim.yaml deleted file mode 100644 index 8dc3c5a..0000000 --- a/crossplane-api/examples/a8s/policy-claim.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: anynines.com/v1 -kind: Policy -metadata: - name: example-a8s-policy - namespace: default -spec: - actions: - - s3:GetObject - - s3:PutObject - - s3:ListBucket - - s3:DeleteObject - resource: arn:aws:s3:::*/* - description: this is a test policy created by a composite function diff --git a/crossplane-api/examples/a8s/s3-servicebinding-claim.yaml b/crossplane-api/examples/a8s/s3-servicebinding-claim.yaml deleted file mode 100644 index 5fbb575..0000000 --- a/crossplane-api/examples/a8s/s3-servicebinding-claim.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: anynines.com/v1 -kind: ServiceBinding -metadata: - name: example-a8s-s3 - namespace: default -spec: - instanceRef: - serviceInstanceType: s3 - region: "us-east-1" - policy: > - { - "Version": "2012-10-17", - "Statement": [ - { - "Sid": "AllowIAMRolesToAccessBucket", - "Action": "s3:*", - "Effect": "Allow", - "Resource": "arn:aws:s3:::/*", - "Principal": { - "AWS": [ - "arn:aws:iam::" - ] - } - } - ] - } - compositionRef: - name: a8s-s3-servicebinding diff --git a/crossplane-api/kustomization.yaml b/crossplane-api/kustomization.yaml index 09e92cb..cfe14e9 100644 --- a/crossplane-api/kustomization.yaml +++ b/crossplane-api/kustomization.yaml @@ -7,8 +7,6 @@ resources: - api/a8s/postgresql/composition.yaml - api/a8s/restore/composition.yaml - api/a8s/servicebinding/composition.yaml - - api/a8s/servicebinding/s3-composition.yaml - - api/a8s/s3/composition.yaml # a9s - api/a9s/backup/composition.yaml - api/a9s/logme2/composition.yaml @@ -33,7 +31,3 @@ resources: - api/common/postgresql_definition.yaml - api/common/restore_definition.yaml - api/common/servicebinding_definition.yaml - -# IAM - - api/iam/policy_composition.yaml - - api/iam/policy_definition.yaml From a916b5f39b44ffb017f6e61c1e8688651ec6d9d3 Mon Sep 17 00:00:00 2001 From: abdul haseeb Date: Mon, 18 Nov 2024 12:30:31 +0100 Subject: [PATCH 3/3] Rebranding ECR repos to Klutch --- crossplane-api/Makefile | 2 +- crossplane-api/README.md | 6 +++--- crossplane-api/deploy/config-pkg-anynines.yaml | 2 +- crossplane-api/deploy/provider-anynines.yaml | 2 +- docs/for-developers/tutorials/index.md | 4 ++-- .../control-plane-cluster-setup/index.md | 2 +- .../control-plane-cluster-setup/setup-app-cluster.md | 6 +++--- docs/platform-operator/monitoring.md | 2 +- .../update-cluster-components/index.md | 10 +++++----- docs/static/po_files/backend-anynines.template.yaml | 2 +- docs/static/po_files/konnector.yaml | 2 +- docs/static/po_files/update-konnector.yaml | 2 +- provider-anynines/examples/provider/provider.yaml | 2 +- provider-anynines/package/crossplane.yaml | 2 +- release/patches/release.yaml.template | 6 +++--- test/e2e/provider/manifests/configuration.yaml | 2 +- test/e2e/provider/manifests/install/provider.yaml | 2 +- 17 files changed, 28 insertions(+), 28 deletions(-) diff --git a/crossplane-api/Makefile b/crossplane-api/Makefile index 41aaa07..ec212a6 100644 --- a/crossplane-api/Makefile +++ b/crossplane-api/Makefile @@ -1,5 +1,5 @@ IMAGE_NAME := dataservices -ECR_REPO := public.ecr.aws/w5n9a2g2/anynines +ECR_REPO := public.ecr.aws/w5n9a2g2/klutch providerconfig: # Populate Secrets and create PostgreSQL ProvideConfig using the instance name diff --git a/crossplane-api/README.md b/crossplane-api/README.md index fb44d43..228d03c 100644 --- a/crossplane-api/README.md +++ b/crossplane-api/README.md @@ -90,9 +90,9 @@ aws ecr-public get-login-password --region us-east-1 --profile=ECR | docker logi ### Push images to ECR There are two ECR repositories, one is used to store provider images -(`public.ecr.aws/w5n9a2g2/anynines/provider-anynines`) and the other +(`public.ecr.aws/w5n9a2g2/klutch/provider-anynines`) and the other one is used for the provider controller images -(`public.ecr.aws/w5n9a2g2/anynines/provider-anynines-controller`). +(`public.ecr.aws/w5n9a2g2/klutch/provider-anynines-controller`). > **Important Note!** @@ -286,7 +286,7 @@ To install the configuration package (containing definitions and compositions), 1. Install the package via crossplane: ```bash -crossplane xpkg install configuration public.ecr.aws/w5n9a2g2/anynines/dataservices:v1.3.0 +crossplane xpkg install configuration public.ecr.aws/w5n9a2g2/klutch/dataservices:v1.3.0 ``` 2. Install files directly: diff --git a/crossplane-api/deploy/config-pkg-anynines.yaml b/crossplane-api/deploy/config-pkg-anynines.yaml index a93d7f8..c4661ba 100644 --- a/crossplane-api/deploy/config-pkg-anynines.yaml +++ b/crossplane-api/deploy/config-pkg-anynines.yaml @@ -3,4 +3,4 @@ kind: Configuration metadata: name: anynines-dataservices spec: - package: public.ecr.aws/w5n9a2g2/anynines/dataservices:v1.3.0 + package: public.ecr.aws/w5n9a2g2/klutch/dataservices:v1.3.0 diff --git a/crossplane-api/deploy/provider-anynines.yaml b/crossplane-api/deploy/provider-anynines.yaml index 237b18b..4872427 100644 --- a/crossplane-api/deploy/provider-anynines.yaml +++ b/crossplane-api/deploy/provider-anynines.yaml @@ -3,7 +3,7 @@ kind: Provider metadata: name: provider-anynines spec: - package: "public.ecr.aws/w5n9a2g2/anynines/provider-anynines:v1.3.0" + package: "public.ecr.aws/w5n9a2g2/klutch/provider-anynines:v1.3.0" runtimeConfigRef: name: provider-anynines --- diff --git a/docs/for-developers/tutorials/index.md b/docs/for-developers/tutorials/index.md index 20e641e..bc097f6 100644 --- a/docs/for-developers/tutorials/index.md +++ b/docs/for-developers/tutorials/index.md @@ -56,7 +56,7 @@ Ensure your machine can reach the following external resources: 1. Configuration: `https://anynines-artifacts.s3.eu-central-1.amazonaws.com/central-management/v1.3.0/crds.yaml` 2. Docker Image Repositories: - - `public.ecr.aws/w5n9a2g2/anynines/` + - `public.ecr.aws/w5n9a2g2/klutch/` - `dexidp/dex` - `curlimages/curl` - `xpkg.upbound.io/crossplane-contrib/provider-kubernetes:v0.14.1` @@ -220,7 +220,7 @@ Checking Prerequisites... ... The following command will be executed for you: -/opt/homebrew/bin/kubectl bind http://192.168.0.91:8080/export --konnector-image public.ecr.aws/w5n9a2g2/anynines/konnector:v1.3.0 --context kind-klutch-app +/opt/homebrew/bin/kubectl bind http://192.168.0.91:8080/export --konnector-image public.ecr.aws/w5n9a2g2/klutch/konnector:v1.3.0 --context kind-klutch-app ``` Next, a browser window will open for authentication. Use these demo credentials: diff --git a/docs/platform-operator/control-plane-cluster-setup/index.md b/docs/platform-operator/control-plane-cluster-setup/index.md index 9755445..c835c69 100644 --- a/docs/platform-operator/control-plane-cluster-setup/index.md +++ b/docs/platform-operator/control-plane-cluster-setup/index.md @@ -246,7 +246,7 @@ spec: serviceAccountName: anynines-backend containers: - name: anynines-backend - image: public.ecr.aws/w5n9a2g2/anynines/kubebind-backend:v1.3.0 + image: public.ecr.aws/w5n9a2g2/klutch/klutchbind-backend:v1.3.0 args: - --namespace-prefix=cluster - --pretty-name=anynines diff --git a/docs/platform-operator/control-plane-cluster-setup/setup-app-cluster.md b/docs/platform-operator/control-plane-cluster-setup/setup-app-cluster.md index 089ae00..46b2994 100644 --- a/docs/platform-operator/control-plane-cluster-setup/setup-app-cluster.md +++ b/docs/platform-operator/control-plane-cluster-setup/setup-app-cluster.md @@ -162,7 +162,7 @@ backend. To create this binding, execute the following commands: 1. In the following line, replace `` with the hostname of the Klutch backend: ```bash - kubectl bind http://:443/export --konnector-image=public.ecr.aws/w5n9a2g2/anynines/konnector:v1.3.0 + kubectl bind http://:443/export --konnector-image=public.ecr.aws/w5n9a2g2/klutch/konnector:v1.3.0 ``` 2. Authenticate using provided URL and your OIDC credentials. Grant the OIDC client access in the @@ -255,7 +255,7 @@ spec: containers: - name: konnector # Make sure to use the latest image version here: - image: public.ecr.aws/w5n9a2g2/anynines/konnector:v1.3.0 + image: public.ecr.aws/w5n9a2g2/klutch/konnector:v1.3.0 env: - name: POD_NAME valueFrom: @@ -299,7 +299,7 @@ spec: containers: - name: konnector # Replace this with the new image version: - image: public.ecr.aws/w5n9a2g2/anynines/konnector:v3.141.59 + image: public.ecr.aws/w5n9a2g2/klutch/konnector:v3.141.59 env: - name: POD_NAME valueFrom: diff --git a/docs/platform-operator/monitoring.md b/docs/platform-operator/monitoring.md index f05248c..dd186fa 100644 --- a/docs/platform-operator/monitoring.md +++ b/docs/platform-operator/monitoring.md @@ -18,7 +18,7 @@ condition of the installed crossplane providers: $ kubectl get providers NAME INSTALLED HEALTHY PACKAGE AGE crossplane-contrib-provider-kubernetes True True xpkg.upbound.io/crossplane-contrib/provider-kubernetes:v0.9.0 118m -provider-anynines True True public.ecr.aws/w5n9a2g2/anynines/provider-anynines:v1.3.0 118m +provider-anynines True True public.ecr.aws/w5n9a2g2/klutch/provider-anynines:v1.3.0 118m ``` If one of the underlying pods encounters an error and needs to be recreated, the HEALTHY condition diff --git a/docs/platform-operator/update-cluster-components/index.md b/docs/platform-operator/update-cluster-components/index.md index 1dfa624..c43058b 100644 --- a/docs/platform-operator/update-cluster-components/index.md +++ b/docs/platform-operator/update-cluster-components/index.md @@ -25,18 +25,18 @@ depend on your installation method. 1. Update provider-anynines The latest `provider-anynines` image can be found by checking out the tab "Image tags" for this -image in our [image registry](https://gallery.ecr.aws/w5n9a2g2/anynines/provider-anynines). +image in our [image registry](https://gallery.ecr.aws/w5n9a2g2/klutch/provider-anynines). ```bash kubectl patch providers/provider-anynines \ - --type merge -p '{"spec":{"package":"public.ecr.aws/w5n9a2g2/anynines/provider-anynines:v1.3.0"}}' + --type merge -p '{"spec":{"package":"public.ecr.aws/w5n9a2g2/klutch/provider-anynines:v1.3.0"}}' ``` 2. Finally update anynines configuration package ```bash kubectl patch configurations/anynines-dataservices \ - --type merge -p '{"spec":{"package":"public.ecr.aws/w5n9a2g2/anynines/dataservices:v1.3.0"}}' + --type merge -p '{"spec":{"package":"public.ecr.aws/w5n9a2g2/klutch/dataservices:v1.3.0"}}' ``` ### Control Plane Cluster backend @@ -77,7 +77,7 @@ checking out the tab "Image tags" for this image in our ### Example using kubectl ```bash -kubectl set image --namespace kube-bind deployment/konnector konnector=public.ecr.aws/w5n9a2g2/anynines/konnector:v1.3.0 +kubectl set image --namespace kube-bind deployment/konnector konnector=public.ecr.aws/w5n9a2g2/klutch/konnector:v1.3.0 ``` ### Example using a manifest @@ -107,7 +107,7 @@ spec: containers: - name: konnector # This image should point to the new version: - image: public.ecr.aws/w5n9a2g2/anynines/konnector:v1.3.0 + image: public.ecr.aws/w5n9a2g2/klutch/konnector:v1.3.0 env: - name: POD_NAME valueFrom: diff --git a/docs/static/po_files/backend-anynines.template.yaml b/docs/static/po_files/backend-anynines.template.yaml index f141cb5..d1c98f7 100644 --- a/docs/static/po_files/backend-anynines.template.yaml +++ b/docs/static/po_files/backend-anynines.template.yaml @@ -21,7 +21,7 @@ spec: serviceAccountName: anynines-backend containers: - name: anynines-backend - image: public.ecr.aws/w5n9a2g2/anynines/kubebind-backend:v1.3.0 + image: public.ecr.aws/w5n9a2g2/klutch/klutchbind-backend:v1.3.0 args: - --namespace-prefix=cluster - --pretty-name=anynines diff --git a/docs/static/po_files/konnector.yaml b/docs/static/po_files/konnector.yaml index 94e0fd2..dfe5001 100644 --- a/docs/static/po_files/konnector.yaml +++ b/docs/static/po_files/konnector.yaml @@ -56,7 +56,7 @@ spec: containers: - name: konnector # Make sure to use the latest image version here: - image: public.ecr.aws/w5n9a2g2/anynines/konnector:v1.3.0 + image: public.ecr.aws/w5n9a2g2/klutch/konnector:v1.3.0 env: - name: POD_NAME valueFrom: diff --git a/docs/static/po_files/update-konnector.yaml b/docs/static/po_files/update-konnector.yaml index 4a6d433..5962162 100644 --- a/docs/static/po_files/update-konnector.yaml +++ b/docs/static/po_files/update-konnector.yaml @@ -20,7 +20,7 @@ spec: containers: - name: konnector # This image should point to the new version: - image: public.ecr.aws/w5n9a2g2/anynines/konnector:v1.3.0 + image: public.ecr.aws/w5n9a2g2/klutch/konnector:v1.3.0 env: - name: POD_NAME valueFrom: diff --git a/provider-anynines/examples/provider/provider.yaml b/provider-anynines/examples/provider/provider.yaml index 49f0476..4db02ca 100644 --- a/provider-anynines/examples/provider/provider.yaml +++ b/provider-anynines/examples/provider/provider.yaml @@ -3,4 +3,4 @@ kind: Provider metadata: name: provider-anynines spec: - package: "public.ecr.aws/w5n9a2g2/anynines/provider-anynines:v1.3.0" + package: "public.ecr.aws/w5n9a2g2/klutch/provider-anynines:v1.3.0" diff --git a/provider-anynines/package/crossplane.yaml b/provider-anynines/package/crossplane.yaml index 0563f5c..639a977 100644 --- a/provider-anynines/package/crossplane.yaml +++ b/provider-anynines/package/crossplane.yaml @@ -10,4 +10,4 @@ metadata: spec: controller: - image: "public.ecr.aws/w5n9a2g2/anynines/provider-anynines-controller:VERSION" + image: "public.ecr.aws/w5n9a2g2/klutch/provider-anynines-controller:VERSION" diff --git a/release/patches/release.yaml.template b/release/patches/release.yaml.template index f8b420e..889bbb7 100644 --- a/release/patches/release.yaml.template +++ b/release/patches/release.yaml.template @@ -9,14 +9,14 @@ kind: Configuration metadata: name: anynines-dataservices spec: - package: "public.ecr.aws/w5n9a2g2/anynines/dataservices:$CONFIG_VERSION" + package: "public.ecr.aws/w5n9a2g2/klutch/dataservices:$CONFIG_VERSION" --- apiVersion: pkg.crossplane.io/v1 kind: Provider metadata: name: provider-anynines spec: - package: "public.ecr.aws/w5n9a2g2/anynines/provider-anynines:$PROVIDER_ANYNINES_VERSION" + package: "public.ecr.aws/w5n9a2g2/klutch/provider-anynines:$PROVIDER_ANYNINES_VERSION" --- apiVersion: pkg.crossplane.io/v1 kind: Provider @@ -35,4 +35,4 @@ spec: spec: containers: - name: anynines-backend - image: "public.ecr.aws/w5n9a2g2/anynines/kubebind-backend:$KUBE_BIND_BACKEND_VERSION" + image: "public.ecr.aws/w5n9a2g2/klutch/klutchbind-backend:$KUBE_BIND_BACKEND_VERSION" diff --git a/test/e2e/provider/manifests/configuration.yaml b/test/e2e/provider/manifests/configuration.yaml index a93d7f8..c4661ba 100644 --- a/test/e2e/provider/manifests/configuration.yaml +++ b/test/e2e/provider/manifests/configuration.yaml @@ -3,4 +3,4 @@ kind: Configuration metadata: name: anynines-dataservices spec: - package: public.ecr.aws/w5n9a2g2/anynines/dataservices:v1.3.0 + package: public.ecr.aws/w5n9a2g2/klutch/dataservices:v1.3.0 diff --git a/test/e2e/provider/manifests/install/provider.yaml b/test/e2e/provider/manifests/install/provider.yaml index 779af93..77793a3 100644 --- a/test/e2e/provider/manifests/install/provider.yaml +++ b/test/e2e/provider/manifests/install/provider.yaml @@ -3,6 +3,6 @@ kind: Provider metadata: name: anynines-provider spec: - package: public.ecr.aws/w5n9a2g2/anynines/provider-anynines:v1.3.0 + package: public.ecr.aws/w5n9a2g2/klutch/provider-anynines:v1.3.0 runtimeConfigRef: name: enable-debug-logging