remove sensitive data

community/openwhisk/templates/nginx-secret.yaml

@@ -9,5 +9,10 @@ metadata:
 {{ include "openwhisk.label_boilerplate" . | indent 4 }}
 type: tls
 data:
+<<<<<<< HEAD
+  tls.crt: ***REMOVED***
+  tls.key: ***REMOVED***
+=======
   tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURLakNDQWhJQ0NRQ3JWVW52eWpMdHpEQU5CZ2txaGtpRzl3MEJBUVVGQURCWE1Rc3dDUVlEVlFRR0V3SlYKVXpFTE1Ba0dBMVVFQ0F3Q1Rsa3hFVEFQQmdOVkJBY01DRmx2Y210MGIzZHVNUkl3RUFZRFZRUUtEQWxQY0dWdQpWMmhwYzJzeEZEQVNCZ05WQkFNTUN5b3ViRzlqWVd4b2IzTjBNQjRYRFRFNE1UQXdNVEl3TlRBd01sb1hEVEU1Ck1UQXdNVEl3TlRBd01sb3dWekVMTUFrR0ExVUVCaE1DVlZNeEN6QUpCZ05WQkFnTUFrNVpNUkV3RHdZRFZRUUgKREFoWmIzSnJkRzkzYmpFU01CQUdBMVVFQ2d3SlQzQmxibGRvYVhOck1SUXdFZ1lEVlFRRERBc3FMbXh2WTJGcwphRzl6ZERDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTlY1TmVuR3FnSFhIOXpTCkUxWEJiS2x4M0hrSDlkSlQ0NVNrK1E0UG0yeVQ4RXZ2YWFnTEdEcHRMeXorQmU5a3Uvd1BTSDRETEpNbEcwYkwKcGlaY1VzMGVTWHVLR3pGVUVBZ1FlWDgvZEVjeW5XcWlMSzJYY0lacUFYNi9WWFZLamlZM0ZEM3RFenRoVnUwQgp6dEtUOVZzQ0VBWDc5dlo5WXJaSWk1VEdUaVlEVWxuSmhXT3g0SS8rMWd6UHNEUDExc1BaU2doZHlmUnJGN1BaCndPOUFKWC8vbTc1V3ozMGxZQ3QwK0xDSEFXWmRXL2pyeXJQdCtNNjlzUm8xdTJXNzlVdmpGcFJ2OStObXhKUmEKRTZ2amRTb0VTeDlhMHozUjJYMlA2b2Q0V0hnVGVOZXNRYUVPOThGZStpWnZsUHBOUTMxYmVPRWF2QlAwVmNDNAoyWWdjc3BVQ0F3RUFBVEFOQmdrcWhraUc5dzBCQVFVRkFBT0NBUUVBSFVLQXZYR0JKVzNJS3NZT0RNUzY1cEJoClVkTmpIS1p6c0J4Slh1YzkvUnFwVDNxRWJORW5jUnNOYjlHZWk1aEhodEd1c3YwdHN1c2xpV2t3aVgrMGhnQW4KWTZFUXJqck0zMm9lc1pvWHJWRmlGeWVvRVgvV0ZGVThDL2JZVnlYS2FFVENQcU9wcHFhRGl0TGlPc3FuYlZldwpRcVIySitXdSs3WEhpYm85MWg4VTRHL0MzTU5ZZFVNaFh4RTkrbmtRQ0J5Q2Ftd3AzR1RsV1FkM1gwdFdMYXlGCitBdWF0RCtxb21XRXpLcnRFWjFoaWswQnBzQ2VibU0vTXR1RmR1M0hMVk83c3VnM0hMeUNCdHB4OVNyRjV0ZnMKTlpOM3BGK2s3bklycGJZZ29uakVmVE5SRk5kM0tGZ2RMYm1jUisrVU5DekZOU1lrbVh0dTB1Mm16VVQ1ekE9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
   tls.key: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBMVhrMTZjYXFBZGNmM05JVFZjRnNxWEhjZVFmMTBsUGpsS1Q1RGcrYmJKUHdTKzlwCnFBc1lPbTB2TFA0RjcyUzcvQTlJZmdNc2t5VWJSc3VtSmx4U3pSNUplNG9iTVZRUUNCQjVmejkwUnpLZGFxSXMKclpkd2htb0JmcjlWZFVxT0pqY1VQZTBUTzJGVzdRSE8wcFAxV3dJUUJmdjI5bjFpdGtpTGxNWk9KZ05TV2NtRgpZN0hnai83V0RNK3dNL1hXdzlsS0NGM0o5R3NYczluQTcwQWxmLytidmxiUGZTVmdLM1Q0c0ljQlpsMWIrT3ZLCnMrMzR6cjJ4R2pXN1pidjFTK01XbEcvMzQyYkVsRm9UcStOMUtnUkxIMXJUUGRIWmZZL3FoM2hZZUJONDE2eEIKb1E3M3dWNzZKbStVK2sxRGZWdDQ0UnE4RS9SVndMalppQnl5bFFJREFRQUJBb0lCQVFDYlp3TE5iWGREb2JTcgpUeThPSmFJUjlEYVkwU2V0OXEzYy92L2pzWTdteXdlS2IvNU5lODRtY21kK2JHb3JyUHlBY1N2SHVFM1J6SmgvCndDN3pEQkNuQzk1WWxlQlgxNmRZQjQ0N0NSbC8zeVBqaGEzYXJUMFlUTUZMNE1PNGdBN2RXUWxlVDJESndJSEUKUmFXbmZGaUg2UWQ3SThMVUM5RTVlN1JKR05lNUtTcGhKNGJxNThXSHpFUVhjOWlxWUx6YzNBY1MzVFJFTnY4ZAp1NUdBV3M3T1VPYzVtbWt0bE5McHRVSXh3WkJBa1c1S0hWV014aThsck1ES3FhdEwyWi95ZENjRGV6dzdJWlBkCjdlelFGdDgwazFJMy9JanhsNWtuUHRuOTNOOWlPazlBOUxGbWhZbm5hQkREMnVGRmZaR2FjOUE1VTZmNEx6NW0KaW5XQnd3bzlBb0dCQVAycnVJQjNIU1YxY2lVY3NOUEFTbzRQbEFHcG5kYVZHdUtzVEQxL1QvR01SNDJqVmJXUAppc1AySGJEdDNXOW5kM2xrM3dTRlZtdElxK3ZWSHpwVzlRNUYvYVJCc2RVL29mdldHWnJsa085Vm8rK2VVQUJXCjNNQjBncUpHYXBGK2VETGRlNklFMklzRUNja0xFQitwZUxVNUsyeFNlQWtCRC84NWQxblhDcG9iQW9HQkFOZHYKQUlJUjR0bWpSZHRqaW1YVk5TUjUzU0d5N0RFSGVtTHMyVHc0MENnNkdXVHpBN1IwVHY5RkpIb1NGdFhZcVp4dwpMUDRhdlY4eUVwMnE1YmZKYUZIR3h1OExRSUdCbURMK3l5ZG11eTZ2Z1RWWEpENEg3WUJINFhsYjBja2F6K2p1CmlucHpVSGFJVnZUT1J5Nnk4TXUzVTM5b1NVN1lmbjJpeTFJYzQ3RVBBb0dBSEg3bjBQYVFmWjY5M2RGbFE4UTgKRzgxQU1SZWV0WFkyZVBRbDlGcVMzbTJGdERGKzlWQlVwRUxIZnhLWloyUldGWHJ4V282bjhKRlBUc1M0SjFPUgpYN01aRlJTVUo0Sm9iZVBWS0lOVlRxMXVKd0svdGVvTURrcUlTalppemtsSXMxNFIvMWRRQS8zR0k2RnNoRUlEClgwZzJ5b3BSRmFIYTdDN0dhMzh1bjdVQ2dZQjJ3Y0wyOEtNcnRCeUxMdGtZLzZvVzNIS3c0Ky9kcXpDbEhjazIKc0Y3Vy9nZ0hwUXJTekJiTUV6SmpkRnRRTU9wMnlVT1VJK3RtY2JUZlkxalVzbHNtVVR4U2c5SmdVYTh6MVU3cAovbkNLOE1aNlAvcERrNTB4ek80WE55MXkvYXZFek5KYlkvdmtDNDVienVaZ2NOWGFoc21wZnpTQ0dVZkpQQmQyCndXUW1zd0tCZ1FDYmZqQ0ZxME0xcVVoZXNXRGdKbm14MHRhdjFHbi9La1dXZTdHWVZpYmowbnVXNlFZUjhleFEKemlpTVcwNkRKREQybjJoOW1ySjZSaW4xZE1EUlM0bmxtek9DcUR3Uk50aHRPcHIxVkRhL1UvUVJNRXIwWWl3SQozT3NwZFZSNUJqSXc5bGJGck0ySWRtK2ZkUXREbmo3bEhabnRONkVudjJuTnIzRHNJQWtQWkE9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
