cleanup

davidkarlsen · Sep 8, 2023 · 3ecd71f · 3ecd71f
1 parent b3cc754
commit 3ecd71f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 16 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -37,17 +37,17 @@ jobs:
         uses: docker/login-action@v2.2.0
         with:
           registry: ghcr.io
-          username: ${{github.actor}}
-          password: ${{secrets.GITHUB_TOKEN}}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: build and push
         run: |
-          make docker-buildx IMG=${{ env.IMG }}
+          make docker-buildx VERSION=${{ env.VERSION }}
 
       - name: bundle
         run: |
-          make bundle bundle-build bundle-push IMG=${{ env.IMG }}
+          make bundle bundle-build bundle-push VERSION=${{ env.VERSION }}
 
       - name: catalog
         run: |
-          make catalog-build catalog-push
+          make catalog-build catalog-push VERSION=${{ env.VERSION }}
diff --git a/bundle/manifests/flyway-operator.clusterserviceversion.yaml b/bundle/manifests/flyway-operator.clusterserviceversion.yaml
@@ -16,26 +16,25 @@ metadata:
               "app.kubernetes.io/part-of": "flyway-operator"
             },
             "name": "migration-sample",
-            "namespace": "ftm-dev"
+            "namespace": "test"
           },
           "spec": {
             "database": {
               "credentials": {
-                "key": "DB_PASSWORD",
-                "name": "db2u-password"
+                "key": "password",
+                "name": "migration-pw"
               },
-              "jdbcUrl": "jdbc:db2://db2u-ftm-hadr-svc:50000/FTMDB",
+              "jdbcUrl": "jdbc:db2://somehost:50000/devdb",
               "username": "db2inst1"
             },
             "migrationSource": {
-              "imageRef": "ghcr.io/davidkarlsen/testmigration:latest",
-              "path": "/sql"
+              "imageRef": "ghcr.io/davidkarlsen/testmigration:latest"
             }
           }
         }
       ]
     capabilities: Basic Install
-    createdAt: "2023-09-07T18:58:51Z"
+    createdAt: "2023-09-08T11:22:46Z"
     operators.operatorframework.io/builder: operator-sdk-v1.31.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v4-alpha
   name: flyway-operator.v0.0.1
@@ -185,7 +184,7 @@ spec:
                 - --leader-elect
                 command:
                 - /manager
-                image: ghcr.io/davidkarlsen/flyway-operator:latest
+                image: ghcr.io/davidkarlsen/flyway-operator:0.0.1
                 livenessProbe:
                   httpGet:
                     path: /healthz

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: ghcr.io/davidkarlsen/flyway-operator
-  newTag: latest
+  newTag: 0.0.1
diff --git a/config/samples/flyway_v1alpha1_migration.yaml b/config/samples/flyway_v1alpha1_migration.yaml
@@ -29,7 +29,7 @@ spec:
     credentials:
       name: migration-pw
       key: password
-    jdbcUrl: "jdbc:db2://localhost:50000/devdb"
+    jdbcUrl: "jdbc:db2://somehost:50000/devdb"
   migrationSource:
     imageRef: "ghcr.io/davidkarlsen/testmigration:latest"
-    path: "/sql"
+    # path: "/sql"