+>>>>>>> 4381aa777fbdc5b62c94cb5ccc3f4f57c4b05f70

components/wkc-base-prereqs/templates/secret-generation-config.yaml

@@ -20,6 +20,32 @@ data:
   init.sh: |
     CERT=$(cat <<-END
     -----BEGIN CERTIFICATE-----
+<<<<<<< HEAD
+  ***REMOVED***
+  ***REMOVED***
+  ***REMOVED***
+  ***REMOVED***
+  ***REMOVED***
+  ***REMOVED***
+  ***REMOVED***
+  ***REMOVED***
+  ***REMOVED***
+  ***REMOVED***
+  ***REMOVED***
+  ***REMOVED***
+  ***REMOVED***
+  ***REMOVED***
+  ***REMOVED***
+  ***REMOVED***
+  ***REMOVED***
+  ***REMOVED***
+  ***REMOVED***
+  ***REMOVED***
+  ***REMOVED***
+  ***REMOVED***
+  ***REMOVED***
+  ***REMOVED***
+=======
     MIIEUzCCAzugAwIBAgIJANMbRG6+5SQzMA0GCSqGSIb3DQEBBQUAMIGxMQswCQYD
     VQQGEwJVUzELMAkGA1UECAwCQ0ExGzAZBgNVBAcMElNpbGljb24gVmFsbGV5IExh
     YjESMBAGA1UECgwJQW5hbHl0aWNzMRowGAYDVQQLDBFJQk0gRGF0YSBQbGF0Zm9y
@@ -44,6 +70,7 @@ data:
     q4RZTEv9VP06DlZRgFpXmXHEVlxEIwwt5BbCTxm597u3J3UtCWOlmKdIuXjVUxx0
     u8eOr37odf6po0bDfDbuElUByW3umUm42C2JvLVlL7/VR10RFC21WYk6Gjvee0gr
     KZ4VvnlEtw==
+>>>>>>> 4381aa777fbdc5b62c94cb5ccc3f4f57c4b05f70
     -----END CERTIFICATE-----
     END
     );

components/wkc-base/charts/wdp-connect-connection-chart/templates/secret.yaml

@@ -14,6 +14,17 @@ metadata:
 type: "Opaque"
 data:
 {{- if eq .Values.environment.environmentName "ys1dev" }}
+<<<<<<< HEAD
+  KMS_API_KEY: ***REMOVED***
+  KMS_INSTANCE_ID: ***REMOVED***
+  KMS_ROOT_KEY_ID: ***REMOVED***
+  KMS_SERVICE_ID: ***REMOVED***
+  KMS_URL: ***REMOVED***
+  SG_SERVICE_KEY_PASSWORD: ***REMOVED***
+  SG_SERVICE_NAME: ***REMOVED***
+  SG_SERVICE_SECRET_KEY: ***REMOVED***
+  SG_SERVICE_URL: ***REMOVED***
+=======
   KMS_API_KEY: TmhqWm1iWms3TnFoODM5blBxdXlIVU8yVTVZNGFGZmxRd08zMjlTVGdVOTY=
   KMS_INSTANCE_ID: ZTZlYWI0MzctOGJlOS00Y2JjLTgxNzUtM2I3NDQzN2UxYjdh
   KMS_ROOT_KEY_ID: MTUwNWQwMGMtM2Q2MC00YWJjLTlkYzYtNGExNTYzZDY2ZjU4
@@ -23,5 +34,6 @@ data:
   SG_SERVICE_NAME: RGF0YVdvcmtz
   SG_SERVICE_SECRET_KEY: WkdGMFlWZHZjbXR6Um1WaWNuVmhjbmxUWldOeVpYUkpiblJsY21OdmJtNWxZM1E9
   SG_SERVICE_URL: aHR0cHM6Ly9zZ21hbmFnZXIubmcuYmx1ZW1peC5uZXQ=
+>>>>>>> 4381aa777fbdc5b62c94cb5ccc3f4f57c4b05f70
 {{- end }}
 {{- end }}

components/wkc-base/charts/wdp-connect-connector-chart/templates/secret.yaml

@@ -14,11 +14,20 @@ metadata:
 type: "Opaque"
 data:
 {{- if eq .Values.environment.environmentName "ys1dev" }}
+<<<<<<< HEAD
+  KMS_API_KEY: ***REMOVED***
+  KMS_IAM_URL: ***REMOVED***
+  KMS_INSTANCE_ID: ***REMOVED***
+  KMS_ROOT_KEY_ID: ***REMOVED***
+  KMS_SERVICE_ID: ***REMOVED***
+  KMS_URL: ***REMOVED***
+=======
   KMS_API_KEY: TmhqWm1iWms3TnFoODM5blBxdXlIVU8yVTVZNGFGZmxRd08zMjlTVGdVOTY=
   KMS_IAM_URL: aHR0cHM6Ly9pYW0uY2xvdWQuaWJtLmNvbQ==
   KMS_INSTANCE_ID: ZTZlYWI0MzctOGJlOS00Y2JjLTgxNzUtM2I3NDQzN2UxYjdh
   KMS_ROOT_KEY_ID: MTUwNWQwMGMtM2Q2MC00YWJjLTlkYzYtNGExNTYzZDY2ZjU4
   KMS_SERVICE_ID: RlRRS2V5UHJvdGVjdC1SZWFkQWNjZXNz
   KMS_URL: aHR0cHM6Ly9rZXlwcm90ZWN0LnVzLXNvdXRoLmJsdWVtaXgubmV0
+>>>>>>> 4381aa777fbdc5b62c94cb5ccc3f4f57c4b05f70
 {{- end }}
 {{- end }}

entitled/ibm-icp4i-asset-repo-prod/charts/wkc-base-prereqs/values.yaml

@@ -97,6 +97,32 @@ redis-ha:
 
 nginxCertificate: |-
   -----BEGIN CERTIFICATE-----
+<<<<<<< HEAD
+***REMOVED***
+***REMOVED***
+***REMOVED***
+***REMOVED***
+***REMOVED***
+***REMOVED***
+***REMOVED***
+***REMOVED***
+***REMOVED***
+***REMOVED***
+***REMOVED***
+***REMOVED***
+***REMOVED***
+***REMOVED***
+***REMOVED***
+***REMOVED***
+***REMOVED***
+***REMOVED***
+***REMOVED***
+***REMOVED***
+***REMOVED***
+***REMOVED***
+***REMOVED***
+***REMOVED***
+=======
   MIIEUzCCAzugAwIBAgIJANMbRG6+5SQzMA0GCSqGSIb3DQEBBQUAMIGxMQswCQYD
   VQQGEwJVUzELMAkGA1UECAwCQ0ExGzAZBgNVBAcMElNpbGljb24gVmFsbGV5IExh
   YjESMBAGA1UECgwJQW5hbHl0aWNzMRowGAYDVQQLDBFJQk0gRGF0YSBQbGF0Zm9y
@@ -121,4 +147,5 @@ nginxCertificate: |-
   q4RZTEv9VP06DlZRgFpXmXHEVlxEIwwt5BbCTxm597u3J3UtCWOlmKdIuXjVUxx0
   u8eOr37odf6po0bDfDbuElUByW3umUm42C2JvLVlL7/VR10RFC21WYk6Gjvee0gr
   KZ4VvnlEtw==
+>>>>>>> 4381aa777fbdc5b62c94cb5ccc3f4f57c4b05f70
   -----END CERTIFICATE-----

entitled/ibm-ucv-prod/templates/rabbitmq-secret-generator.yaml

@@ -117,7 +117,11 @@ spec:
                         },
                         {
                           "name": "jenkins",
+<<<<<<< HEAD
+                          "password_hash": "***REMOVED***",
+=======
                           "password_hash": "XfUcBp1AFfV/6ij2btKeh+/ftE5hT4bRLmDlDIe5mD+EqB6A",
+>>>>>>> 4381aa777fbdc5b62c94cb5ccc3f4f57c4b05f70
                           "hashing_algorithm": "rabbit_password_hashing_sha256",
                           "tags": ""
                         }